WIP

Author: paulomorgado

src/NSwag.CodeGeneration.CSharp.Tests/CSharpClientSettingsTests.cs

@@ -87,6 +87,7 @@ namespace MyNamespace
     public class MyBaseClass
     {
         public MyBaseClass(MyConfig configuration) {}
+        protected global::System.Threading.Tasks.Task<global::System.Net.Http.HttpRequestMessage> CreateHttpRequestMessageAsync(global::System.Threading.CancellationToken ct) { return default; }
     }
     public class MyConfig {}
 }");

src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.liquid

@@ -22,12 +22,12 @@
 {% endif -%}
 
 {% assign constructorParameters = "" -%}
-{% if HasConfigurationClass -%}
-{%     assign constructorParameters = ConfigurationClass | append: " configuration" -%}
+{% if UseBaseUrl and HasBaseUrl == false -%}
+{%     assign constructorParameters = "string baseUrl" %}
 {% endif -%}
-{% if UseBaseUrl and HasBaseUrl == false and HasConfigurationClass == false -%}
+{% if HasConfigurationClass -%}
 {%     unless constructorParameters == "" -%}{% assign constructorParameters = constructorParameters | append: ", " -%}{% endunless -%}
-{%     assign constructorParameters = constructorParameters | append: "string baseUrl" -%}
+{%     assign constructorParameters = constructorParameters | append: ConfigurationClass | append: " configuration" -%}
 {% endif -%}
 {% if InjectHttpClient -%}
 {%     unless constructorParameters == "" -%}{% assign constructorParameters = constructorParameters | append: ", " -%}{% endunless -%}

src/NSwag.CodeGeneration.Tests/VerifyHelper.cs

@@ -43,21 +43,4 @@ public static SettingsTask Verify(string output, bool scrubPragmas = true, bool
             .UseDirectory("Snapshots")
             .AutoVerify(includeBuildServer: false);
     }
-
-    /// <summary>
-    /// Constructs a namespace-like identifier based on the caller's file name (without extension) and the caller member name.
-    /// </summary>
-    /// <param name="sourceMethod">
-    /// The caller member name populated by the compiler via <see cref="CallerMemberNameAttribute"/>.
-    /// </param>
-    /// <param name="sourceFile">
-    /// The caller file path populated by the compiler via <see cref="CallerFilePathAttribute"/>.
-    /// </param>
-    /// <returns>
-    /// A string in the format "<c>{FileNameWithoutExtension}.{MemberName}</c>" (e.g. <c>MyTests.TestMethod</c>).
-    /// </returns>
-    public static string GetNameSpace([CallerMemberName] string sourceMethod = "", [CallerFilePath] string sourceFile = "")
-    {
-        return $"{Path.GetFileNameWithoutExtension(sourceFile)}.{sourceMethod}";
-    }
 }