Change RazorProjectInfo to use HostProject and HostDocument

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Resources/Telerik/Kendo.Mvc.Examples.project.razor.json

@@ -1,13 +1,17 @@
 {
-  "__Version": 6,
-  "ProjectKey": "C:\\Users\\admin\\location\\Kendo.Mvc.Examples\\obj\\Debug\\net7.0\\",
-  "FilePath": "C:\\Users\\admin\\location\\Kendo.Mvc.Examples\\Kendo.Mvc.Examples.csproj",
-  "Configuration": {
-    "ConfigurationName": "MVC-3.0",
-    "LanguageVersion": "7.0",
-    "Extensions": [
-      "MVC-3.0"
-    ]
+  "__Version": 7,
+  "HostProject": {
+    "FilePath": "C:\\Users\\admin\\location\\Kendo.Mvc.Examples\\Kendo.Mvc.Examples.csproj",
+    "IntermediateOutputPath": "C:\\Users\\admin\\location\\Kendo.Mvc.Examples\\obj\\Debug\\net7.0\\",
+    "Configuration": {
+      "ConfigurationName": "MVC-3.0",
+      "LanguageVersion": "7.0",
+      "Extensions": [
+        "MVC-3.0"
+      ],
+    },
+    "RootNamespace": "Kendo.Mvc.Examples",
+    "DisplayName": "Kendo.Mvc.Examples"
   },
   "ProjectWorkspaceState": {
     "TagHelpers": [
@@ -159529,7 +159533,6 @@
     ],
     "CSharpLanguageVersion": 1100
   },
-  "RootNamespace": "Kendo.Mvc.Examples",
   "Documents": [
     {
       "FilePath": "C:\\Program Files (x86)\\Progress\\Telerik UI for ASP.NET Core R1 2023\\wrappers\\aspnetcore\\Examples\\AspNet.Core\\VS2022\\Kendo.Mvc.Examples\\Views\\Linear_Gauge\\Scale_Options.cshtml",

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Resources/project.razor.json

@@ -1,11 +1,15 @@
 {
-  "__Version": 6,
-  "ProjectKey": "C:\\Users\\admin\\location\\blazorserver\\obj\\Debug\\net7.0\\",
-  "FilePath": "C:\\Users\\admin\\location\\blazorserver\\blazorserver.csproj",
-  "Configuration": {
-    "ConfigurationName": "MVC-3.0",
-    "LanguageVersion": "3.0",
-    "Extensions": [ "MVC-3.0" ]
+  "__Version": 7,
+  "HostProject": {
+    "FilePath": "C:\\Users\\admin\\location\\blazorserver\\blazorserver.csproj",
+    "IntermediateOutputPath": "C:\\Users\\admin\\location\\blazorserver\\obj\\Debug\\net7.0\\",
+    "Configuration": {
+      "ConfigurationName": "MVC-3.0",
+      "LanguageVersion": "3.0",
+      "Extensions": [ "MVC-3.0" ]
+    },
+    "RootNamespace": "blazorserver",
+    "DisplayName": "blazorserver"
   },
   "ProjectWorkspaceState": {
     "TagHelpers": [
@@ -16128,7 +16132,6 @@
     ],
     "CSharpLanguageVersion": 800
   },
-  "RootNamespace": "blazorserver",
   "Documents": [
     {
       "FilePath": "C:\\Users\\admin\\location\\blazorserver\\Shared\\MainLayout.razor",

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Serialization/RazorProjectInfoSerializationBenchmark.cs

@@ -71,8 +71,7 @@ public void Deserialize_Json()
 
         var projectInfo = DeserializeProjectInfo_Json(reader);
 
-        if (projectInfo.ProjectWorkspaceState is null ||
-            projectInfo.ProjectWorkspaceState.TagHelpers.Length != ProjectInfo.ProjectWorkspaceState?.TagHelpers.Length)
+        if (projectInfo.ProjectWorkspaceState.TagHelpers.Length != ProjectInfo.ProjectWorkspaceState.TagHelpers.Length)
         {
             throw new InvalidDataException();
         }
@@ -93,8 +92,7 @@ public void RoundTrip_Json()
 
         var projectInfo = DeserializeProjectInfo_Json(reader);
 
-        if (projectInfo.ProjectWorkspaceState is null ||
-            projectInfo.ProjectWorkspaceState.TagHelpers.Length != ProjectInfo.ProjectWorkspaceState?.TagHelpers.Length)
+        if (projectInfo.ProjectWorkspaceState.TagHelpers.Length != ProjectInfo.ProjectWorkspaceState.TagHelpers.Length)
         {
             throw new InvalidDataException();
         }
@@ -132,8 +130,7 @@ public void Deserialize_MessagePack()
     {
         var projectInfo = DeserializeProjectInfo_MessagePack(_projectInfoMessagePackBytes);
 
-        if (projectInfo.ProjectWorkspaceState is null ||
-            projectInfo.ProjectWorkspaceState.TagHelpers.Length != ProjectInfo.ProjectWorkspaceState?.TagHelpers.Length)
+        if (projectInfo.ProjectWorkspaceState.TagHelpers.Length != ProjectInfo.ProjectWorkspaceState.TagHelpers.Length)
         {
             throw new InvalidDataException();
         }
@@ -146,8 +143,7 @@ public void RoundTrip_MessagePack()
         var projectInfo = DeserializeProjectInfo_MessagePack(bytes);
         _buffer.Clear();
 
-        if (projectInfo.ProjectWorkspaceState is null ||
-            projectInfo.ProjectWorkspaceState.TagHelpers.Length != ProjectInfo.ProjectWorkspaceState?.TagHelpers.Length)
+        if (projectInfo.ProjectWorkspaceState.TagHelpers.Length != ProjectInfo.ProjectWorkspaceState.TagHelpers.Length)
         {
             throw new InvalidDataException();
         }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorProjectService.TestAccessor.cs

@@ -1,12 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.ProjectSystem;
-using Microsoft.AspNetCore.Razor.Serialization;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
 
@@ -19,21 +17,18 @@ internal readonly struct TestAccessor(RazorProjectService instance)
         public ValueTask WaitForInitializationAsync()
             => instance.WaitForInitializationAsync();
 
-        public async Task<ProjectKey> AddProjectAsync(
-            string filePath,
-            string intermediateOutputPath,
-            RazorConfiguration? configuration,
-            string? rootNamespace,
-            string? displayName,
-            CancellationToken cancellationToken)
+        public async Task<ProjectKey> AddProjectAsync(HostProject hostProject, CancellationToken cancellationToken)
         {
-            var service = instance;
-
-            await service.WaitForInitializationAsync().ConfigureAwait(false);
+            await instance.WaitForInitializationAsync().ConfigureAwait(false);
 
             return await instance._projectManager
                 .UpdateAsync(
-                    updater => service.AddProjectCore(updater, filePath, intermediateOutputPath, configuration, rootNamespace, displayName),
+                    (updater, state) =>
+                    {
+                        var (service, hostProject) = state;
+                        return service.AddProjectCore(updater, hostProject);
+                    },
+                    (instance, hostProject),
                     cancellationToken)
                 .ConfigureAwait(false);
         }