Fix Client projects in Web App templates (#4328)

Author: vnbaaij

src/Templates/templates/blazorweb-csharp-10/BlazorWebCSharp.1.Client/Program.Main.cs

@@ -1,4 +1,7 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+#if (UseWebAssembly)
+using Microsoft.FluentUI.AspNetCore.Components;
+#endif
 
 namespace BlazorWebCSharp._1.Client;
 
@@ -12,8 +15,12 @@ static async Task Main(string[] args)
         builder.Services.AddAuthorizationCore();
         builder.Services.AddCascadingAuthenticationState();
         builder.Services.AddAuthenticationStateDeserialization();
+#endif
 
+#if (UseWebAssembly)
+        builder.Services.AddFluentUIComponents();
 #endif
+
         await builder.Build().RunAsync();
     }
 }

src/Templates/templates/blazorweb-csharp-10/BlazorWebCSharp.1.Client/Program.cs

@@ -1,11 +1,18 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+#if (UseWebAssembly)
+using Microsoft.FluentUI.AspNetCore.Components;
+#endif
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
 #if (IndividualLocalAuth)
 builder.Services.AddAuthorizationCore();
 builder.Services.AddCascadingAuthenticationState();
 builder.Services.AddAuthenticationStateDeserialization();
+#endif
 
+#if (UseWebAssembly)
+builder.Services.AddFluentUIComponents();
 #endif
+
 await builder.Build().RunAsync();

src/Templates/templates/blazorweb-csharp-10/BlazorWebCSharp.1/Components/_Imports.razor

@@ -14,8 +14,6 @@
 @using BlazorWebCSharp._1
 @*#if (UseWebAssembly) -->
 @using BlazorWebCSharp._1.Client
-##endif*@
-@*#if (UseServer && UseWebAssembly && InteractiveAtRoot) -->
 @using BlazorWebCSharp._1.Client.Layout
 ##endif*@
 @using BlazorWebCSharp._1.Components

src/Templates/templates/blazorweb-csharp-8/.template.config/template.json

@@ -131,6 +131,7 @@
           "exclude": [
             "BlazorWeb-CSharp/Components/Account/**",
             "BlazorWeb-CSharp/Data/**",
+            "BlazorWeb-CSharp.Client/PersistentAuthenticationStateProvider.cs",
             "BlazorWeb-CSharp.Client/UserInfo.cs",
             "BlazorWeb-CSharp.Client/Pages/Auth.razor"
           ]

src/Templates/templates/blazorweb-csharp-8/BlazorWeb-CSharp.Client/Program.Main.cs

@@ -3,6 +3,9 @@
 using Microsoft.AspNetCore.Components.Authorization;
 #endif
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+#if (UseWebAssembly)
+using Microsoft.FluentUI.AspNetCore.Components;
+#endif
 
 namespace BlazorWeb_CSharp.Client;
 
@@ -16,8 +19,12 @@ static async Task Main(string[] args)
         builder.Services.AddAuthorizationCore();
         builder.Services.AddCascadingAuthenticationState();
         builder.Services.AddSingleton<AuthenticationStateProvider, PersistentAuthenticationStateProvider>();
+#endif
 
+#if (UseWebAssembly)
+        builder.Services.AddFluentUIComponents();
 #endif
+
         await builder.Build().RunAsync();
     }
 }

src/Templates/templates/blazorweb-csharp-8/BlazorWeb-CSharp.Client/Program.cs

@@ -3,13 +3,20 @@
 using Microsoft.AspNetCore.Components.Authorization;
 #endif
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+#if (UseWebAssembly)
+using Microsoft.FluentUI.AspNetCore.Components;
+#endif
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
 #if (IndividualLocalAuth)
 builder.Services.AddAuthorizationCore();
 builder.Services.AddCascadingAuthenticationState();
 builder.Services.AddSingleton<AuthenticationStateProvider, PersistentAuthenticationStateProvider>();
+#endif
 
+#if (UseWebAssembly)
+builder.Services.AddFluentUIComponents();
 #endif
+
 await builder.Build().RunAsync();

src/Templates/templates/blazorweb-csharp-9/BlazorWeb-CSharp.Client/Program.Main.cs

@@ -1,4 +1,7 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+#if (UseWebAssembly)
+using Microsoft.FluentUI.AspNetCore.Components;
+#endif
 
 namespace BlazorWeb_CSharp.Client;
 
@@ -12,8 +15,12 @@ static async Task Main(string[] args)
         builder.Services.AddAuthorizationCore();
         builder.Services.AddCascadingAuthenticationState();
         builder.Services.AddAuthenticationStateDeserialization();
+#endif
 
+#if (UseWebAssembly)
+        builder.Services.AddFluentUIComponents();
 #endif
+
         await builder.Build().RunAsync();
     }
 }

src/Templates/templates/blazorweb-csharp-9/BlazorWeb-CSharp.Client/Program.cs

@@ -1,11 +1,18 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+#if (UseWebAssembly)
+using Microsoft.FluentUI.AspNetCore.Components;
+#endif
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
 #if (IndividualLocalAuth)
 builder.Services.AddAuthorizationCore();
 builder.Services.AddCascadingAuthenticationState();
 builder.Services.AddAuthenticationStateDeserialization();
+#endif
 
+#if (UseWebAssembly)
+builder.Services.AddFluentUIComponents();
 #endif
+
 await builder.Build().RunAsync();