Introduce dedicated flag for client generation using MS http client factory

Author: C0nquistadore

src/Dibix.Sdk.CodeGeneration/Configuration/CodeGenerationConfiguration.cs

@@ -20,6 +20,7 @@ public sealed class CodeGenerationConfiguration
         public string BaseUrl { get; set; }
         public string Description { get; set; }
         public bool EnableExperimentalFeatures { get; set; }
+        public bool UseMicrosoftHttpClient { get; set; }
         public ConfigurationTemplates ConfigurationTemplates { get; } = new ConfigurationTemplates();
         public ICollection<TaskItem> Source { get; } = new Collection<TaskItem>();
         public ICollection<TaskItem> Contracts { get; } = new Collection<TaskItem>();

src/Dibix.Sdk.CodeGeneration/Output/ApiClientImplementationWriter.cs

@@ -21,7 +21,7 @@ protected override void WriteController(CodeGenerationContext context, CSharpSta
         {
             context.AddReference<HttpClient>();
 
-            if (context.Model.EnableExperimentalFeatures)
+            if (context.Model.UseMicrosoftHttpClient)
                 context.AddUsing("IHttpClientFactory = System.Net.Http.IHttpClientFactory");
 
             string className = $"{controller.Name}Service";
@@ -117,7 +117,7 @@ private string GenerateMethodBody(ControllerDefinition controller, ActionDefinit
             StringWriter writer = new StringWriter();
             writer.Write($"using ({nameof(HttpClient)} client = _httpClientFactory.CreateClient(_httpClientName");
 
-            if (!context.Model.EnableExperimentalFeatures)
+            if (!context.Model.UseMicrosoftHttpClient)
                 writer.Write(", BaseAddress");
 
             writer.WriteLine("))")

src/Dibix.Sdk.CodeGeneration/Output/ServerCodeGenerator.cs

@@ -13,7 +13,6 @@ public ServerCodeGenerator(CodeGenerationModel model, ISchemaRegistry schemaRegi
         #region Overrides
         protected override IEnumerable<ArtifactWriterBase> SelectWriters(CodeGenerationModel model)
         {
-            bool accessorOnly = model.EnableExperimentalFeatures;
             const CodeGenerationOutputFilter outputFilter = CodeGenerationOutputFilter.Local;
             yield return new DaoExecutorWriter(model, outputFilter);
             yield return new DaoExecutorInputClassWriter(model, outputFilter);

src/Dibix.Sdk.CodeGeneration/Runtime/CodeGenerationModel.cs

@@ -17,6 +17,7 @@ public class CodeGenerationModel : IPersistedCodeGenerationModel
         public CommandTextFormatting CommandTextFormatting { get; set; }
         public string BaseUrl { get; set; }
         public bool EnableExperimentalFeatures { get; set; }
+        public bool UseMicrosoftHttpClient { get; set; }
         public IList<ControllerDefinition> Controllers { get; }
         public IList<SecurityScheme> SecuritySchemes { get; }
         public ICollection<SchemaDefinition> Schemas { get; }

src/Dibix.Sdk.CodeGeneration/Runtime/CodeGenerationModelLoader.cs

@@ -35,7 +35,8 @@ CodeGenerationConfiguration configuration
                 DefaultOutputName = configuration.DefaultOutputName,
                 ClientOutputName = configuration.ClientOutputName,
                 BaseUrl = configuration.BaseUrl,
-                EnableExperimentalFeatures = configuration.EnableExperimentalFeatures
+                EnableExperimentalFeatures = configuration.EnableExperimentalFeatures,
+                UseMicrosoftHttpClient = configuration.UseMicrosoftHttpClient
             };
 
             ITypeResolverFacade typeResolver = new TypeResolverFacade(logger);

src/Dibix.Sdk/Tasks/SqlCoreTask.cs

@@ -36,6 +36,7 @@ namespace Dibix.Sdk
     [TaskProperty("LimitDdlStatements", TaskPropertyType.Boolean, Category = GlobalCategory)]
     [TaskProperty("PreventDmlReferences", TaskPropertyType.Boolean, Category = GlobalCategory)]
     [TaskProperty("EnableExperimentalFeatures", TaskPropertyType.Boolean, Category = ArtifactGenerationCategory)]
+    [TaskProperty("UseMicrosoftHttpClient", TaskPropertyType.Boolean, Category = ArtifactGenerationCategory)]
     [TaskProperty("DatabaseSchemaProviderName", TaskPropertyType.String, Category = GlobalCategory)]
     [TaskProperty("ModelCollation", TaskPropertyType.String, Category = GlobalCategory)]
     [TaskProperty("SqlReferencePath", TaskPropertyType.Items, Category = GlobalCategory)]
@@ -76,7 +77,8 @@ private partial bool Execute()
                 Title = _configuration.ArtifactGeneration.Title,
                 Version = _configuration.ArtifactGeneration.Version,
                 Description = _configuration.ArtifactGeneration.Description,
-                EnableExperimentalFeatures = _configuration.ArtifactGeneration.EnableExperimentalFeatures
+                EnableExperimentalFeatures = _configuration.ArtifactGeneration.EnableExperimentalFeatures,
+                UseMicrosoftHttpClient = _configuration.ArtifactGeneration.UseMicrosoftHttpClient
             };
             codeGenerationConfiguration.Source.AddRange(_configuration.SqlCore.Source);
             codeGenerationConfiguration.Contracts.AddRange(_configuration.ArtifactGeneration.Contracts);

src/Dibix.Sdk/targets/Dibix.Sdk.targets

@@ -308,6 +308,8 @@ $(_ServerCompilationArtifactReference)" />
   $(PreventDmlReferences)" />
       <_SqlCoreInputItem Include="EnableExperimentalFeatures
   $(EnableExperimentalFeatures)" />
+      <_SqlCoreInputItem Include="UseMicrosoftHttpClient
+  $(UseMicrosoftHttpClient)" />
       <_SqlCoreInputItem Include="SqlReferencePath
 $(_SqlReferencePath)" />
     </ItemGroup>
@@ -662,7 +664,7 @@ $(_SqlReferencePath)" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" ExcludeAssets="runtime" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(EnableExperimentalFeatures)' == 'true'">
+  <ItemGroup Condition="'$(UseMicrosoftHttpClient)' == 'true'">
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" ExcludeAssets="runtime" />
   </ItemGroup>
 

tests/Dibix.Sdk.Tests/CodeGeneration/CodeGenerationTaskTests.Base.cs

@@ -83,6 +83,8 @@ Dibix.Sdk.Tests API description
   True
 EnableExperimentalFeatures
   {enableExperimentalFeatures /* TODO: Add test support for inspecting DBX file */}
+UseMicrosoftHttpClient
+  False
 SqlReferencePath");
             InputConfiguration inputConfiguration = InputConfiguration.Parse(inputConfigurationPath);
             SqlCoreTask task = new SqlCoreTask(logger, inputConfiguration);