Fixes

shinyorg · Jan 7, 2024 · 3095f0a · 3095f0a
1 parent 8c80a38
commit 3095f0a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 29 deletions.
diff --git a/ProjectTemplates/ShinyApp/Documentation.md b/ProjectTemplates/ShinyApp/Documentation.md
@@ -268,6 +268,18 @@ A tiny, cross-platform, module based, MIT-licensed web server for .NET Framework
 * [Documentation](https://unosquare.github.io/embedio/)
 * [GitHub](https://github.com/unosquare/embedio/)
 
+<!--#endif-->
+<!--#if (ffimageloading)-->
+## FFImageLoading
+_Fast & Furious Image Loading for .NET MAUI_
+
+Forked from the amazingly popular original FFImageLoading Library, this Compat version FFImageLoading.Compat aims to ease your migration from Xamarin.Forms to .NET MAUI with a compatible implementation to get you up and running without rewriting the parts of your app that relied on the original library.
+
+This Maui version which merges all Transformations & SVG library parts into ONE and is migrated from FFImageLoading.Compat aims to fix some critical bugs and gives you a place to submit Maui releated issues.
+
+The Google webp format image support. (It works in Xamarin.Forms version, but not in FFImageLoading.Compat)
+Thanks to the Original Authors: Daniel Luberda, Fabien Molinet & Redth.
+
 <!--#endif-->
 <!--#if (useblazor && mudblazor)-->
 ## MudBlazor

diff --git a/ProjectTemplates/ShinyAspNet/Documentation.md b/ProjectTemplates/ShinyAspNet/Documentation.md
@@ -1,4 +1,3 @@
-
 ## ASP.NET Documentation
 * [Documentation](https://learn.microsoft.com/en-us/aspnet/core/?view=aspnetcore-7.0)
 
@@ -24,7 +23,10 @@ One of the primary design objectives of Orleans is to simplify the complexities
 <!--#if (swagger)-->
 ## Swagger
 * [Swagger Link (project must be running)](https://localhost:5001/swagger/v1/swagger.json)
-* [C# Client Code Generation (project must be running)](https://localhost:5001/cs-client)
+
+### To generate a C# client
+cd YourApiDirectoy
+dotnet run --generateclients true
 
 <!--#endif-->
 <!--#if (apple)-->
@@ -57,16 +59,4 @@ _Powerful email templates for your apps_
 * [Documentation](http://shinylib.net/extensions/email.html)
 * [GitHub](https://github.com/shinyorg/apiservices)
 
-<!--#endif-->
-<!--#if (ffimageloading)-->
-## FFImageLoading
-_Fast & Furious Image Loading for .NET MAUI_
-
-Forked from the amazingly popular original FFImageLoading Library, this Compat version FFImageLoading.Compat aims to ease your migration from Xamarin.Forms to .NET MAUI with a compatible implementation to get you up and running without rewriting the parts of your app that relied on the original library.
-
-This Maui version which merges all Transformations & SVG library parts into ONE and is migrated from FFImageLoading.Compat aims to fix some critical bugs and gives you a place to submit Maui releated issues.
-
-The Google webp format image support. (It works in Xamarin.Forms version, but not in FFImageLoading.Compat)
-Thanks to the Original Authors: Daniel Luberda, Fabien Molinet & Redth.
-
 <!--#endif-->
diff --git a/ProjectTemplates/ShinyAspNet/Program.cs b/ProjectTemplates/ShinyAspNet/Program.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using System.Security.Claims;
+using ShinyAspNet;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.Tokens;
 //#if (signalr)
@@ -193,23 +194,21 @@
     //         scope.ServiceProvider.GetRequiredService<AppDbContext>().Database.EnsureCreated();
     // }
     #if (swagger)
-    app.UseSwaggerGen(); 
-    app.MapApiClientEndpoint(
-        "/cs-client",
-        c =>
-        {
-            c.SwaggerDocumentName = "v1"; //must match document name set above
-            c.Language = Kiota.Builder.GenerationLanguage.CSharp;
-            c.ClientNamespaceName = "ShinyWish.Services";
-            c.ClientClassName = "ApiClient";
-        },
-        o =>
-        {
-            o.ExcludeFromDescription();
-        }
-    );
+    app.UseSwaggerGen();
     #endif
 }
+#if (swagger)
+await app.GenerateApiClientsAndExitAsync(c =>
+{
+    c.SwaggerDocumentName = "v1"; //must match document name set above
+    c.Language = Kiota.Builder.GenerationLanguage.CSharp;
+    c.ClientNamespaceName = "ShinyAspNet.Services";
+    c.ClientClassName = "ApiClient";
+    c.CreateZipArchive = false;
+    c.OutputPath = Path.Combine(app.Environment.ContentRootPath, "../ApiClient");
+});
+#endif
+
 #if (appledomain)
 app.UseStaticFiles(new StaticFileOptions
 {