Skip to content

Commit 5462e42

Browse files
committed
Fix UseWebAssembly && !SampleContent
1 parent fd85341 commit 5462e42

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.Main.cs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Microsoft.AspNetCore.Identity.UI.Services;
88
using Microsoft.EntityFrameworkCore;
99
#endif
10-
#if (UseWebAssembly)
10+
#if (UseWebAssembly && SampleContent)
1111
using BlazorWeb_CSharp.Client.Pages;
1212
#endif
1313
using BlazorWeb_CSharp.Components;
@@ -104,19 +104,22 @@ public static void Main(string[] args)
104104

105105
#if (UseServer && UseWebAssembly)
106106
app.MapRazorComponents<App>()
107-
.AddInteractiveServerRenderMode()
108-
.AddInteractiveWebAssemblyRenderMode()
109-
.AddAdditionalAssemblies(typeof(Counter).Assembly);
107+
.AddInteractiveServerRenderMode()
108+
.AddInteractiveWebAssemblyRenderMode()
110109
#elif (UseServer)
111110
app.MapRazorComponents<App>()
112-
.AddInteractiveServerRenderMode();
111+
.AddInteractiveServerRenderMode();
113112
#elif (UseWebAssembly)
114113
app.MapRazorComponents<App>()
115-
.AddInteractiveWebAssemblyRenderMode()
116-
.AddAdditionalAssemblies(typeof(Counter).Assembly);
114+
.AddInteractiveWebAssemblyRenderMode()
117115
#else
118116
app.MapRazorComponents<App>();
119117
#endif
118+
#if (UseWebAssembly && SampleContent)
119+
.AddAdditionalAssemblies(typeof(Counter).Assembly);
120+
#elif (UseWebAssembly)
121+
.AddAdditionalAssemblies(typeof(Client._Imports).Assembly);
122+
#endif
120123

121124
#if (IndividualLocalAuth)
122125
// Add additional endpoints required by the Identity /Account Razor components.

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Program.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Microsoft.AspNetCore.Identity.UI.Services;
88
using Microsoft.EntityFrameworkCore;
99
#endif
10-
#if (UseWebAssembly)
10+
#if (UseWebAssembly && SampleContent)
1111
using BlazorWeb_CSharp.Client.Pages;
1212
#endif
1313
using BlazorWeb_CSharp.Components;
@@ -101,17 +101,20 @@
101101
app.MapRazorComponents<App>()
102102
.AddInteractiveServerRenderMode()
103103
.AddInteractiveWebAssemblyRenderMode()
104-
.AddAdditionalAssemblies(typeof(Counter).Assembly);
105104
#elif (UseServer)
106105
app.MapRazorComponents<App>()
107106
.AddInteractiveServerRenderMode();
108107
#elif (UseWebAssembly)
109108
app.MapRazorComponents<App>()
110109
.AddInteractiveWebAssemblyRenderMode()
111-
.AddAdditionalAssemblies(typeof(Counter).Assembly);
112110
#else
113111
app.MapRazorComponents<App>();
114112
#endif
113+
#if (UseWebAssembly && SampleContent)
114+
.AddAdditionalAssemblies(typeof(Counter).Assembly);
115+
#elif (UseWebAssembly)
116+
.AddAdditionalAssemblies(typeof(BlazorWeb_CSharp.Client._Imports).Assembly);
117+
#endif
115118

116119
#if (IndividualLocalAuth)
117120
// Add additional endpoints required by the Identity /Account Razor components.

0 commit comments

Comments
 (0)