diff --git a/Directory.Packages.props b/Directory.Packages.props
index ff2c1bc4ee8..4e2bdea802f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -103,10 +103,10 @@
     <PackageVersion Include="Microsoft.WebTools.Languages.Shared.Editor" Version="$(_MicrosoftWebToolsPackageVersion)" />
     <PackageVersion Include="Microsoft.WebTools.Languages.Shared.VS" Version="$(_MicrosoftWebToolsPackageVersion)" />
     <PackageVersion Include="Microsoft.WebTools.Shared" Version="$(_MicrosoftWebToolsPackageVersion)" />
-    <PackageVersion Include="Moq" Version="4.16.0" />
+    <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.11.74" />
-    <PackageVersion Include="NuGet.SolutionRestoreManager.Interop" Version="4.8.0" />
+    <PackageVersion Include="NuGet.VisualStudio" Version="17.9.1" />
     <PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="$(_MicrosoftCodeAnalysisAnalyzersPackageVersion)" />
     <PackageVersion Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" />
     <PackageVersion Include="System.Resources.Extensions" Version="6.0.0" />
diff --git a/NuGet.config b/NuGet.config
index 95636d05192..ad74bb028db 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <clear />
@@ -112,8 +112,8 @@
       <package pattern="nuget.packaging" />
       <package pattern="nuget.protocol" />
       <package pattern="nuget.resolver" />
-      <package pattern="nuget.solutionrestoremanager.interop" />
       <package pattern="nuget.versioning" />
+      <package pattern="nuget.visualstudio" />
       <package pattern="perfolizer" />
       <package pattern="powershell" />
       <package pattern="roslyn.diagnostics.analyzers" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a0f6047e63c..11bb619b856 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -11,82 +11,82 @@
       <Sha>9ae78a4e6412926d19ba97cfed159bf9de70b538</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.11.0-3.24303.3">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-1.24366.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ec443fac0dcc4e9ce2f83b9202f689dc2872b9f3</Sha>
+      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
   </ProductDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 898101a3ff1..6aa6e7cad14 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -53,25 +53,25 @@
     <MicrosoftSourceBuildIntermediatearcadePackageVersion>9.0.0-beta.24352.2</MicrosoftSourceBuildIntermediatearcadePackageVersion>
     <MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksPackageVersion>
     <MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>1.0.0-beta.23475.1</MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>
-    <MicrosoftNetCompilersToolsetPackageVersion>4.12.0-1.24366.3</MicrosoftNetCompilersToolsetPackageVersion>
-    <MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.12.0-1.24366.3</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
-    <MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
-    <MicrosoftCodeAnalysisCommonPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisCommonPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
-    <MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
-    <MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
-    <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
-    <MicrosoftSourceBuildIntermediateroslynPackageVersion>4.12.0-1.24366.3</MicrosoftSourceBuildIntermediateroslynPackageVersion>
-    <MicrosoftVisualStudioLanguageServicesPackageVersion>4.12.0-1.24366.3</MicrosoftVisualStudioLanguageServicesPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>4.12.0-1.24366.6</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.12.0-1.24366.6</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
+    <MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
+    <MicrosoftCodeAnalysisCommonPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCommonPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
+    <MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
+    <MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
+    <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
+    <MicrosoftSourceBuildIntermediateroslynPackageVersion>4.12.0-1.24366.6</MicrosoftSourceBuildIntermediateroslynPackageVersion>
+    <MicrosoftVisualStudioLanguageServicesPackageVersion>4.12.0-1.24366.6</MicrosoftVisualStudioLanguageServicesPackageVersion>
     <!--
       Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
       but are present in Version.Details.xml for source-build PVP flow. See the comment in Version.Details.xml for more information.
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index 364e9b87341..84f21cea83b 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -1198,6 +1198,96 @@ public class ComponentWithEditorRequiredParameters : ComponentBase
         Assert.Empty(generated.RazorDiagnostics);
     }
 
+    [IntegrationTestFact, WorkItem("https://github.com/dotnet/razor/issues/10553")]
+    public void Component_WithEditorRequiredParameter_ValueSpecifiedUsingBindGetSet()
+    {
+        AdditionalSyntaxTrees.Add(Parse("""
+            using System;
+            using Microsoft.AspNetCore.Components;
+
+            namespace Test;
+
+            public class ComponentWithEditorRequiredParameters : ComponentBase
+            {
+                [Parameter]
+                [EditorRequired]
+                public string Property1 { get; set; }
+            }
+            """));
+
+        var generated = CompileToCSharp("""
+            <ComponentWithEditorRequiredParameters @bind-Property1:get="myField" @bind-Property1:set="OnFieldChanged" />
+
+            @code {
+                private string myField = "Some Value";
+                private void OnFieldChanged(string value) { }
+            }
+            """);
+
+        CompileToAssembly(generated);
+        Assert.Empty(generated.RazorDiagnostics);
+    }
+
+    [IntegrationTestFact, WorkItem("https://github.com/dotnet/razor/issues/10553")]
+    public void Component_WithEditorRequiredParameter_ValueSpecifiedUsingBindGet()
+    {
+        AdditionalSyntaxTrees.Add(Parse("""
+            using System;
+            using Microsoft.AspNetCore.Components;
+
+            namespace Test;
+
+            public class ComponentWithEditorRequiredParameters : ComponentBase
+            {
+                [Parameter]
+                [EditorRequired]
+                public string Property1 { get; set; }
+            }
+            """));
+
+        var generated = CompileToCSharp("""
+            <ComponentWithEditorRequiredParameters @bind-Property1:get="myField" />
+
+            @code {
+                private string myField = "Some Value";
+            }
+            """);
+
+        CompileToAssembly(generated);
+        Assert.Empty(generated.RazorDiagnostics);
+    }
+
+    [IntegrationTestFact, WorkItem("https://github.com/dotnet/razor/issues/10553")]
+    public void Component_WithEditorRequiredParameter_ValueSpecifiedUsingBindSet()
+    {
+        AdditionalSyntaxTrees.Add(Parse("""
+            using System;
+            using Microsoft.AspNetCore.Components;
+
+            namespace Test;
+
+            public class ComponentWithEditorRequiredParameters : ComponentBase
+            {
+                [Parameter]
+                [EditorRequired]
+                public string Property1 { get; set; }
+            }
+            """));
+
+        var generated = CompileToCSharp("""
+            <ComponentWithEditorRequiredParameters @bind-Property1:set="OnFieldChanged" />
+
+            @code {
+                private void OnFieldChanged(string value) { }
+            }
+            """);
+
+        var compiled = CompileToAssembly(generated);
+        generated.RazorDiagnostics.Verify(
+            // x:\dir\subdir\Test\TestComponent.cshtml(1,61): error RZ10016: Attribute 'bind-Property1:set' was used but no attribute 'bind-Property1:get' was found.
+            Diagnostic("RZ10016").WithLocation(1, 61));
+    }
+
     [IntegrationTestFact]
     public void Component_WithEditorRequiredChildContent_NoValueSpecified()
     {
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentLoweringPass.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentLoweringPass.cs
index e01340e82cf..8d809696490 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentLoweringPass.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentLoweringPass.cs
@@ -203,10 +203,17 @@ static bool IsPresentAsAttribute(string attributeName, ComponentIntermediateNode
                 const string bindPrefix = "@bind-";
                 if (child is TagHelperDirectiveAttributeIntermediateNode { OriginalAttributeName: { } originalAttributeName } &&
                     originalAttributeName.StartsWith(bindPrefix, StringComparison.Ordinal) &&
-                    originalAttributeName.AsSpan()[bindPrefix.Length..].Equals(attributeName.AsSpan(), StringComparison.Ordinal))
+                    originalAttributeName.AsSpan(start: bindPrefix.Length).Equals(attributeName.AsSpan(), StringComparison.Ordinal))
                 {
                     return true;
                 }
+                if (child is TagHelperDirectiveAttributeParameterIntermediateNode { OriginalAttributeName: { } originalName, AttributeNameWithoutParameter: { } nameWithoutParameter } &&
+                    originalName.StartsWith(bindPrefix, StringComparison.Ordinal) &&
+                    nameWithoutParameter.AsSpan(start: bindPrefix.Length - 1).Equals(attributeName.AsSpan(), StringComparison.Ordinal))
+                {
+                    // `@bind-Value:get` or `@bind-Value:set` is specified.
+                    return true;
+                }
             }
 
             return false;
diff --git a/src/Compiler/perf/Microbenchmarks/MSN.cshtml b/src/Compiler/perf/Microbenchmarks/MSN.cshtml
index 4867dc938dc..d7550b14140 100644
--- a/src/Compiler/perf/Microbenchmarks/MSN.cshtml
+++ b/src/Compiler/perf/Microbenchmarks/MSN.cshtml
@@ -772,12 +772,12 @@
 
                 </li>
                 <li>
-                        <a   href="/en-us/news/world/turkey-detains-8-europe-bound-is-suspects-posing-as-refugees/ar-BBn9KSX?li=AAa0dzB"
+                        <a   href="/en-us/news/world/police-detains-8-europe-bound-is-suspects-posing-as-refugees/ar-BBn9KSX?li=AAa0dzB"
         data-id="115" data-m='{"i":115,"p":112,"n":"HeadlineItemViewModel","y":13,"l":"BBn9KSX","h":0,"v":"news","c":"newsworld","o":3}'  >
         
 
             <div class="caption">
-        <span class="title" >Turkey detains 8 IS suspects &#39;posing as refugees&#39;</span>
+        <span class="title" >Police detains 8 IS suspects &#39;posing as refugees&#39;</span>
         <span class="sourcename">
             <img alt="" data-src="{&quot;default&quot;:&quot;//img-s-msn-com.akamaized.net/tenant/amp/entityid/BB74fLs.img?h=16&amp;w=16&amp;m=6&amp;q=60&amp;u=t&amp;o=t&amp;l=f&amp;f=png&quot;}" src="//static-hp-wus.s-msn.com/sc/9b/e151e5.gif" />
             AFP
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Resources/project.razor.bin b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Resources/project.razor.bin
deleted file mode 100644
index 81821a1dbd8..00000000000
Binary files a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Resources/project.razor.bin and /dev/null differ
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Utilities/FilePathNormalizer.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Utilities/FilePathNormalizer.cs
index 54bd1ac5c91..4d3a5e3db8f 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Utilities/FilePathNormalizer.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Utilities/FilePathNormalizer.cs
@@ -18,7 +18,7 @@ internal static class FilePathNormalizer
 
     public static string NormalizeDirectory(string? directoryFilePath)
     {
-        if (directoryFilePath.IsNullOrEmpty())
+        if (directoryFilePath.IsNullOrEmpty() || directoryFilePath == "/")
         {
             return "/";
         }
@@ -28,16 +28,15 @@ public static string NormalizeDirectory(string? directoryFilePath)
         // Ensure that the array is at least 1 character larger, so that we can add
         // a trailing space after normalization if necessary.
         var arrayLength = directoryFilePathSpan.Length + 1;
-        using var _ = ArrayPool<char>.Shared.GetPooledArray(arrayLength, out var array);
-        var arraySpan = array.AsSpan(0, arrayLength);
-        var (start, length) = NormalizeCore(directoryFilePathSpan, arraySpan);
-        ReadOnlySpan<char> normalizedSpan = arraySpan.Slice(start, length);
+        using var _ = ArrayPool<char>.Shared.GetPooledArraySpan(arrayLength, out var destination);
+        var (start, length) = NormalizeCore(directoryFilePathSpan, destination);
+        ReadOnlySpan<char> normalizedSpan = destination.Slice(start, length);
 
         // Add a trailing slash if the normalized span doesn't end in one.
         if (normalizedSpan is not [.., '/'])
         {
-            arraySpan[start + length] = '/';
-            normalizedSpan = arraySpan.Slice(start, length + 1);
+            destination[start + length] = '/';
+            normalizedSpan = destination.Slice(start, length + 1);
         }
 
         if (directoryFilePathSpan.Equals(normalizedSpan, StringComparison.Ordinal))
@@ -58,8 +57,8 @@ public static string Normalize(string? filePath)
         var filePathSpan = filePath.AsSpan();
 
         // Rent a buffer for Normalize to write to.
-        using var _ = ArrayPool<char>.Shared.GetPooledArray(filePathSpan.Length, out var array);
-        var normalizedSpan = NormalizeCoreAndGetSpan(filePathSpan, array);
+        using var _ = ArrayPool<char>.Shared.GetPooledArraySpan(filePathSpan.Length, out var destination);
+        var normalizedSpan = NormalizeCoreAndGetSpan(filePathSpan, destination);
 
         // If we didn't change anything, just return the original string.
         if (filePathSpan.Equals(normalizedSpan, StringComparison.Ordinal))
@@ -76,15 +75,15 @@ public static string Normalize(string? filePath)
     /// </summary>
     public static string GetNormalizedDirectoryName(string? filePath)
     {
-        if (filePath.IsNullOrEmpty())
+        if (filePath.IsNullOrEmpty() || filePath == "/")
         {
             return "/";
         }
 
         var filePathSpan = filePath.AsSpan();
 
-        using var _1 = ArrayPool<char>.Shared.GetPooledArray(filePathSpan.Length, out var array);
-        var directoryNameSpan = NormalizeDirectoryNameCore(filePathSpan, array);
+        using var _1 = ArrayPool<char>.Shared.GetPooledArraySpan(filePathSpan.Length, out var destination);
+        var directoryNameSpan = NormalizeDirectoryNameCore(filePathSpan, destination);
 
         if (filePathSpan.Equals(directoryNameSpan, StringComparison.Ordinal))
         {
@@ -108,11 +107,11 @@ public static bool AreDirectoryPathsEquivalent(string? filePath1, string? filePa
             return false;
         }
 
-        using var _1 = ArrayPool<char>.Shared.GetPooledArray(filePathSpan1.Length, out var array1);
-        var normalizedSpan1 = NormalizeDirectoryNameCore(filePathSpan1, array1);
+        using var _1 = ArrayPool<char>.Shared.GetPooledArraySpan(filePathSpan1.Length, out var destination1);
+        var normalizedSpan1 = NormalizeDirectoryNameCore(filePathSpan1, destination1);
 
-        using var _2 = ArrayPool<char>.Shared.GetPooledArray(filePathSpan2.Length, out var array2);
-        var normalizedSpan2 = NormalizeDirectoryNameCore(filePathSpan2, array2);
+        using var _2 = ArrayPool<char>.Shared.GetPooledArraySpan(filePathSpan2.Length, out var destination2);
+        var normalizedSpan2 = NormalizeDirectoryNameCore(filePathSpan2, destination2);
 
         return normalizedSpan1.Equals(normalizedSpan2, FilePathComparison.Instance);
     }
@@ -131,11 +130,11 @@ public static bool AreFilePathsEquivalent(string? filePath1, string? filePath2)
             return false;
         }
 
-        using var _1 = ArrayPool<char>.Shared.GetPooledArray(filePathSpan1.Length, out var array1);
-        var normalizedSpan1 = NormalizeCoreAndGetSpan(filePathSpan1, array1);
+        using var _1 = ArrayPool<char>.Shared.GetPooledArraySpan(filePathSpan1.Length, out var destination1);
+        var normalizedSpan1 = NormalizeCoreAndGetSpan(filePathSpan1, destination1);
 
-        using var _2 = ArrayPool<char>.Shared.GetPooledArray(filePathSpan2.Length, out var array2);
-        var normalizedSpan2 = NormalizeCoreAndGetSpan(filePathSpan2, array2);
+        using var _2 = ArrayPool<char>.Shared.GetPooledArraySpan(filePathSpan2.Length, out var destination2);
+        var normalizedSpan2 = NormalizeCoreAndGetSpan(filePathSpan2, destination2);
 
         return normalizedSpan1.Equals(normalizedSpan2, FilePathComparison.Instance);
     }
@@ -149,8 +148,8 @@ public static int GetHashCode(string filePath)
 
         var filePathSpan = filePath.AsSpanOrDefault();
 
-        using var _ = ArrayPool<char>.Shared.GetPooledArray(filePathSpan.Length, out var array1);
-        var normalizedSpan = NormalizeCoreAndGetSpan(filePathSpan, array1);
+        using var _ = ArrayPool<char>.Shared.GetPooledArraySpan(filePathSpan.Length, out var destination);
+        var normalizedSpan = NormalizeCoreAndGetSpan(filePathSpan, destination);
 
         var hashCombiner = HashCodeCombiner.Start();
 
@@ -253,7 +252,8 @@ private static void NormalizeAndDedupeSlashes(Span<char> span, ref int charsWrit
             {
                 writeSlot = '/';
 
-                if (Unsafe.Add(ref readSlot, 1) is '/' or '\\')
+                // Be careful not to read past the end of the span.
+                if (read < charsWritten - 1 && Unsafe.Add(ref readSlot, 1) is '/' or '\\')
                 {
                     // We found two slashes in a row. If we are at the start of the path,
                     // we we are at '\\network' paths, so want to leave them alone. Otherwise
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/TagHelperTooltipFactoryBaseTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/TagHelperTooltipFactoryBaseTest.cs
index 7a635a05f7a..e5ccc0e268d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/TagHelperTooltipFactoryBaseTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/TagHelperTooltipFactoryBaseTest.cs
@@ -10,6 +10,7 @@
 using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.LanguageServer.Tooltip;
 using Microsoft.AspNetCore.Razor.ProjectSystem;
+using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Roslyn.Test.Utilities;
@@ -374,7 +375,7 @@ await projectManager.UpdateAsync(updater =>
         {
             updater.ProjectAdded(hostProject);
             updater.ProjectWorkspaceStateChanged(hostProject.Key, projectWorkspaceState);
-            updater.DocumentAdded(hostProject.Key, hostDocument, CreateTextLoader(hostDocument.FilePath, text: ""));
+            updater.DocumentAdded(hostProject.Key, hostDocument, TestMocks.CreateTextLoader(hostDocument.FilePath, text: ""));
         });
 
         var service = new TestTagHelperToolTipFactory(projectManager);
@@ -419,11 +420,11 @@ await projectManager.UpdateAsync(updater =>
         {
             updater.ProjectAdded(hostProject1);
             updater.ProjectWorkspaceStateChanged(hostProject1.Key, projectWorkspaceState);
-            updater.DocumentAdded(hostProject1.Key, hostDocument, CreateTextLoader(hostDocument.FilePath, text: ""));
+            updater.DocumentAdded(hostProject1.Key, hostDocument, TestMocks.CreateTextLoader(hostDocument.FilePath, text: ""));
 
             updater.ProjectAdded(hostProject2);
             updater.ProjectWorkspaceStateChanged(hostProject2.Key, projectWorkspaceState);
-            updater.DocumentAdded(hostProject2.Key, hostDocument, CreateTextLoader(hostDocument.FilePath, text: ""));
+            updater.DocumentAdded(hostProject2.Key, hostDocument, TestMocks.CreateTextLoader(hostDocument.FilePath, text: ""));
         });
 
         var service = new TestTagHelperToolTipFactory(projectManager);
@@ -468,10 +469,10 @@ await projectManager.UpdateAsync(updater =>
         {
             updater.ProjectAdded(hostProject1);
             updater.ProjectWorkspaceStateChanged(hostProject1.Key, projectWorkspaceState);
-            updater.DocumentAdded(hostProject1.Key, hostDocument, CreateTextLoader(hostDocument.FilePath, text: ""));
+            updater.DocumentAdded(hostProject1.Key, hostDocument, TestMocks.CreateTextLoader(hostDocument.FilePath, text: ""));
 
             updater.ProjectAdded(hostProject2);
-            updater.DocumentAdded(hostProject2.Key, hostDocument, CreateTextLoader(hostDocument.FilePath, text: ""));
+            updater.DocumentAdded(hostProject2.Key, hostDocument, TestMocks.CreateTextLoader(hostDocument.FilePath, text: ""));
         });
 
         var service = new TestTagHelperToolTipFactory(projectManager);
@@ -512,10 +513,10 @@ public async Task GetAvailableProjects_NotAvailableInAnyProject_ReturnsText()
         await projectManager.UpdateAsync(updater =>
         {
             updater.ProjectAdded(hostProject1);
-            updater.DocumentAdded(hostProject1.Key, hostDocument, CreateTextLoader(hostDocument.FilePath, text: ""));
+            updater.DocumentAdded(hostProject1.Key, hostDocument, TestMocks.CreateTextLoader(hostDocument.FilePath, text: ""));
 
             updater.ProjectAdded(hostProject2);
-            updater.DocumentAdded(hostProject2.Key, hostDocument, CreateTextLoader(hostDocument.FilePath, text: ""));
+            updater.DocumentAdded(hostProject2.Key, hostDocument, TestMocks.CreateTextLoader(hostDocument.FilePath, text: ""));
         });
 
         var service = new TestTagHelperToolTipFactory(projectManager);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentContextFactoryTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentContextFactoryTest.cs
index 3c549217fe2..31394f347d2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentContextFactoryTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentContextFactoryTest.cs
@@ -67,7 +67,7 @@ public async Task TryCreateForOpenDocumentAsync_CanNotResolveVersion_ReturnsNull
 
         await _projectManager.UpdateAsync(updater =>
         {
-            updater.DocumentAdded(MiscFilesHostProject.Instance.Key, hostDocument, CreateTextLoader(filePath, ""));
+            updater.DocumentAdded(MiscFilesHostProject.Instance.Key, hostDocument, TestMocks.CreateTextLoader(filePath, ""));
         });
 
         var factory = new DocumentContextFactory(_projectManager, _documentVersionCache, LoggerFactory);
@@ -87,7 +87,7 @@ public async Task TryCreateAsync_ResolvesContent()
 
         await _projectManager.UpdateAsync(updater =>
         {
-            updater.DocumentAdded(MiscFilesHostProject.Instance.Key, hostDocument, CreateTextLoader(filePath, ""));
+            updater.DocumentAdded(MiscFilesHostProject.Instance.Key, hostDocument, TestMocks.CreateTextLoader(filePath, ""));
         });
 
         var miscFilesProject = _projectManager.GetMiscellaneousProject();
@@ -142,7 +142,7 @@ public async Task TryCreateForOpenDocumentAsync_ResolvesContent()
 
         await _projectManager.UpdateAsync(updater =>
         {
-            updater.DocumentAdded(MiscFilesHostProject.Instance.Key, hostDocument, CreateTextLoader(filePath, ""));
+            updater.DocumentAdded(MiscFilesHostProject.Instance.Key, hostDocument, TestMocks.CreateTextLoader(filePath, ""));
         });
 
         var miscFilesProject = _projectManager.GetMiscellaneousProject();
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.ProjectEngineHost.Test/Serialization/SerializerValidationTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.ProjectEngineHost.Test/Serialization/SerializerValidationTest.cs
index 1ff33741a4c..5cd9e7e4863 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.ProjectEngineHost.Test/Serialization/SerializerValidationTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.ProjectEngineHost.Test/Serialization/SerializerValidationTest.cs
@@ -125,66 +125,6 @@ public void VerifyJson_TagHelpers(string resourceName, string? folderName = null
         Assert.Equal<TagHelperDescriptor>(originalTagHelpers, actualTagHelpers);
     }
 
-    /// <summary>
-    /// Verifies that a previous generated file is able to be serialized. If this
-    /// fails make sure to do ONE of the following:
-    ///
-    /// 1. Update the deserializer to be lenient on the previous version
-    /// 2. Bump the Microsoft.AspNetCore.Razor.Serialization.MessagePack.SerializationFormat.Version
-    ///     a. Generate a new file to replace project.razor.bin with the new format. This can be achieved by calling GenerateProjectRazorBin below.
-    ///     b. This will require a dual insertion with Roslyn do use the correct version number
-    /// </summary>
-    [Theory]
-    [InlineData("project.razor.bin")]
-    public void VerifyMessagePack_DeserializeMessagePack(string resourceName)
-    {
-        // Arrange
-        var resourceBytes = RazorTestResources.GetResourceBytes(resourceName, "Benchmarking");
-        var options = MessagePackSerializerOptions.Standard
-            .WithResolver(CompositeResolver.Create(
-                RazorProjectInfoResolver.Instance,
-                StandardResolver.Instance));
-
-        // Act
-        RazorProjectInfo actualProjectInfo;
-        try
-        {
-            actualProjectInfo = MessagePackConvert.Deserialize<RazorProjectInfo>(resourceBytes, options);
-        }
-        catch (MessagePackSerializationException ex) when (ex.InnerException is RazorProjectInfoSerializationException)
-        {
-            Assert.Fail($"{typeof(MessagePackSerializationFormat).FullName}.{nameof(MessagePackSerializationFormat.Version)} has changed. Re-generate the project.razor.bin for this test.");
-            return;
-        }
-
-        // Assert
-        Assert.NotNull(actualProjectInfo);
-        Assert.NotNull(actualProjectInfo.DisplayName);
-    }
-
-#pragma warning disable IDE0051 // Remove unused private members
-    private void GenerateProjectRazorBin()
-    {
-        var resourceBytes = RazorTestResources.GetResourceBytes("project.razor.json", "Benchmarking");
-        var projectInfo = DeserializeProjectInfoFromJsonBytes(resourceBytes);
-
-        var options = MessagePackSerializerOptions.Standard
-            .WithResolver(CompositeResolver.Create(
-                RazorProjectInfoResolver.Instance,
-                StandardResolver.Instance));
-
-        var filePath = Assembly.GetExecutingAssembly().Location;
-        var binFilePath = Path.Combine(Path.GetDirectoryName(filePath).AssumeNotNull(), "project.razor.bin");
-
-        using (var stream = File.OpenWrite(binFilePath))
-        {
-            MessagePackSerializer.Serialize(stream, projectInfo, options);
-        }
-
-        Logger.LogInformation($"New project.razor.bin written to '{binFilePath}'");
-    }
-#pragma warning restore IDE0051 // Remove unused private members
-
     private static RazorProjectInfo DeserializeProjectInfoFromJsonBytes(byte[] resourceBytes)
     {
         using var stream = new MemoryStream(resourceBytes);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/LanguageServerTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/LanguageServerTestBase.cs
index b8a4e215aad..e7e0f6e87e2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/LanguageServerTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/LanguageServerTestBase.cs
@@ -24,7 +24,6 @@
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CommonLanguageServerProtocol.Framework;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Moq;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
@@ -131,23 +130,6 @@ private protected static VersionedDocumentContext CreateDocumentContext(Uri uri,
         return new VersionedDocumentContext(uri, snapshot, projectContext: null, version: 0);
     }
 
-    protected static TextLoader CreateTextLoader(string filePath, string text)
-    {
-        return CreateTextLoader(filePath, SourceText.From(text));
-    }
-
-    protected static TextLoader CreateTextLoader(string filePath, SourceText text)
-    {
-        var mock = new StrictMock<TextLoader>();
-
-        var textAndVersion = TextAndVersion.Create(text, VersionStamp.Create(), filePath);
-
-        mock.Setup(x => x.LoadTextAndVersionAsync(It.IsAny<LoadTextOptions>(), It.IsAny<CancellationToken>()))
-            .ReturnsAsync(textAndVersion);
-
-        return mock.Object;
-    }
-
     private protected static RazorLSPOptionsMonitor GetOptionsMonitor(bool enableFormatting = true, bool autoShowCompletion = true, bool autoListParams = true, bool formatOnType = true, bool autoInsertAttributeQuotes = true, bool colorBackground = false, bool codeBlockBraceOnNextLine = false, bool commitElementsWithSpace = true)
     {
         var configService = StrictMock.Of<IConfigurationSyncService>();
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Logging/TestOutputLogger.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Logging/TestOutputLogger.cs
index f0cc8891511..3db5c90b6f4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Logging/TestOutputLogger.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Logging/TestOutputLogger.cs
@@ -73,10 +73,11 @@ public void Log(LogLevel logLevel, string message, Exception? exception)
         try
         {
             _provider.TestOutputHelper.WriteLine(finalMessage);
-        }
-        catch (InvalidOperationException iex) when (iex.Message == "There is no currently active test.")
-        {
-            // Ignore, something is logging a message outside of a test. Other loggers will capture it.
+
+            if (exception is not null)
+            {
+                _provider.TestOutputHelper.WriteLine(exception.ToString());
+            }
         }
         catch (Exception ex)
         {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj
index ce2bbfdb4f3..6caeb6b2982 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj
@@ -21,7 +21,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="..\..\benchmarks\Microsoft.AspNetCore.Razor.Microbenchmarks\Resources\project.razor.bin" Link="Resources\Benchmarking\project.razor.bin" />
     <EmbeddedResource Include="..\..\benchmarks\Microsoft.AspNetCore.Razor.Microbenchmarks\Resources\project.razor.json" Link="Resources\Benchmarking\project.razor.json" />
     <EmbeddedResource Include="..\..\benchmarks\Microsoft.AspNetCore.Razor.Microbenchmarks\Resources\taghelpers.json" Link="Resources\Benchmarking\taghelpers.json" />
     <EmbeddedResource Include="..\..\benchmarks\Microsoft.AspNetCore.Razor.Microbenchmarks\Resources\Telerik\Kendo.Mvc.Examples.project.razor.json" Link="Resources\Benchmarking\Kendo.Mvc.Examples.project.razor.json" />
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/TestMocks.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/TestMocks.cs
new file mode 100644
index 00000000000..1e0a3dbd2e7
--- /dev/null
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/TestMocks.cs
@@ -0,0 +1,29 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Moq;
+
+namespace Microsoft.AspNetCore.Razor.Test.Common;
+
+internal static class TestMocks
+{
+    public static TextLoader CreateTextLoader(string filePath, string text)
+    {
+        return CreateTextLoader(filePath, SourceText.From(text));
+    }
+
+    public static TextLoader CreateTextLoader(string filePath, SourceText text)
+    {
+        var mock = new StrictMock<TextLoader>();
+
+        var textAndVersion = TextAndVersion.Create(text, VersionStamp.Create(), filePath);
+
+        mock.Setup(x => x.LoadTextAndVersionAsync(It.IsAny<LoadTextOptions>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(textAndVersion);
+
+        return mock.Object;
+    }
+}
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/HtmlDocumentSynchronizerTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/HtmlDocumentSynchronizerTest.cs
index e6683df3ac7..6e31aeef793 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/HtmlDocumentSynchronizerTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/HtmlDocumentSynchronizerTest.cs
@@ -40,10 +40,6 @@ public async Task TrySynchronize_NewDocument_Generates()
 
         Assert.True(await synchronizer.TrySynchronizeAsync(document, DisposalToken));
 
-        var version = await RazorDocumentVersion.CreateAsync(document, DisposalToken);
-
-        Assert.Equal(1, version.WorkspaceVersion);
-
         Assert.Collection(publisher.Publishes,
             i =>
             {
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/TestBrokeredServiceInterceptor.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/TestBrokeredServiceInterceptor.cs
index 4c8e70ed2ea..7d0da662311 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/TestBrokeredServiceInterceptor.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/TestBrokeredServiceInterceptor.cs
@@ -4,21 +4,19 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Microsoft.CodeAnalysis.Remote.Razor;
+using Xunit;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 
 internal sealed class TestBrokeredServiceInterceptor : IRazorBrokeredServiceInterceptor
 {
-    private Solution? _solution;
+    private readonly TestSolutionStore _solutionStore = new();
 
-    public void UpdateSolution(Solution solution)
-    {
-        _solution = solution;
-    }
+    public Task<RazorPinnedSolutionInfoWrapper> GetSolutionInfoAsync(Solution solution, CancellationToken cancellationToken)
+        => _solutionStore.AddAsync(solution, cancellationToken);
 
     public ValueTask RunServiceAsync(
         Func<CancellationToken, ValueTask> implementation,
@@ -29,5 +27,11 @@ public ValueTask<T> RunServiceAsync<T>(
         RazorPinnedSolutionInfoWrapper solutionInfo,
         Func<Solution, ValueTask<T>> implementation,
         CancellationToken cancellationToken)
-        => implementation(_solution.AssumeNotNull());
+    {
+        var solution = _solutionStore.Get(solutionInfo);
+
+        Assert.NotNull(solution);
+
+        return implementation(solution);
+    }
 }
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/TestRemoteServiceInvoker.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/TestRemoteServiceInvoker.cs
index 52f5af1e270..9e5c8651aac 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/TestRemoteServiceInvoker.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/TestRemoteServiceInvoker.cs
@@ -53,11 +53,7 @@ private async Task<TService> GetOrCreateServiceAsync<TService>()
     {
         var service = await GetOrCreateServiceAsync<TService>();
 
-        // In an ideal world we'd be able to maintain a dictionary of solution checksums in TestServiceBroker, and use
-        // the RazorPinnedSolutionInfoWrapper properly, but we need Roslyn changes for that. For now, this works fine
-        // as we don't have any code that makes multiple parallel calls to TryInvokeAsync in the same test.
-        var solutionInfo = new RazorPinnedSolutionInfoWrapper();
-        _serviceInterceptor.UpdateSolution(solution);
+        var solutionInfo = await _serviceInterceptor.GetSolutionInfoAsync(solution, cancellationToken);
         return await invocation(service, solutionInfo, cancellationToken);
     }
 
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DocumentGenerator/BackgroundDocumentGeneratorTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DocumentGenerator/BackgroundDocumentGeneratorTest.cs
index 45628cfe6af..67a071ed8a7 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DocumentGenerator/BackgroundDocumentGeneratorTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DocumentGenerator/BackgroundDocumentGeneratorTest.cs
@@ -14,14 +14,17 @@
 using Microsoft.AspNetCore.Razor.ProjectSystem;
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.AspNetCore.Razor.Test.Common.VisualStudio;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Logging;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Razor.DynamicFiles;
 using Moq;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;
+namespace Microsoft.VisualStudio.Razor.ProjectSystem;
 
 // These tests are really integration tests. There isn't a good way to unit test this functionality since
 // the only thing in here is threading.
@@ -219,27 +222,32 @@ await projectManager.UpdateAsync(updater =>
     [UIFact]
     public async Task ProcessWorkAndRestart()
     {
+        var hostProject1 = TestProjectData.SomeProject;
+        var hostProject2 = TestProjectData.AnotherProject;
+        var hostDocument1 = TestProjectData.SomeProjectFile1;
+        var hostDocument2 = TestProjectData.SomeProjectFile2;
+
         // Arrange
         var projectManager = CreateProjectSnapshotManager();
 
         await projectManager.UpdateAsync(updater =>
         {
-            updater.ProjectAdded(s_hostProject1);
-            updater.ProjectAdded(s_hostProject2);
-            updater.DocumentAdded(s_hostProject1.Key, s_documents[0], null!);
-            updater.DocumentAdded(s_hostProject1.Key, s_documents[1], null!);
+            updater.ProjectAdded(hostProject1);
+            updater.ProjectAdded(hostProject2);
+            updater.DocumentAdded(hostProject1.Key, hostDocument1, null!);
+            updater.DocumentAdded(hostProject1.Key, hostDocument2, null!);
         });
 
-        var project = projectManager.GetLoadedProject(s_hostProject1.Key);
-        var documentKey1 = new DocumentKey(project.Key, s_documents[0].FilePath);
-        var documentKey2 = new DocumentKey(project.Key, s_documents[1].FilePath);
+        var project = projectManager.GetLoadedProject(hostProject1.Key);
+        var documentKey1 = new DocumentKey(project.Key, hostDocument1.FilePath);
+        var documentKey2 = new DocumentKey(project.Key, hostDocument2.FilePath);
 
         using var generator = new TestBackgroundDocumentGenerator(projectManager, _dynamicFileInfoProvider, LoggerFactory);
 
         // Act & Assert
 
         // First, enqueue some work.
-        generator.Enqueue(project, project.GetDocument(s_documents[0].FilePath).AssumeNotNull());
+        generator.Enqueue(project, project.GetDocument(hostDocument1.FilePath).AssumeNotNull());
 
         // Wait for the work to complete.
         await generator.WaitUntilCurrentBatchCompletesAsync();
@@ -248,14 +256,14 @@ await projectManager.UpdateAsync(updater =>
         Assert.Single(generator.CompletedWork, documentKey1);
 
         // Enqueue more work.
-        generator.Enqueue(project, project.GetDocument(s_documents[1].FilePath).AssumeNotNull());
+        generator.Enqueue(project, project.GetDocument(hostDocument2.FilePath).AssumeNotNull());
 
         // Wait for the work to complete.
         await generator.WaitUntilCurrentBatchCompletesAsync();
 
         Assert.Collection(generator.CompletedWork.OrderBy(key => key.DocumentFilePath),
-            key => Assert.Equal(documentKey2, key),
-            key => Assert.Equal(documentKey1, key));
+            key => Assert.Equal(documentKey1, key),
+            key => Assert.Equal(documentKey2, key));
     }
 
     [UIFact]
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Documents/VisualStudioFileChangeTrackerTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Documents/VisualStudioFileChangeTrackerTest.cs
index 2b75b031509..b708a37e657 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Documents/VisualStudioFileChangeTrackerTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Documents/VisualStudioFileChangeTrackerTest.cs
@@ -79,6 +79,7 @@ public async Task StopListening_UnadvisesForFileChange()
             .Verifiable();
         fileChangeService
             .Setup(f => f.UnadviseFileChangeAsync(123, It.IsAny<CancellationToken>()))
+            .ReturnsAsync(TestProjectData.SomeProjectImportFile.FilePath)
             .Verifiable();
         var tracker = new VisualStudioFileChangeTracker(
             TestProjectData.SomeProjectImportFile.FilePath,
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/ProjectSystem/RazorProjectInfoDriverTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/ProjectSystem/RazorProjectInfoDriverTest.cs
index 6ff9e9b0675..1cf6ee0b788 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/ProjectSystem/RazorProjectInfoDriverTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/ProjectSystem/RazorProjectInfoDriverTest.cs
@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
 using Microsoft.AspNetCore.Razor.ProjectSystem;
+using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Xunit;
@@ -41,10 +42,10 @@ public async Task ProcessesExistingProjectsDuringInitialization()
         await projectManager.UpdateAsync(static updater =>
         {
             updater.ProjectAdded(s_hostProject1);
-            updater.DocumentAdded(s_hostProject1.Key, s_hostDocument1, CreateTextLoader(s_hostDocument1.FilePath, "<p>Hello World</p>"));
+            updater.DocumentAdded(s_hostProject1.Key, s_hostDocument1, TestMocks.CreateTextLoader(s_hostDocument1.FilePath, "<p>Hello World</p>"));
 
             updater.ProjectAdded(s_hostProject2);
-            updater.DocumentAdded(s_hostProject2.Key, s_hostDocument2, CreateTextLoader(s_hostDocument2.FilePath, "<p>Hello World</p>"));
+            updater.DocumentAdded(s_hostProject2.Key, s_hostDocument2, TestMocks.CreateTextLoader(s_hostDocument2.FilePath, "<p>Hello World</p>"));
         });
 
         var (driver, testAccessor) = await CreateDriverAndInitializeAsync(projectManager);
@@ -93,10 +94,10 @@ public async Task ProcessesProjectsAddedAfterInitialization()
         await projectManager.UpdateAsync(static updater =>
         {
             updater.ProjectAdded(s_hostProject1);
-            updater.DocumentAdded(s_hostProject1.Key, s_hostDocument1, CreateTextLoader(s_hostDocument1.FilePath, "<p>Hello World</p>"));
+            updater.DocumentAdded(s_hostProject1.Key, s_hostDocument1, TestMocks.CreateTextLoader(s_hostDocument1.FilePath, "<p>Hello World</p>"));
 
             updater.ProjectAdded(s_hostProject2);
-            updater.DocumentAdded(s_hostProject2.Key, s_hostDocument2, CreateTextLoader(s_hostDocument2.FilePath, "<p>Hello World</p>"));
+            updater.DocumentAdded(s_hostProject2.Key, s_hostDocument2, TestMocks.CreateTextLoader(s_hostDocument2.FilePath, "<p>Hello World</p>"));
         });
 
         await testAccessor.WaitUntilCurrentBatchCompletesAsync();
@@ -134,7 +135,7 @@ await projectManager.UpdateAsync(static updater =>
 
         await projectManager.UpdateAsync(static updater =>
         {
-            updater.DocumentAdded(s_hostProject1.Key, s_hostDocument1, CreateTextLoader(s_hostDocument1.FilePath, "<p>Hello World</p>"));
+            updater.DocumentAdded(s_hostProject1.Key, s_hostDocument1, TestMocks.CreateTextLoader(s_hostDocument1.FilePath, "<p>Hello World</p>"));
         });
 
         await testAccessor.WaitUntilCurrentBatchCompletesAsync();
@@ -204,7 +205,7 @@ await projectManager.UpdateAsync(static updater =>
 
         await projectManager.UpdateAsync(static updater =>
         {
-            updater.DocumentAdded(s_hostProject1.Key, s_hostDocument1, CreateTextLoader(s_hostDocument1.FilePath, "<p>Hello World</p>"));
+            updater.DocumentAdded(s_hostProject1.Key, s_hostDocument1, TestMocks.CreateTextLoader(s_hostDocument1.FilePath, "<p>Hello World</p>"));
         });
 
         await testAccessor.WaitUntilCurrentBatchCompletesAsync();
diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj
index 24a8a0d572b..3a4cb87b365 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj
+++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj
@@ -37,7 +37,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Extensibility.Testing.Xunit" />
     <PackageReference Include="Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator" />
     <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" />
-    <PackageReference Include="NuGet.SolutionRestoreManager.Interop" />
+    <PackageReference Include="NuGet.VisualStudio" />
     <PackageReference Include="Microsoft.Internal.VisualStudio.Shell.Framework" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.utility" />
diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/DiagnosticExtensions.cs b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/DiagnosticExtensions.cs
new file mode 100644
index 00000000000..54f800e718d
--- /dev/null
+++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/DiagnosticExtensions.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.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Test.Utilities;
+using Microsoft.NET.Sdk.Razor.SourceGenerators;
+
+namespace Microsoft.CodeAnalysis;
+
+public static class RazorDiagnosticExtensions
+{
+    public static void Verify(
+        this IEnumerable<RazorDiagnostic> diagnostics,
+        params DiagnosticDescription[] expected)
+    {
+        diagnostics.Select(d => d.AsDiagnostic()).Verify(expected);
+    }
+}
diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/ArrayExtensions.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/ArrayExtensions.cs
index 2663e636bd7..f09b4c8176e 100644
--- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/ArrayExtensions.cs
+++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/ArrayExtensions.cs
@@ -1,13 +1,188 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 
+#if !NET
+using ThrowHelper = Microsoft.AspNetCore.Razor.Utilities.ThrowHelper;
+#endif
+
 namespace Microsoft.AspNetCore.Razor;
 
 internal static class ArrayExtensions
 {
+    /// <summary>
+    ///  Creates a new span over the portion of the target array defined by an <see cref="Index"/> value.
+    /// </summary>
+    /// <param name="array">
+    ///  The array to convert.
+    /// </param>
+    /// <param name="startIndex">
+    ///  The starting index.
+    /// </param>
+    /// <remarks>
+    ///  This uses Razor's <see cref="Index"/> type, which is type-forwarded on .NET.
+    /// </remarks>
+    /// <exception cref="ArgumentNullException">
+    ///  <paramref name="array"/> is <see langword="null"/>.
+    /// </exception>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="startIndex"/> is less than 0 or greater than <paramref name="array"/>.Length.
+    /// </exception>
+    /// <exception cref="ArrayTypeMismatchException">
+    ///  <paramref name="array"/> is covariant, and the array's type is not exactly <typeparamref name="T"/>[].
+    /// </exception>
+    public static ReadOnlySpan<T> AsSpan<T>(this T[]? array, Index startIndex)
+    {
+#if NET
+        return MemoryExtensions.AsSpan(array, startIndex);
+#else
+        if (array is null)
+        {
+            if (!startIndex.Equals(Index.Start))
+            {
+                ThrowHelper.ThrowArgumentOutOfRange(nameof(startIndex));
+            }
+
+            return default;
+        }
+
+        return MemoryExtensions.AsSpan(array, startIndex.GetOffset(array.Length));
+#endif
+    }
+
+    /// <summary>
+    ///  Creates a new span over the portion of the target array defined by a <see cref="Range"/> value.
+    /// </summary>
+    /// <param name="array">
+    ///  The array to convert.
+    /// </param>
+    /// <param name="range">
+    ///  The range of the array to convert.
+    /// </param>
+    /// <remarks>
+    ///  This uses Razor's <see cref="Range"/> type, which is type-forwarded on .NET.
+    /// </remarks>
+    /// <exception cref="ArgumentNullException">
+    ///  <paramref name="array"/> is <see langword="null"/>.
+    /// </exception>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="range"/>'s start or end index is not within the bounds of the string.
+    /// </exception>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="range"/>'s start index is greater than its end index.
+    /// </exception>
+    /// <exception cref="ArrayTypeMismatchException">
+    ///  <paramref name="array"/> is covariant, and the array's type is not exactly <typeparamref name="T"/>[].
+    /// </exception>
+    public static ReadOnlySpan<T> AsSpan<T>(this T[]? array, Range range)
+    {
+#if NET
+        return MemoryExtensions.AsSpan(array, range);
+#else
+        if (array is null)
+        {
+            if (!range.Start.Equals(Index.Start) || !range.End.Equals(Index.Start))
+            {
+                ThrowHelper.ThrowArgumentNull(nameof(array));
+            }
+
+            return default;
+        }
+
+        var (start, length) = range.GetOffsetAndLength(array.Length);
+        return MemoryExtensions.AsSpan(array, start, length);
+#endif
+    }
+
+    /// <summary>
+    ///  Creates a new memory region over the portion of the target starting at the specified index
+    ///  to the end of the array.
+    /// </summary>
+    /// <param name="array">
+    ///  The array to convert.
+    /// </param>
+    /// <param name="startIndex">
+    ///  The first position of the array.
+    /// </param>
+    /// <remarks>
+    ///  This uses Razor's <see cref="Index"/> type, which is type-forwarded on .NET.
+    /// </remarks>
+    /// <exception cref="ArgumentNullException">
+    ///  <paramref name="array"/> is <see langword="null"/>.
+    /// </exception>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="startIndex"/> is less than 0 or greater than <paramref name="array"/>.Length.
+    /// </exception>
+    /// <exception cref="ArrayTypeMismatchException">
+    ///  <paramref name="array"/> is covariant, and the array's type is not exactly <typeparamref name="T"/>[].
+    /// </exception>
+    public static ReadOnlyMemory<T> AsMemory<T>(this T[]? array, Index startIndex)
+    {
+#if NET
+        return MemoryExtensions.AsMemory(array, startIndex);
+#else
+        if (array is null)
+        {
+            if (!startIndex.Equals(Index.Start))
+            {
+                ThrowHelper.ThrowArgumentOutOfRange(nameof(startIndex));
+            }
+
+            return default;
+        }
+
+        return MemoryExtensions.AsMemory(array, startIndex.GetOffset(array.Length));
+#endif
+    }
+
+    /// <summary>
+    ///  Creates a new memory region over the portion of the target array beginning at
+    ///  inclusive start index of the range and ending at the exclusive end index of the range.
+    /// </summary>
+    /// <param name="array">
+    ///  The array to convert.
+    /// </param>
+    /// <param name="range">
+    ///  The range of the array to convert.
+    /// </param>
+    /// <remarks>
+    ///  This uses Razor's <see cref="Range"/> type, which is type-forwarded on .NET.
+    /// </remarks>
+    /// <exception cref="ArgumentNullException">
+    ///  <paramref name="array"/> is <see langword="null"/>.
+    /// </exception>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="range"/>'s start or end index is not within the bounds of the string.
+    /// </exception>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="range"/>'s start index is greater than its end index.
+    /// </exception>
+    /// <exception cref="ArrayTypeMismatchException">
+    ///  <paramref name="array"/> is covariant, and the array's type is not exactly <typeparamref name="T"/>[].
+    /// </exception>
+    public static ReadOnlyMemory<T> AsMemory<T>(this T[]? array, Range range)
+    {
+#if NET
+        return MemoryExtensions.AsMemory(array, range);
+#else
+        if (array is null)
+        {
+            if (!range.Start.Equals(Index.Start) || !range.End.Equals(Index.Start))
+            {
+                ThrowHelper.ThrowArgumentNull(nameof(array));
+            }
+
+            return default;
+        }
+
+        var (start, length) = range.GetOffsetAndLength(array.Length);
+        return MemoryExtensions.AsMemory(array, start, length);
+#endif
+    }
+
     public static ImmutableDictionary<TKey, TValue> ToImmutableDictionary<TKey, TValue>(
         this (TKey key, TValue value)[] array, IEqualityComparer<TKey> keyComparer)
         where TKey : notnull
diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/BufferExtensions.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/BufferExtensions.cs
index ea4e7823eff..b3b1f58d087 100644
--- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/BufferExtensions.cs
+++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/BufferExtensions.cs
@@ -7,10 +7,89 @@ namespace System.Buffers;
 
 internal static class BufferExtensions
 {
+    /// <summary>
+    ///  Rents an array of the given minimum length from the specified <see cref="ArrayPool{T}"/>.
+    /// </summary>
+    /// <param name="pool">
+    ///  The <see cref="ArrayPool{T}"/> to use.
+    /// </param>
+    /// <param name="minimumLength">
+    ///  The minimum length of the array.
+    /// </param>
+    /// <param name="array">
+    ///  The rented array.
+    /// </param>
+    /// <remarks>
+    ///  The array is guaranteed to be at least <paramref name="minimumLength"/> in length. However,
+    ///  it will likely be larger.
+    /// </remarks>
     public static PooledArray<T> GetPooledArray<T>(this ArrayPool<T> pool, int minimumLength, out T[] array)
+        => pool.GetPooledArray(minimumLength, clearOnReturn: false, out array);
+
+    /// <summary>
+    ///  Rents an array of the given minimum length from the specified <see cref="ArrayPool{T}"/>.
+    /// </summary>
+    /// <param name="pool">
+    ///  The <see cref="ArrayPool{T}"/> to use.
+    /// </param>
+    /// <param name="minimumLength">
+    ///  The minimum length of the array.
+    /// </param>
+    /// <param name="clearOnReturn">
+    ///  Indicates whether the contents of the array should be cleared before it is returned to the pool.
+    /// </param>
+    /// <param name="array">
+    ///  The rented array.
+    /// </param>
+    /// <remarks>
+    ///  The array is guaranteed to be at least <paramref name="minimumLength"/> in length. However,
+    ///  it will likely be larger.
+    /// </remarks>
+    public static PooledArray<T> GetPooledArray<T>(this ArrayPool<T> pool, int minimumLength, bool clearOnReturn, out T[] array)
     {
-        var result = new PooledArray<T>(pool, minimumLength);
+        var result = new PooledArray<T>(pool, minimumLength, clearOnReturn);
         array = result.Array;
         return result;
     }
+
+    /// <summary>
+    ///  Rents an array of the given minimum length from the specified <see cref="ArrayPool{T}"/>.
+    ///  The rented array is provided as a <see cref="Span{T}"/> representing a portion of the rented array
+    ///  from its start to the minimum length.
+    /// </summary>
+    /// <param name="pool">
+    ///  The <see cref="ArrayPool{T}"/> to use.
+    /// </param>
+    /// <param name="minimumLength">
+    ///  The minimum length of the array.
+    /// </param>
+    /// <param name="span">
+    ///  The <see cref="Span{T}"/> representing a portion of the rented array from its start to the minimum length.
+    /// </param>
+    public static PooledArray<T> GetPooledArraySpan<T>(this ArrayPool<T> pool, int minimumLength, out Span<T> span)
+        => pool.GetPooledArraySpan(minimumLength, clearOnReturn: false, out span);
+
+    /// <summary>
+    ///  Rents an array of the given minimum length from the specified <see cref="ArrayPool{T}"/>.
+    ///  The rented array is provided as a <see cref="Span{T}"/> representing a portion of the rented array
+    ///  from its start to the minimum length.
+    /// </summary>
+    /// <param name="pool">
+    ///  The <see cref="ArrayPool{T}"/> to use.
+    /// </param>
+    /// <param name="minimumLength">
+    ///  The minimum length of the array.
+    /// </param>
+    /// <param name="clearOnReturn">
+    ///  Indicates whether the contents of the array should be cleared before it is returned to the pool.
+    /// </param>
+    /// <param name="span">
+    ///  The <see cref="Span{T}"/> representing a portion of the rented array from its start to the minimum length.
+    /// </param>
+    public static PooledArray<T> GetPooledArraySpan<T>(this ArrayPool<T> pool, int minimumLength, bool clearOnReturn, out Span<T> span)
+    {
+        var result = new PooledArray<T>(pool, minimumLength, clearOnReturn);
+        span = result.Span;
+        return result;
+    }
 }
diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/ImmutableArrayExtensions.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/ImmutableArrayExtensions.cs
index e0d7478cca7..3107a833101 100644
--- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/ImmutableArrayExtensions.cs
+++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/ImmutableArrayExtensions.cs
@@ -29,39 +29,6 @@ public static void SetCapacityIfLarger<T>(this ImmutableArray<T>.Builder builder
         }
     }
 
-    /// <summary>
-    ///  Returns the current contents as an <see cref="ImmutableArray{T}"/> and sets
-    ///  the collection to a zero length array.
-    /// </summary>
-    /// <remarks>
-    ///  If <see cref="ImmutableArray{T}.Builder.Capacity"/> equals
-    ///  <see cref="ImmutableArray{T}.Builder.Count"/>, the internal array will be extracted
-    ///  as an <see cref="ImmutableArray{T}"/> without copying the contents. Otherwise, the
-    ///  contents will be copied into a new array. The collection will then be set to a
-    ///  zero-length array.
-    /// </remarks>
-    /// <returns>An immutable array.</returns>
-    public static ImmutableArray<T> DrainToImmutable<T>(this ImmutableArray<T>.Builder builder)
-    {
-#if NET8_0_OR_GREATER
-        return builder.DrainToImmutable();
-#else
-        if (builder.Count == 0)
-        {
-            return [];
-        }
-
-        if (builder.Count == builder.Capacity)
-        {
-            return builder.MoveToImmutable();
-        }
-
-        var result = builder.ToImmutable();
-        builder.Clear();
-        return result;
-#endif
-    }
-
     public static ImmutableArray<TResult> SelectAsArray<T, TResult>(this ImmutableArray<T> source, Func<T, TResult> selector)
     {
         return source switch
diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/PooledArray`1.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/PooledArray`1.cs
index 6bd248baffc..4f6850c092b 100644
--- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/PooledArray`1.cs
+++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/PooledArray`1.cs
@@ -9,17 +9,33 @@ namespace Microsoft.AspNetCore.Razor.PooledObjects;
 internal struct PooledArray<T> : IDisposable
 {
     private readonly ArrayPool<T> _pool;
+    private readonly int _minimumLength;
+    private readonly bool _clearOnReturn;
     private T[]? _array;
 
-    // Because of how this API is intended to be used, we don't want the consumption code to have
-    // to deal with Array being a nullable reference type. Instead, the guarantee is that this is
-    // non-null until this is disposed.
+    /// <summary>
+    ///  Returns the array that was rented from <see cref="ArrayPool{T}.Shared"/>.
+    /// </summary>
+    /// <remarks>
+    ///  Returns a non-null array until <see cref="PooledArray{T}"/> is disposed.
+    /// </remarks>
     public readonly T[] Array => _array!;
 
-    public PooledArray(ArrayPool<T> pool, int minimumLength)
+    /// <summary>
+    ///  Returns a <see cref="Span{T}"/> representing a portion of the rented array
+    ///  from its start to the minimum length.
+    /// </summary>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  The array has been returned to the pool.
+    /// </exception>
+    public readonly Span<T> Span => _array!.AsSpan(0, _minimumLength);
+
+    public PooledArray(ArrayPool<T> pool, int minimumLength, bool clearOnReturn)
         : this()
     {
         _pool = pool;
+        _minimumLength = minimumLength;
+        _clearOnReturn = clearOnReturn;
         _array = pool.Rent(minimumLength);
     }
 
@@ -27,7 +43,7 @@ public void Dispose()
     {
         if (_array is T[] array)
         {
-            _pool.Return(array);
+            _pool.Return(array, clearArray: _clearOnReturn);
             _array = null;
         }
     }
diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/StringExtensions.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/StringExtensions.cs
index f649b756075..9dde4e4b539 100644
--- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/StringExtensions.cs
+++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/StringExtensions.cs
@@ -3,27 +3,555 @@
 
 using System.Diagnostics.CodeAnalysis;
 
+#if !NET
+using ThrowHelper = Microsoft.AspNetCore.Razor.Utilities.ThrowHelper;
+#endif
+
 namespace System;
 
 internal static class StringExtensions
 {
-    public static bool IsNullOrEmpty([NotNullWhen(false)] this string? s)
-        => string.IsNullOrEmpty(s);
+    /// <summary>
+    ///  Indicates whether the specified string is <see langword="null"/> or an empty string ("").
+    /// </summary>
+    /// <param name="value">
+    ///  The string to test.
+    /// </param>
+    /// <returns>
+    ///  <see langword="true"/> if the <paramref name="value"/> parameter is <see langword="null"/>
+    ///  or an empty string (""); otherwise, <see langword="false"/>.
+    /// </returns>
+    /// <remarks>
+    ///  This extension method is useful on .NET Framework and .NET Standard 2.0 where
+    ///  <see cref="string.IsNullOrEmpty(string?)"/> is not annotated for nullability.
+    /// </remarks>
+    public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    /// <summary>
+    ///  Indicates whether a specified string is <see langword="null"/>, empty, or consists only
+    ///  of white-space characters.
+    /// </summary>
+    /// <param name="value">
+    ///  The string to test.
+    /// </param>
+    /// <returns>
+    ///  <see langword="true"/> if the <paramref name="value"/> parameter is <see langword="null"/>
+    ///  or <see cref="string.Empty"/>, or if <paramref name="value"/> consists exclusively of
+    ///  white-space characters.
+    /// </returns>
+    /// <remarks>
+    ///  This extension method is useful on .NET Framework and .NET Standard 2.0 where
+    ///  <see cref="string.IsNullOrWhiteSpace(string?)"/> is not annotated for nullability.
+    /// </remarks>
+    public static bool IsNullOrWhiteSpace([NotNullWhen(false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlySpan{T}"/> over a portion of the target string from
+    ///  a specified position to the end of the string.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    /// <param name="startIndex">
+    ///  The index at which to begin this slice.
+    /// </param>
+    /// <remarks>
+    ///  This uses Razor's <see cref="Index"/> type, which is type-forwarded on .NET.
+    /// </remarks>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="startIndex"/> is less than 0 or greater than <paramref name="text"/>.Length.
+    /// </exception>
+    public static ReadOnlySpan<char> AsSpan(this string? text, Index startIndex)
+    {
+#if NET
+        return MemoryExtensions.AsSpan(text, startIndex);
+#else
+        if (text is null)
+        {
+            if (!startIndex.Equals(Index.Start))
+            {
+                ThrowHelper.ThrowArgumentOutOfRange(nameof(startIndex));
+            }
+
+            return default;
+        }
+
+        return text.AsSpan(startIndex.GetOffset(text.Length));
+#endif
+    }
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlySpan{T}"/> over a portion of a target string using
+    ///  the range start and end indexes.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    /// <param name="range">
+    ///  The range that has start and end indexes to use for slicing the string.
+    /// </param>
+    /// <remarks>
+    ///  This uses Razor's <see cref="Range"/> type, which is type-forwarded on .NET.
+    /// </remarks>
+    /// <exception cref="ArgumentNullException">
+    ///  <paramref name="range"/>'s start or end index is not within the bounds of the string.
+    /// </exception>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="range"/>'s start index is greater than its end index.
+    /// </exception>
+    public static ReadOnlySpan<char> AsSpan(this string? text, Range range)
+    {
+#if NET
+        return MemoryExtensions.AsSpan(text, range);
+#else
+        if (text is null)
+        {
+            if (!range.Start.Equals(Index.Start) || !range.End.Equals(Index.Start))
+            {
+                ThrowHelper.ThrowArgumentNull(nameof(text));
+            }
+
+            return default;
+        }
+
+        var (start, length) = range.GetOffsetAndLength(text.Length);
+        return text.AsSpan(start, length);
+#endif
+    }
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlySpan{T}"/> over a string. If the target string
+    ///  is <see langword="null"/> a <see langword="default"/>(<see cref="ReadOnlySpan{T}"/>) is returned.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    public static ReadOnlySpan<char> AsSpanOrDefault(this string? text)
+        => text is not null ? text.AsSpan() : default;
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlySpan{T}"/> over a portion of the target string from
+    ///  a specified position to the end of the string. If the target string is <see langword="null"/>
+    ///  a <see langword="default"/>(<see cref="ReadOnlySpan{T}"/>) is returned.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    /// <param name="start">
+    ///  The index at which to begin this slice.
+    /// </param>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="start"/> is less than 0 or greater than <paramref name="text"/>.Length.
+    /// </exception>
+    public static ReadOnlySpan<char> AsSpanOrDefault(this string? text, int start)
+        => text is not null ? text.AsSpan(start) : default;
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlySpan{T}"/> over a portion of the target string from
+    ///  a specified position for a specified number of characters. If the target string is
+    ///  <see langword="null"/> a <see langword="default"/>(<see cref="ReadOnlySpan{T}"/>) is returned.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    /// <param name="start">
+    ///  The index at which to begin this slice.
+    /// </param>
+    /// <param name="length">
+    ///  The desired length for the slice.
+    /// </param>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="start"/>, <paramref name="length"/>, or <paramref name="start"/> + <paramref name="length"/>
+    ///  is not in the range of <paramref name="text"/>.
+    /// </exception>
+    public static ReadOnlySpan<char> AsSpanOrDefault(this string? text, int start, int length)
+        => text is not null ? text.AsSpan(start, length) : default;
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlySpan{T}"/> over a portion of the target string from
+    ///  a specified position to the end of the string. If the target string is <see langword="null"/>
+    ///  a <see langword="default"/>(<see cref="ReadOnlySpan{T}"/>) is returned.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    /// <param name="startIndex">
+    ///  The index at which to begin this slice.
+    /// </param>
+    public static ReadOnlySpan<char> AsSpanOrDefault(this string? text, Index startIndex)
+    {
+        if (text is null)
+        {
+            return default;
+        }
+
+#if NET
+        return MemoryExtensions.AsSpan(text, startIndex);
+#else
+        return text.AsSpan(startIndex.GetOffset(text.Length));
+#endif
+    }
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlySpan{T}"/> over a portion of the target string using the range
+    ///  start and end indexes. If the target string is <see langword="null"/> a
+    ///  <see langword="default"/>(<see cref="ReadOnlySpan{T}"/>) is returned.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    /// <param name="range">
+    ///  The range that has start and end indexes to use for slicing the string.
+    /// </param>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="range"/>'s start or end index is not within the bounds of the string.
+    /// </exception>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="range"/>'s start index is greater than its end index.
+    /// </exception>
+    public static ReadOnlySpan<char> AsSpanOrDefault(this string? text, Range range)
+    {
+        if (text is null)
+        {
+            return default;
+        }
+
+#if NET
+        return MemoryExtensions.AsSpan(text, range);
+#else
+        var (start, length) = range.GetOffsetAndLength(text.Length);
+        return text.AsSpan(start, length);
+#endif
+    }
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlyMemory{T}"/> over a portion of a target string starting at a specified index.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    /// <param name="startIndex">
+    ///  The index at which to begin this slice.
+    /// </param>
+    /// <remarks>
+    ///  This uses Razor's <see cref="Index"/> type, which is type-forwarded on .NET.
+    /// </remarks>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="startIndex"/> is less than 0 or greater than <paramref name="text"/>.Length.
+    /// </exception>
+    public static ReadOnlyMemory<char> AsMemory(this string? text, Index startIndex)
+    {
+#if NET
+        return MemoryExtensions.AsMemory(text, startIndex);
+#else
+        if (text is null)
+        {
+            if (!startIndex.Equals(Index.Start))
+            {
+                ThrowHelper.ThrowArgumentOutOfRange(nameof(startIndex));
+            }
+
+            return default;
+        }
+
+        return text.AsMemory(startIndex.GetOffset(text.Length));
+#endif
+    }
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlyMemory{T}"/> over a portion of a target string using
+    ///  the range start and end indexes.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    /// <param name="range">
+    ///  The range that has start and end indexes to use for slicing the string.
+    /// </param>
+    /// <remarks>
+    ///  This uses Razor's <see cref="Range"/> type, which is type-forwarded on .NET.
+    /// </remarks>
+    /// <exception cref="ArgumentNullException">
+    ///  <paramref name="range"/>'s start or end index is not within the bounds of the string.
+    /// </exception>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="range"/>'s start index is greater than its end index.
+    /// </exception>
+    public static ReadOnlyMemory<char> AsMemory(this string? text, Range range)
+    {
+#if NET
+        return MemoryExtensions.AsMemory(text, range);
+#else
+        if (text is null)
+        {
+            if (!range.Start.Equals(Index.Start) || !range.End.Equals(Index.Start))
+            {
+                ThrowHelper.ThrowArgumentNull(nameof(text));
+            }
+
+            return default;
+        }
+
+        var (start, length) = range.GetOffsetAndLength(text.Length);
+        return text.AsMemory(start, length);
+#endif
+    }
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlyMemory{T}"/> over a string. If the target string
+    ///  is <see langword="null"/> a <see langword="default"/>(<see cref="ReadOnlyMemory{T}"/>) is returned.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    public static ReadOnlyMemory<char> AsMemoryOrDefault(this string? text)
+        => text is not null ? text.AsMemory() : default;
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlyMemory{T}"/> over a portion of the target string from
+    ///  a specified position to the end of the string. If the target string is <see langword="null"/>
+    ///  a <see langword="default"/>(<see cref="ReadOnlyMemory{T}"/>) is returned.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    /// <param name="start">
+    ///  The index at which to begin this slice.
+    /// </param>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="start"/> is less than 0 or greater than <paramref name="text"/>.Length.
+    /// </exception>
+    public static ReadOnlyMemory<char> AsMemoryOrDefault(this string? text, int start)
+        => text is not null ? text.AsMemory(start) : default;
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlyMemory{T}"/> over a portion of the target string from
+    ///  a specified position for a specified number of characters. If the target string is
+    ///  <see langword="null"/> a <see langword="default"/>(<see cref="ReadOnlyMemory{T}"/>) is returned.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    /// <param name="start">
+    ///  The index at which to begin this slice.
+    /// </param>
+    /// <param name="length">
+    ///  The desired length for the slice.
+    /// </param>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="start"/>, <paramref name="length"/>, or <paramref name="start"/> + <paramref name="length"/>
+    ///  is not in the range of <paramref name="text"/>.
+    /// </exception>
+    public static ReadOnlyMemory<char> AsMemoryOrDefault(this string? text, int start, int length)
+        => text is not null ? text.AsMemory(start, length) : default;
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlyMemory{T}"/> over a portion of the target string from
+    ///  a specified position to the end of the string. If the target string is <see langword="null"/>
+    ///  a <see langword="default"/>(<see cref="ReadOnlyMemory{T}"/>) is returned.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    /// <param name="startIndex">
+    ///  The index at which to begin this slice.
+    /// </param>
+    public static ReadOnlyMemory<char> AsMemoryOrDefault(this string? text, Index startIndex)
+    {
+        if (text is null)
+        {
+            return default;
+        }
+
+#if NET
+        return MemoryExtensions.AsMemory(text, startIndex);
+#else
+        return text.AsMemory(startIndex.GetOffset(text.Length));
+#endif
+    }
+
+    /// <summary>
+    ///  Creates a new <see cref="ReadOnlyMemory{T}"/> over a portion of the target string using the range
+    ///  start and end indexes. If the target string is <see langword="null"/> a
+    ///  <see langword="default"/>(<see cref="ReadOnlyMemory{T}"/>) is returned.
+    /// </summary>
+    /// <param name="text">
+    ///  The target string.
+    /// </param>
+    /// <param name="range">
+    ///  The range that has start and end indexes to use for slicing the string.
+    /// </param>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="range"/>'s start or end index is not within the bounds of the string.
+    /// </exception>
+    /// <exception cref="ArgumentOutOfRangeException">
+    ///  <paramref name="range"/>'s start index is greater than its end index.
+    /// </exception>
+    public static ReadOnlyMemory<char> AsMemoryOrDefault(this string? text, Range range)
+    {
+        if (text is null)
+        {
+            return default;
+        }
+
+#if NET
+        return MemoryExtensions.AsMemory(text, range);
+#else
+        var (start, length) = range.GetOffsetAndLength(text.Length);
+        return text.AsMemory(start, length);
+#endif
+    }
 
-    public static bool IsNullOrWhiteSpace([NotNullWhen(false)] this string? s)
-        => string.IsNullOrWhiteSpace(s);
+    /// <summary>
+    ///  Returns a value indicating whether a specified character occurs within a string instance.
+    /// </summary>
+    /// <param name="text">
+    ///  The string instance.
+    /// </param>
+    /// <param name="value">
+    ///  The character to seek.
+    /// </param>
+    /// <returns>
+    ///  <see langword="true"/> if the value parameter occurs within the string; otherwise, <see langword="false"/>.
+    /// </returns>
+    /// <remarks>
+    ///  This method exists on .NET Core, but doesn't on .NET Framework or .NET Standard 2.0.
+    /// </remarks>
+    public static bool Contains(this string text, char value)
+    {
+#if NET
+        return text.Contains(value);
+#else
+        return text.IndexOf(value) >= 0;
+#endif
+    }
 
-    public static ReadOnlySpan<char> AsSpanOrDefault(this string? s)
-        => s is not null ? s.AsSpan() : default;
+    /// <summary>
+    ///  Returns a value indicating whether a specified character occurs within a string instance,
+    ///  using the specified comparison rules.
+    /// </summary>
+    /// <param name="text">
+    ///  The string instance.
+    /// </param>
+    /// <param name="value">
+    ///  The character to seek.
+    /// </param>
+    /// <param name="comparisonType">
+    ///  One of the enumeration values that specifies the rules to use in the comparison.
+    /// </param>
+    /// <returns>
+    ///  <see langword="true"/> if the value parameter occurs within the string; otherwise, <see langword="false"/>.
+    /// </returns>
+    /// <remarks>
+    ///  This method exists on .NET Core, but doesn't on .NET Framework or .NET Standard 2.0.
+    /// </remarks>
+    public static bool Contains(this string text, char value, StringComparison comparisonType)
+    {
+#if NET
+        return text.Contains(value, comparisonType);
+#else
+        return text.IndexOf(value, comparisonType) != 0;
+#endif
+    }
 
-    public static ReadOnlyMemory<char> AsMemoryOrDefault(this string? s)
-        => s is not null ? s.AsMemory() : default;
+    /// <summary>
+    ///  Reports the zero-based index of the first occurrence of the specified Unicode character in a string instance.
+    ///  A parameter specifies the type of search to use for the specified character.
+    /// </summary>
+    /// <param name="text">
+    ///  The string instance.
+    /// </param>
+    /// <param name="value">
+    ///  The character to compare to the character at the start of this string.
+    /// </param>
+    /// <param name="comparisonType">
+    ///  An enumeration value that specifies the rules for the search.
+    /// </param>
+    /// <returns>
+    ///  The zero-based index of <paramref name="value"/> if that character is found, or -1 if it is not.
+    /// </returns>
+    /// <remarks>
+    ///  <para>
+    ///   Index numbering starts from zero.
+    ///  </para>
+    ///  <para>
+    ///   The <paramref name="comparisonType"/> parameter is a <see cref="StringComparison"/> enumeration member
+    ///   that specifies whether the search for the <paramref name="value"/> argument uses the current or invariant culture,
+    ///   is case-sensitive or case-insensitive, or uses word or ordinal comparison rules.
+    ///  </para>
+    ///  <para>
+    ///   This method exists on .NET Core, but doesn't on .NET Framework or .NET Standard 2.0.
+    ///  </para>
+    /// </remarks>
+    public static int IndexOf(this string text, char value, StringComparison comparisonType)
+    {
+#if NET
+        return text.IndexOf(value, comparisonType);
+#else
+        // [ch] produces a ReadOnlySpan<char> using a ref to ch.
+        return text.AsSpan().IndexOf([value], comparisonType);
+#endif
+    }
 
-    // This method doesn't exist on .NET Framework, but it does on .NET Core.
-    public static bool Contains(this string s, char ch)
-        => s.IndexOf(ch) >= 0;
+    /// <summary>
+    ///  Determines whether a string instance starts with the specified character.
+    /// </summary>
+    /// <param name="text">
+    ///  The string instance.
+    /// </param>
+    /// <param name="value">
+    ///  The character to compare to the character at the start of this string.
+    /// </param>
+    /// <returns>
+    ///  <see langword="true"/> if <paramref name="value"/> matches the start of the string;
+    ///  otherwise, <see langword="false"/>.
+    /// </returns>
+    /// <remarks>
+    ///  <para>
+    ///   This method performs an ordinal (case-sensitive and culture-insensitive) comparison.
+    ///  </para>
+    ///  <para>
+    ///   This method exists on .NET Core, but doesn't on .NET Framework or .NET Standard 2.0.
+    ///  </para>
+    /// </remarks>
+    public static bool StartsWith(this string text, char value)
+    {
+#if NET
+        return text.StartsWith(value);
+#else
+        return text.Length > 0 && text[0] == value;
+#endif
+    }
 
-    // This method doesn't exist on .NET Framework, but it does on .NET Core.
-    public static bool EndsWith(this string s, char ch)
-        => s.Length > 0 && s[^1] == ch;
+    /// <summary>
+    ///  Determines whether the end of a string instance matches the specified character.
+    /// </summary>
+    /// <param name="text">
+    ///  The string instance.
+    /// </param>
+    /// <param name="value">
+    ///  The character to compare to the character at the end of this string.
+    /// </param>
+    /// <returns>
+    ///  <see langword="true"/> if <paramref name="value"/> matches the end of this string;
+    ///  otherwise, <see langword="false"/>.
+    /// </returns>
+    /// <remarks>
+    ///  <para>
+    ///   This method performs an ordinal (case-sensitive and culture-insensitive) comparison.
+    ///  </para>
+    ///  <para>
+    ///   This method exists on .NET Core, but doesn't on .NET Framework or .NET Standard 2.0.
+    ///  </para>
+    /// </remarks>
+    public static bool EndsWith(this string text, char value)
+    {
+#if NET
+        return text.EndsWith(value);
+#else
+        return text.Length > 0 && text[^1] == value;
+#endif
+    }
 }
diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Utilities/ThrowHelper.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Utilities/ThrowHelper.cs
index 1a78ee3a3d2..168871c0218 100644
--- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Utilities/ThrowHelper.cs
+++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Utilities/ThrowHelper.cs
@@ -8,6 +8,34 @@ namespace Microsoft.AspNetCore.Razor.Utilities;
 
 internal static class ThrowHelper
 {
+    /// <summary>
+    ///  This is present to help the JIT inline methods that need to throw an <see cref="InvalidOperationException"/>.
+    /// </summary>
+    [DoesNotReturn]
+    public static void ThrowArgumentNull(string paramName)
+        => throw new ArgumentNullException(paramName);
+
+    /// <summary>
+    ///  This is present to help the JIT inline methods that need to throw an <see cref="InvalidOperationException"/>.
+    /// </summary>
+    [DoesNotReturn]
+    public static T ThrowArgumentNull<T>(string paramName)
+        => throw new ArgumentNullException(paramName);
+
+    /// <summary>
+    ///  This is present to help the JIT inline methods that need to throw an <see cref="InvalidOperationException"/>.
+    /// </summary>
+    [DoesNotReturn]
+    public static void ThrowArgumentOutOfRange(string paramName)
+        => throw new ArgumentOutOfRangeException(paramName);
+
+    /// <summary>
+    ///  This is present to help the JIT inline methods that need to throw an <see cref="InvalidOperationException"/>.
+    /// </summary>
+    [DoesNotReturn]
+    public static T ThrowArgumentOutOfRange<T>(string paramName)
+        => throw new ArgumentOutOfRangeException(paramName);
+
     /// <summary>
     ///  This is present to help the JIT inline methods that need to throw an <see cref="InvalidOperationException"/>.
     /// </summary>