Fix UseWebAssembly && !SampleContent

dotnet · Sep 20, 2023 · 5462e42 · 5462e42
1 parent fd85341
commit 5462e42
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/...tTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs b/...tTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs
@@ -7,7 +7,7 @@
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.EntityFrameworkCore;
 #endif
-#if (UseWebAssembly)
+#if (UseWebAssembly && SampleContent)
 using BlazorWeb_CSharp.Client.Pages;
 #endif
 using BlazorWeb_CSharp.Components;
@@ -104,19 +104,22 @@ public static void Main(string[] args)
 
         #if (UseServer && UseWebAssembly)
         app.MapRazorComponents<App>()
-          .AddInteractiveServerRenderMode()
-          .AddInteractiveWebAssemblyRenderMode()
-          .AddAdditionalAssemblies(typeof(Counter).Assembly);
+            .AddInteractiveServerRenderMode()
+            .AddInteractiveWebAssemblyRenderMode()
         #elif (UseServer)
         app.MapRazorComponents<App>()
-          .AddInteractiveServerRenderMode();
+            .AddInteractiveServerRenderMode();
         #elif (UseWebAssembly)
         app.MapRazorComponents<App>()
-          .AddInteractiveWebAssemblyRenderMode()
-          .AddAdditionalAssemblies(typeof(Counter).Assembly);
+            .AddInteractiveWebAssemblyRenderMode()
         #else
         app.MapRazorComponents<App>();
         #endif
+        #if (UseWebAssembly && SampleContent)
+            .AddAdditionalAssemblies(typeof(Counter).Assembly);
+        #elif (UseWebAssembly)
+            .AddAdditionalAssemblies(typeof(Client._Imports).Assembly);
+        #endif
 
         #if (IndividualLocalAuth)
         // Add additional endpoints required by the Identity /Account Razor components.

diff --git a/...rojectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs b/...rojectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs
@@ -7,7 +7,7 @@
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.EntityFrameworkCore;
 #endif
-#if (UseWebAssembly)
+#if (UseWebAssembly && SampleContent)
 using BlazorWeb_CSharp.Client.Pages;
 #endif
 using BlazorWeb_CSharp.Components;
@@ -101,17 +101,20 @@
 app.MapRazorComponents<App>()
     .AddInteractiveServerRenderMode()
     .AddInteractiveWebAssemblyRenderMode()
-    .AddAdditionalAssemblies(typeof(Counter).Assembly);
 #elif (UseServer)
 app.MapRazorComponents<App>()
     .AddInteractiveServerRenderMode();
 #elif (UseWebAssembly)
 app.MapRazorComponents<App>()
     .AddInteractiveWebAssemblyRenderMode()
-    .AddAdditionalAssemblies(typeof(Counter).Assembly);
 #else
 app.MapRazorComponents<App>();
 #endif
+#if (UseWebAssembly && SampleContent)
+    .AddAdditionalAssemblies(typeof(Counter).Assembly);
+#elif (UseWebAssembly)
+    .AddAdditionalAssemblies(typeof(BlazorWeb_CSharp.Client._Imports).Assembly);
+#endif
 
 #if (IndividualLocalAuth)
 // Add additional endpoints required by the Identity /Account Razor components.