Fix template and test bugs from PR RicoSuter#4541

paulomorgado · Nov 5, 2023 · 82057fd · 82057fd
1 parent 512eb65
commit 82057fd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.liquid b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.liquid
@@ -35,11 +35,11 @@
 {% else -%}
     public {{ Class }}()
     {
-{% endif -%}
-{% if UseBaseUrl and GenerateBaseUrlProperty -%}
+{%     if UseBaseUrl and GenerateBaseUrlProperty -%}
         BaseUrl = "{{ BaseUrl }}";
+{%     endif -%}
 {% endif -%}
-        {% template Client.Class.Constructor %}
+    {% template Client.Class.Constructor %}
     }
 
     private static {{ JsonSerializerSettingsType }} CreateSerializerSettings({% if UseRequestAndResponseSerializationSettings %}bool isRequest{% endif %})
@@ -65,7 +65,7 @@
         {
             _baseUrl = value;
             if (!string.IsNullOrEmpty(_baseUrl) && !_baseUrl.EndsWith("/"))
-                baseUrl += '/';
+                _baseUrl += '/';
         }
     }
 

diff --git a/...jectName=NSwag.Sample.NET70Minimal_targetFramework=net7.0_generatesCode=True.verified.txt b/...jectName=NSwag.Sample.NET70Minimal_targetFramework=net7.0_generatesCode=True.verified.txt
@@ -30,7 +30,6 @@ namespace MyNamespace
         {
             BaseUrl = baseUrl;
             _httpClient = httpClient;
-            BaseUrl = "";
         }
 
         private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
@@ -47,7 +46,7 @@ namespace MyNamespace
             {
                 _baseUrl = value;
                 if (!string.IsNullOrEmpty(_baseUrl) && !_baseUrl.EndsWith("/"))
-                    baseUrl += '/';
+                    _baseUrl += '/';
             }
         }
 
@@ -327,7 +326,6 @@ namespace MyNamespace
         {
             BaseUrl = baseUrl;
             _httpClient = httpClient;
-            BaseUrl = "";
         }
 
         private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
@@ -344,7 +342,7 @@ namespace MyNamespace
             {
                 _baseUrl = value;
                 if (!string.IsNullOrEmpty(_baseUrl) && !_baseUrl.EndsWith("/"))
-                    baseUrl += '/';
+                    _baseUrl += '/';
             }
         }
 

diff --git a/src/NSwag.Sample.NET70Minimal/GeneratedClientsCs.gen b/src/NSwag.Sample.NET70Minimal/GeneratedClientsCs.gen
@@ -30,7 +30,6 @@ namespace MyNamespace
         {
             BaseUrl = baseUrl;
             _httpClient = httpClient;
-            BaseUrl = "";
         }
 
         private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
@@ -47,7 +46,7 @@ namespace MyNamespace
             {
                 _baseUrl = value;
                 if (!string.IsNullOrEmpty(_baseUrl) && !_baseUrl.EndsWith("/"))
-                    baseUrl += '/';
+                    _baseUrl += '/';
             }
         }
 
@@ -327,7 +326,6 @@ namespace MyNamespace
         {
             BaseUrl = baseUrl;
             _httpClient = httpClient;
-            BaseUrl = "";
         }
 
         private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
@@ -344,7 +342,7 @@ namespace MyNamespace
             {
                 _baseUrl = value;
                 if (!string.IsNullOrEmpty(_baseUrl) && !_baseUrl.EndsWith("/"))
-                    baseUrl += '/';
+                    _baseUrl += '/';
             }
         }
 

diff --git a/src/NSwag.Sample.NET80Minimal/GeneratedClientsCs.gen b/src/NSwag.Sample.NET80Minimal/GeneratedClientsCs.gen
@@ -47,7 +47,7 @@ namespace MyNamespace
             {
                 _baseUrl = value;
                 if (!string.IsNullOrEmpty(_baseUrl) && !_baseUrl.EndsWith("/"))
-                    baseUrl += '/';
+                    _baseUrl += '/';
             }
         }
 
@@ -344,7 +344,7 @@ namespace MyNamespace
             {
                 _baseUrl = value;
                 if (!string.IsNullOrEmpty(_baseUrl) && !_baseUrl.EndsWith("/"))
-                    baseUrl += '/';
+                    _baseUrl += '/';
             }
         }