Merge pull request #32 from darkpatternsdigital/bugfix/csharp-client-config

Correct configuration and pathprefix for non-Server types

Author: mdekrey

Directory.Build.props

@@ -32,7 +32,7 @@
 		<OpenApiAbstractionsVersion>0.3.0</OpenApiAbstractionsVersion>
 		<OpenApiJsonExtensionsVersion>0.18.0</OpenApiJsonExtensionsVersion>
 		<OpenApiLoadersVersion>0.2.0</OpenApiLoadersVersion>
-		<OpenApiCSharpVersion>0.25.1</OpenApiCSharpVersion>
+		<OpenApiCSharpVersion>0.25.2</OpenApiCSharpVersion>
 		<OpenApiTypeScriptClientVersion>0.12.2</OpenApiTypeScriptClientVersion>
 		<OpenApiTypeScriptRxjsClientVersion>0.9.0</OpenApiTypeScriptRxjsClientVersion>
 		<OpenApiTypeScriptMswVersion>0.9.0</OpenApiTypeScriptMswVersion>

generators/csharp/OpenApiCodegen.CSharp/OpenApiCodegen.CSharp.props

@@ -37,25 +37,31 @@
 				<DPDInclude>true</DPDInclude>
 
 				<DPDJsonSchema>@(JsonSchemaDocument->'true')</DPDJsonSchema>
+				<Link>@(JsonSchemaDocument->'%(Link)')</Link>
 				<Namespace>@(JsonSchemaDocument->'%(Namespace)')</Namespace>
+				<PathPrefix>@(JsonSchemaDocument->'%(PathPrefix)')</PathPrefix>
+				<Configuration>@(JsonSchemaDocument->'%(Configuration)')</Configuration>
 				<SchemaId>@(JsonSchemaDocument->'%(SchemaId)')</SchemaId>
-				<Link>@(JsonSchemaDocument->'%(Link)')</Link>
 
 				<DPDGenerateMvcServer>@(OpenApiSchemaMvcServer->'true')</DPDGenerateMvcServer>
 				<Link Condition="'%(AdditionalFiles.Link)' == ''">@(OpenApiSchemaMvcServer->'%(Link)')</Link>
 				<Namespace Condition="'%(AdditionalFiles.Namespace)' == ''">@(OpenApiSchemaMvcServer->'%(Namespace)')</Namespace>
-				<PathPrefix>@(OpenApiSchemaMvcServer->'%(PathPrefix)')</PathPrefix>
-				<Configuration>@(OpenApiSchemaMvcServer->'%(Configuration)')</Configuration>
+				<PathPrefix Condition="'%(AdditionalFiles.PathPrefix)' == ''">@(OpenApiSchemaMvcServer->'%(PathPrefix)')</PathPrefix>
+				<Configuration Condition="'%(AdditionalFiles.Configuration)' == ''">@(OpenApiSchemaMvcServer->'%(Configuration)')</Configuration>
 				<SchemaId Condition="'%(AdditionalFiles.SchemaId)' == ''">@(OpenApiSchemaMvcServer->'%(SchemaId)')</SchemaId>
 
 				<DPDGenerateClient>@(OpenApiSchemaClient->'true')</DPDGenerateClient>
 				<Link Condition="'%(AdditionalFiles.Link)' == ''">@(OpenApiSchemaClient->'%(Link)')</Link>
 				<Namespace Condition="'%(AdditionalFiles.Namespace)' == ''">@(OpenApiSchemaClient->'%(Namespace)')</Namespace>
+				<PathPrefix Condition="'%(AdditionalFiles.PathPrefix)' == ''">@(OpenApiSchemaClient->'%(PathPrefix)')</PathPrefix>
+				<Configuration Condition="'%(AdditionalFiles.Configuration)' == ''">@(OpenApiSchemaClient->'%(Configuration)')</Configuration>
 				<SchemaId Condition="'%(AdditionalFiles.SchemaId)' == ''">@(OpenApiSchemaClient->'%(SchemaId)')</SchemaId>
 
 				<DPDGenerateWebhookClient>@(OpenApiSchemaWebhookClient->'true')</DPDGenerateWebhookClient>
 				<Link Condition="'%(AdditionalFiles.Link)' == ''">@(OpenApiSchemaWebhookClient->'%(Link)')</Link>
 				<Namespace Condition="'%(AdditionalFiles.Namespace)' == ''">@(OpenApiSchemaWebhookClient->'%(Namespace)')</Namespace>
+				<PathPrefix Condition="'%(AdditionalFiles.PathPrefix)' == ''">@(OpenApiSchemaWebhookClient->'%(PathPrefix)')</PathPrefix>
+				<Configuration Condition="'%(AdditionalFiles.Configuration)' == ''">@(OpenApiSchemaWebhookClient->'%(Configuration)')</Configuration>
 				<SchemaId Condition="'%(AdditionalFiles.SchemaId)' == ''">@(OpenApiSchemaWebhookClient->'%(SchemaId)')</SchemaId>
 
 				<DPDSchemaOptions>@(OpenApiSchemaOptions->'true')</DPDSchemaOptions>