diff --git a/NuGet.config b/NuGet.config
index 8381dc5bbb..40a4c9e60e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -23,88 +23,35 @@
     <!-- Used for BenchmarkDotNet prerelease packages -->
     <add key="benchmark-dotnet-prerelease" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/benchmark-dotnet-prerelease/nuget/v3/index.json" />
   </packageSources>
+  <!--
+    ****************************** AUTOGENERATED ***********************************
+    Can re-generate these package source mappings by following the guide here:
+    https://devblogs.microsoft.com/nuget/quickly-map-your-nuget-packages-to-sources/
+
+    In addition, once generated add the following to the top of the generated package
+    source mapping if it doesn't already existe:
+
+    <packageSource key="dotnet-core-internal-tooling">
+      <package pattern="microsoft.*" />
+    </packageSource>
+    <packageSource key="richnav">
+      <package pattern="richcodenav.envvardump" />
+    </packageSource>
+  -->
   <packageSourceMapping>
     <clear />
     <packageSource key="dotnet-core-internal-tooling">
       <package pattern="microsoft.*" />
     </packageSource>
-    <packageSource key="dotnet-eng">
-      <package pattern="microbuild.plugins.swixbuild" />
-      <package pattern="microsoft.*" />
-      <package pattern="roslyntools.vsixexpinstaller" />
-      <package pattern="xunit" />
-      <package pattern="xunit.*" />
+    <packageSource key="richnav">
+      <package pattern="richcodenav.envvardump" />
     </packageSource>
-    <packageSource key="dotnet-tools">
-      <package pattern="microbuild.core.sentinel" />
+    <packageSource key="dotnet-eng">
       <package pattern="microsoft.*" />
-      <package pattern="nuget.common" />
-      <package pattern="nuget.configuration" />
-      <package pattern="nuget.frameworks" />
-      <package pattern="nuget.packaging" />
-      <package pattern="nuget.protocol" />
-      <package pattern="nuget.versioning" />
-      <package pattern="roslyn.diagnostics.analyzers" />
       <package pattern="sn" />
     </packageSource>
-    <packageSource key="dotnet7">
+    <packageSource key="dotnet-tools">
       <package pattern="microsoft.*" />
-      <package pattern="roslyn.diagnostics.analyzers" />
-    </packageSource>
-    <packageSource key="dotnet7-transport">
-      <package pattern="microsoft.*" />
-    </packageSource>
-    <packageSource key="dotnet6">
-      <package pattern="dotnet-format" />
-      <package pattern="microsoft.*" />
-    </packageSource>
-    <packageSource key="dotnet6-transport">
-      <package pattern="microsoft.*" />
-    </packageSource>
-    <packageSource key="dotnet-public">
-      <package pattern="azure.core" />
-      <package pattern="azure.identity" />
-      <package pattern="azure.security.keyvault.secrets" />
-      <package pattern="azure.storage.blobs" />
-      <package pattern="azure.storage.common" />
-      <package pattern="basic.reference.assemblies.net50" />
-      <package pattern="basic.reference.assemblies.net60" />
-      <package pattern="basic.reference.assemblies.netstandard13" />
-      <package pattern="basic.reference.assemblies.netstandard20" />
-      <package pattern="basicundo" />
-      <package pattern="ben.demystifier" />
-      <package pattern="benchmarkdotnet" />
-      <package pattern="benchmarkdotnet.annotations" />
-      <package pattern="benchmarkdotnet.core" />
-      <package pattern="benchmarkdotnet.diagnostics.windows" />
-      <package pattern="castle.core" />
-      <package pattern="colorful.console" />
-      <package pattern="commandlineparser" />
-      <package pattern="diffplex" />
-      <package pattern="humanizer.core" />
-      <package pattern="iced" />
-      <package pattern="icsharpcode.decompiler" />
-      <package pattern="inputsimulatorplus" />
-      <package pattern="jnm2.referenceassemblies.net35" />
-      <package pattern="libgit2sharp" />
-      <package pattern="libgit2sharp.nativebinaries" />
-      <package pattern="libuv" />
-      <package pattern="mediatr" />
-      <package pattern="messagepack" />
-      <package pattern="messagepack.annotations" />
-      <package pattern="messagepackanalyzer" />
-      <package pattern="microbuild.core" />
-      <package pattern="microsoft.*" />
-      <package pattern="mono.addins" />
-      <package pattern="mono.options" />
-      <package pattern="moq" />
-      <package pattern="msbuild.structuredlogger" />
-      <package pattern="mstest.testadapter" />
-      <package pattern="mstest.testframework" />
-      <package pattern="nerdbank.streams" />
-      <package pattern="netstandard.library" />
-      <package pattern="newtonsoft.json" />
-      <package pattern="newtonsoft.json.bson" />
       <package pattern="nuget.common" />
       <package pattern="nuget.configuration" />
       <package pattern="nuget.dependencyresolver.core" />
@@ -114,6 +61,39 @@
       <package pattern="nuget.packaging.core" />
       <package pattern="nuget.projectmodel" />
       <package pattern="nuget.protocol" />
+      <package pattern="nuget.versioning" />
+    </packageSource>
+    <packageSource key="dotnet7-transport">
+      <package pattern="microsoft.*" />
+    </packageSource>
+    <packageSource key="dotnet6-transport">
+      <package pattern="microsoft.*" />
+    </packageSource>
+    <packageSource key="dotnet-public">
+      <package pattern="castle.core" />
+      <package pattern="commandlineparser" />
+      <package pattern="diffplex" />
+      <package pattern="humanizer.core" />
+      <package pattern="iced" />
+      <package pattern="icsharpcode.decompiler" />
+      <package pattern="mediatr" />
+      <package pattern="messagepack" />
+      <package pattern="messagepack.annotations" />
+      <package pattern="messagepackanalyzer" />
+      <package pattern="microbuild.core" />
+      <package pattern="microsoft.*" />
+      <package pattern="mono.addins" />
+      <package pattern="moq" />
+      <package pattern="mstest.testadapter" />
+      <package pattern="mstest.testframework" />
+      <package pattern="nerdbank.streams" />
+      <package pattern="netstandard.library" />
+      <package pattern="newtonsoft.json" />
+      <package pattern="nuget.common" />
+      <package pattern="nuget.configuration" />
+      <package pattern="nuget.frameworks" />
+      <package pattern="nuget.packaging" />
+      <package pattern="nuget.protocol" />
       <package pattern="nuget.resolver" />
       <package pattern="nuget.solutionrestoremanager.interop" />
       <package pattern="nuget.versioning" />
@@ -128,60 +108,27 @@
       <package pattern="omnisharp.roslyn.csharp" />
       <package pattern="omnisharp.shared" />
       <package pattern="perfolizer" />
-      <package pattern="powershell" />
       <package pattern="roslyn.diagnostics.analyzers" />
       <package pattern="runtime.*" />
-      <package pattern="sourcebrowser" />
-      <package pattern="sqlitepclraw.bundle_green" />
-      <package pattern="sqlitepclraw.core" />
-      <package pattern="sqlitepclraw.lib.e_sqlite3" />
-      <package pattern="sqlitepclraw.provider.dynamic_cdecl" />
-      <package pattern="sqlitepclraw.provider.e_sqlite3" />
       <package pattern="streamjsonrpc" />
       <package pattern="system.*" />
-      <package pattern="uiacomwrapper" />
       <package pattern="vswhere" />
-      <package pattern="windowsazure.servicebus" />
-      <package pattern="xamarinmac" />
       <package pattern="xunit" />
       <package pattern="xunit.*" />
-      <package pattern="xunitxml.testlogger" />
       <package pattern="yarn.msbuild" />
     </packageSource>
     <packageSource key="vssdk">
-      <package pattern="envdte" />
-      <package pattern="envdte100" />
-      <package pattern="envdte80" />
-      <package pattern="envdte90" />
-      <package pattern="envdte90a" />
       <package pattern="microsoft.*" />
-      <package pattern="stdole" />
       <package pattern="streamjsonrpc" />
-      <package pattern="vslangproj" />
-      <package pattern="vslangproj100" />
-      <package pattern="vslangproj110" />
-      <package pattern="vslangproj140" />
-      <package pattern="vslangproj150" />
-      <package pattern="vslangproj157" />
-      <package pattern="vslangproj158" />
-      <package pattern="vslangproj165" />
-      <package pattern="vslangproj2" />
-      <package pattern="vslangproj80" />
-      <package pattern="vslangproj90" />
-      <package pattern="vswebsite.interop" />
     </packageSource>
     <packageSource key="vs-impl">
-      <package pattern="microbuild.plugins.swixbuild" />
+      <package pattern="microbuild.core.sentinel" />
       <package pattern="microsoft.*" />
-      <package pattern="nuget.visualstudio" />
     </packageSource>
     <packageSource key="myget-legacy">
       <package pattern="microsoft.*" />
       <package pattern="monodevelop.sdk" />
-      <package pattern="system.*" />
-    </packageSource>
-    <packageSource key="richnav">
-      <package pattern="richcodenav.envvardump" />
+      <package pattern="runtime.*" />
     </packageSource>
     <packageSource key="benchmark-dotnet-prerelease">
       <package pattern="benchmarkdotnet" />
diff --git a/eng/Versions.props b/eng/Versions.props
index a352ca5a6f..ca7c4dec9a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -73,10 +73,10 @@
     <!-- Several packages from the editor are used for testing HTML support, and share the following version. -->
     <Tooling_HtmlEditorPackageVersion>16.10.57-preview1</Tooling_HtmlEditorPackageVersion>
     <!-- Several packages share the MS.CA.Testing version -->
-    <Tooling_MicrosoftCodeAnalysisTestingVersion>1.0.1-beta1.21103.2</Tooling_MicrosoftCodeAnalysisTestingVersion>
+    <Tooling_MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22109.1</Tooling_MicrosoftCodeAnalysisTestingVersion>
     <MicrosoftVisualStudioShellPackagesVersion>17.2.32330.158</MicrosoftVisualStudioShellPackagesVersion>
-    <MicrosoftVisualStudioPackagesVersion>17.3.37-preview</MicrosoftVisualStudioPackagesVersion>
-    <RoslynPackageVersion>4.3.0-3.22303.4</RoslynPackageVersion>
+    <MicrosoftVisualStudioPackagesVersion>17.3.133-preview</MicrosoftVisualStudioPackagesVersion>
+    <RoslynPackageVersion>4.4.0-1.22369.1</RoslynPackageVersion>
     <VisualStudioLanguageServerProtocolVersion>17.3.2017</VisualStudioLanguageServerProtocolVersion>
     <MicrosoftNetCompilersToolsetVersion>4.2.0-1.final</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
@@ -108,11 +108,11 @@
     <MicrosoftVisualStudioShell150PackageVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150PackageVersion>
     <MicrosoftVisualStudioInteropPackageVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropPackageVersion>
     <MicrosoftInternalVisualStudioInteropPackageVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropPackageVersion>
-    <MicrosoftVisualStudioRpcContractsPackageVersion>17.2.31</MicrosoftVisualStudioRpcContractsPackageVersion>
+    <MicrosoftVisualStudioRpcContractsPackageVersion>17.3.3-alpha</MicrosoftVisualStudioRpcContractsPackageVersion>
     <MicrosoftVisualStudioTextDataPackageVersion>$(MicrosoftVisualStudioPackagesVersion)</MicrosoftVisualStudioTextDataPackageVersion>
     <MicrosoftVisualStudioTextImplementationPackageVersion>$(MicrosoftVisualStudioPackagesVersion)</MicrosoftVisualStudioTextImplementationPackageVersion>
     <MicrosoftVisualStudioTextLogicPackageVersion>$(MicrosoftVisualStudioPackagesVersion)</MicrosoftVisualStudioTextLogicPackageVersion>
-    <MicrosoftVisualStudioThreadingPackageVersion>17.2.32</MicrosoftVisualStudioThreadingPackageVersion>
+    <MicrosoftVisualStudioThreadingPackageVersion>17.3.1-alpha</MicrosoftVisualStudioThreadingPackageVersion>
     <MicrosoftVisualStudioWebPackageVersion>16.10.0-preview-1-31008-014</MicrosoftVisualStudioWebPackageVersion>
     <MicrosoftVisualStudioValidationPackageVersion>17.0.53</MicrosoftVisualStudioValidationPackageVersion>
     <MicrosoftWebToolsLanguagesHtmlPackageVersion>$(Tooling_HtmlEditorPackageVersion)</MicrosoftWebToolsLanguagesHtmlPackageVersion>
@@ -123,12 +123,13 @@
     <MonoAddinsPackageVersion>1.3.8</MonoAddinsPackageVersion>
     <MonoDevelopSdkPackageVersion>1.0.15</MonoDevelopSdkPackageVersion>
     <MoqPackageVersion>4.16.0</MoqPackageVersion>
+    <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
     <NerdbankStreamsPackageVersion>2.8.57</NerdbankStreamsPackageVersion>
     <NuGetSolutionRestoreManagerInteropVersion>4.8.0</NuGetSolutionRestoreManagerInteropVersion>
     <OmniSharpExtensionsLanguageServerPackageVersion>0.19.5</OmniSharpExtensionsLanguageServerPackageVersion>
     <OmniSharpExtensionsLanguageProtocolPackageVersion>$(OmniSharpExtensionsLanguageServerPackageVersion)</OmniSharpExtensionsLanguageProtocolPackageVersion>
-    <OmniSharpMSBuildPackageVersion>1.37.13</OmniSharpMSBuildPackageVersion>
-    <StreamJsonRpcPackageVersion>2.11.35</StreamJsonRpcPackageVersion>
+    <OmniSharpMSBuildPackageVersion>1.39.1</OmniSharpMSBuildPackageVersion>
+    <StreamJsonRpcPackageVersion>2.12.7-alpha</StreamJsonRpcPackageVersion>
     <SystemRuntimeInteropServicesRuntimePackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimePackageVersion>
     <Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.3.3</Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>
     <Tooling_MicrosoftCodeAnalysisNetAnalyzersPackageVersion>7.0.0-preview1.22116.1</Tooling_MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
index fb3eed3965..5abe61e744 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
@@ -13,6 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalyzerTestingPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(Tooling_MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="$(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion)" />
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Completion/RazorDirectiveCompletionSourceTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Completion/RazorDirectiveCompletionSourceTest.cs
index 352d8660f6..82e30e1dc7 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Completion/RazorDirectiveCompletionSourceTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Completion/RazorDirectiveCompletionSourceTest.cs
@@ -49,7 +49,7 @@ namespace Microsoft.VisualStudio.Editor.Razor.Completion
                 async () => await completionSource.GetCompletionContextAsync(null, new CompletionTrigger(CompletionTriggerReason.Invoke, triggerLocation.Snapshot), triggerLocation, applicableSpan, CancellationToken.None));
 
             // Assert
-            Assert.Empty(completionContext.Items);
+            Assert.Empty(completionContext.ItemList);
         }
 
         [UIFact]
@@ -68,7 +68,7 @@ namespace Microsoft.VisualStudio.Editor.Razor.Completion
                 async () => await completionSource.GetCompletionContextAsync(null, new CompletionTrigger(CompletionTriggerReason.Invoke, triggerLocation.Snapshot), triggerLocation, applicableSpan, CancellationToken.None));
 
             // Assert
-            Assert.Empty(completionContext.Items);
+            Assert.Empty(completionContext.ItemList);
         }
 
         // This is more of an integration level test validating the end-to-end completion flow.
@@ -89,7 +89,7 @@ namespace Microsoft.VisualStudio.Editor.Razor.Completion
 
             // Assert
             Assert.Collection(
-                completionContext.Items,
+                completionContext.ItemList,
                 item => AssertRazorCompletionItem(SectionDirective.Directive, item, completionSource),
                 item => AssertRazorCompletionItem(s_defaultDirectives[0], item, completionSource),
                 item => AssertRazorCompletionItem(s_defaultDirectives[1], item, completionSource),
diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/LightBulbHelper.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/LightBulbHelper.cs
index 20bd3cf1ac..979eee5358 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/LightBulbHelper.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/LightBulbHelper.cs
@@ -81,10 +81,10 @@ namespace Microsoft.VisualStudio.Razor.IntegrationTests.InProcess
             if (asyncSession.IsDismissed)
                 tcs.TrySetCanceled(new CancellationToken(true));
 
-            // Calling PopulateWithData ensures the underlying session will call SuggestedActionsUpdated at least once
+            // Calling PopulateWithDataAsync ensures the underlying session will call SuggestedActionsUpdated at least once
             // with the latest data computed.  This is needed so that if the lightbulb computation is already complete
             // that we hear about the results.
-            asyncSession.PopulateWithData(overrideRequestedActionCategories: null, operationContext: null);
+            await asyncSession.PopulateWithDataAsync(overrideRequestedActionCategories: null, operationContext: null).ConfigureAwait(false);
 
             return await tcs.Task.WithCancellation(cancellationToken);
         }