Calculate SuppressAddComponentParameter in tooling

src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Serialization/MessagePack/Formatters/RazorConfigurationFormatter.cs

@@ -23,8 +23,9 @@ public override RazorConfiguration Deserialize(ref MessagePackReader reader, Ser
         var configurationName = CachedStringFormatter.Instance.Deserialize(ref reader, options) ?? string.Empty;
         var languageVersionText = CachedStringFormatter.Instance.Deserialize(ref reader, options) ?? string.Empty;
         var suppressAddComponentParameter = reader.ReadBoolean();
+        var useConsolidatedMvcViews = reader.ReadBoolean();
 
-        count -= 3;
+        count -= 4;
 
         using var builder = new PooledArrayBuilder<RazorExtension>();
 
@@ -40,14 +41,19 @@ public override RazorConfiguration Deserialize(ref MessagePackReader reader, Ser
             ? version
             : RazorLanguageVersion.Version_2_1;
 
-        return new(languageVersion, configurationName, extensions, SuppressAddComponentParameter: suppressAddComponentParameter);
+        return new(
+            languageVersion,
+            configurationName,
+            extensions,
+            UseConsolidatedMvcViews: useConsolidatedMvcViews,
+            SuppressAddComponentParameter: suppressAddComponentParameter);
     }
 
     public override void Serialize(ref MessagePackWriter writer, RazorConfiguration value, SerializerCachingOptions options)
     {
-        // Write 3 values + 1 value per extension.
+        // Write 4 values + 1 value per extension.
         var extensions = value.Extensions;
-        var count = extensions.Length + 3;
+        var count = extensions.Length + 4;
 
         writer.WriteArrayHeader(count);
 
@@ -63,8 +69,9 @@ public override void Serialize(ref MessagePackWriter writer, RazorConfiguration
         }
 
         writer.Write(value.SuppressAddComponentParameter);
+        writer.Write(value.UseConsolidatedMvcViews);
 
-        count -= 3;
+        count -= 4;
 
         for (var i = 0; i < count; i++)
         {

src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Utilities/RazorProjectInfoFactory.cs

@@ -126,7 +126,7 @@ private static RazorConfiguration ComputeRazorConfigurationOptions(AnalyzerConfi
             configurationName,
             Extensions: [],
             UseConsolidatedMvcViews: true,
-            suppressAddComponentParameter);
+            SuppressAddComponentParameter: suppressAddComponentParameter);
 
         defaultNamespace = rootNamespace ?? "ASP"; // TODO: Source generator does this. Do we want it?
 

src/Shared/Microsoft.AspNetCore.Razor.Serialization.Json/ObjectReaders.cs

@@ -43,6 +43,7 @@ public static RazorConfiguration ReadConfigurationFromProperties(JsonDataReader
         var configurationName = reader.ReadNonNullString(nameof(RazorConfiguration.ConfigurationName));
         var languageVersionText = reader.ReadNonNullString(nameof(RazorConfiguration.LanguageVersion));
         var suppressAddComponentParameter = reader.ReadBooleanOrFalse(nameof(RazorConfiguration.SuppressAddComponentParameter));
+        var useConsolidatedMvcViews = reader.ReadBooleanOrTrue(nameof(RazorConfiguration.UseConsolidatedMvcViews));
         var extensions = reader.ReadImmutableArrayOrEmpty(nameof(RazorConfiguration.Extensions),
             static r =>
             {

src/Shared/Microsoft.AspNetCore.Razor.Serialization.Json/ObjectWriters.cs

@@ -36,6 +36,7 @@ public static void WriteProperties(JsonDataWriter writer, RazorConfiguration val
         writer.Write(nameof(value.LanguageVersion), languageVersionText);
 
         writer.WriteIfNotFalse(nameof(value.SuppressAddComponentParameter), value.SuppressAddComponentParameter);
+        writer.WriteIfNotTrue(nameof(value.UseConsolidatedMvcViews), value.UseConsolidatedMvcViews);
 
         writer.WriteArrayIfNotNullOrEmpty(nameof(value.Extensions), value.Extensions, static (w, v) => w.Write(v.ExtensionName));
     }