From f17202e3bb4619e8b2279aa378033b10da47a918 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paulschneider@free.fr>
Date: Sat, 14 Feb 2026 17:52:01 +0000
Subject: [PATCH] build

---
 Directory.Packages.props                |  3 ++-
 src/cli/Commands/AuthCommander.cs       |  2 +-
 src/cli/Commands/GenerationCommander.cs | 20 ++++++++++++--------
 src/cli/cli.csproj                      |  8 +++++---
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index bb1ab729..3f0f6d4f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -38,6 +38,7 @@
     <PackageVersion Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.7" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.7" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
@@ -58,4 +59,4 @@
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.2" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/cli/Commands/AuthCommander.cs b/src/cli/Commands/AuthCommander.cs
index 33901681..f895b56f 100644
--- a/src/cli/Commands/AuthCommander.cs
+++ b/src/cli/Commands/AuthCommander.cs
@@ -40,7 +40,7 @@ namespace cli.Commands
                     });
                     loginCommand.OnExecute(async () =>
             {
-                string? authUrl = Program.AppConfiguration.GetValue<String>("ConnectionSettings:ServerApi:Authority");
+                string? authHostName = Program.AppConfiguration.GetRequiredSection("ConnectionSettings:ServerApi")["Authority"];
              
                 throw new NotImplementedException();
                 /*
diff --git a/src/cli/Commands/GenerationCommander.cs b/src/cli/Commands/GenerationCommander.cs
index e871f61b..55712f5b 100644
--- a/src/cli/Commands/GenerationCommander.cs
+++ b/src/cli/Commands/GenerationCommander.cs
@@ -11,9 +11,19 @@ namespace cli.Commands
 {
     public class GenerationCommander : ICommander
     {
+    private MvcGenerator mvcGenerator;
+    private ILoggerFactory loggerFactory;
+    private IOptions<GenMvcSettings> options;
 
-        public GenerationCommander()
+    public GenerationCommander(
+            MvcGenerator mvcGenerator,
+            ILoggerFactory loggerFactory,
+            IOptions<GenMvcSettings> options
+            )
         {
+            this.mvcGenerator = mvcGenerator;
+            this.loggerFactory = loggerFactory;
+            this.options = options;
         }
 
         public CommandLineApplication Integrate(CommandLineApplication rootApp)
@@ -35,13 +45,7 @@ namespace cli.Commands
             });
             cmd.OnExecute(() => {
              
-                    var mailer = Program.AppHost.Services.GetService<MvcGenerator>();
-                    var loggerFactory = Program.AppHost.Services.GetService<ILoggerFactory>();
                     var logger = loggerFactory.CreateLogger<GenerationCommander>();
-                    var options = Program.AppHost.Services.GetService<IOptions<GenMvcSettings>>();
-
-                    MvcGenerator generator = Program.AppHost.Services.GetService<MvcGenerator>();
-
                     var modelFullName = mdClass?.Value ?? options?.Value.ModelFullName;
                     var nameSpace = nameSpaceArg?.Value?? options?.Value.NameSpace;
                     var dbContext = dbCtx?.Value?? options?.Value.DbContextFullName;
@@ -51,7 +55,7 @@ namespace cli.Commands
                     logger.LogInformation("Starting generation");
                     logger.LogInformation($"Using parameters : modelFullName:{modelFullName} nameSpace:{nameSpace} dbContext:{dbContext} controllerName:{controllerName} relativePath:{relativePath}");
 
-                    generator.Generate(modelFullName,
+                    mvcGenerator.Generate(modelFullName,
                      dbContext, 
                      controllerName,
                      relativePath);
diff --git a/src/cli/cli.csproj b/src/cli/cli.csproj
index 33746cc8..c136b874 100644
--- a/src/cli/cli.csproj
+++ b/src/cli/cli.csproj
@@ -10,10 +10,12 @@
     <PackageReference Include="Microsoft.AspNetCore.Razor.Language" />
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" />
     <PackageReference Include="Microsoft.Extensions.Configuration" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="Microsoft.Extensions.Logging" />
     <PackageReference Include="Newtonsoft.Json" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Yavsc.Abstract\Yavsc.Abstract.csproj" />
-    <ProjectReference Include="..\Yavsc.Server\Yavsc.Server.csproj" />
+    <ProjectReference Include="..\Abstract\Abstract.csproj" />
+    <ProjectReference Include="..\Server\Server.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>