Adds spec additionalProperties + nullable examples (#2405)

* Adds v2 spec additionalproperties examples, adds v3 spec nulllable model example, updates samples

* Remaining samples updates

* Adds csharp generator update to handle models with multilevel parent types, which works for the AdditionalPropertiesObject model, samples updated

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java

@@ -19,6 +19,7 @@ package org.openapitools.codegen.languages;
 
 import com.google.common.collect.ImmutableMap;
 import com.samskivert.mustache.Mustache;
+import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.utils.ModelUtils;
@@ -837,4 +838,28 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         // To avoid unexpected behaviors when options are passed programmatically such as { "supportsAsync": "" }
         return super.processCompiler(compiler).emptyStringIsFalse(true);
     }
+
+    /**
+     * Return the instantiation type of the property, especially for map and array
+     *
+     * @param schema property schema
+     * @return string presentation of the instantiation type of the property
+     */
+    @Override
+    public String toInstantiationType(Schema schema) {
+        if (ModelUtils.isMapSchema(schema)) {
+            Schema additionalProperties = ModelUtils.getAdditionalProperties(schema);
+            String inner = getSchemaType(additionalProperties);
+            if (ModelUtils.isMapSchema(additionalProperties)) {
+                inner = toInstantiationType(additionalProperties);
+            }
+            return instantiationTypes.get("map") + "<String, " + inner + ">";
+        } else if (ModelUtils.isArraySchema(schema)) {
+            ArraySchema arraySchema = (ArraySchema) schema;
+            String inner = getSchemaType(arraySchema.getItems());
+            return instantiationTypes.get("array") + "<" + inner + ">";
+        } else {
+            return null;
+        }
+    }
 }

modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml

@@ -1391,16 +1391,105 @@ definitions:
   AdditionalPropertiesClass:
     type: object
     properties:
-      map_property:
+      map_string:
         type: object
         additionalProperties:
           type: string
-      map_of_map_property:
+      map_number:
+        type: object
+        additionalProperties:
+          type: number
+      map_integer:
+        type: object
+        additionalProperties:
+          type: integer
+      map_boolean:
+        type: object
+        additionalProperties:
+          type: boolean
+      map_array_integer:
+        type: object
+        additionalProperties:
+          type: array
+          items:
+            type: integer
+      map_array_anytype:
+        type: object
+        additionalProperties:
+          type: array
+          items:
+            type: object
+      map_map_string:
         type: object
         additionalProperties:
           type: object
           additionalProperties:
             type: string
+      map_map_anytype:
+        type: object
+        additionalProperties:
+          type: object
+          additionalProperties:
+            type: object
+      anytype_1:
+        type: object
+      anytype_2: {}
+      anytype_3:
+        type: object
+        properties: {}
+  AdditionalPropertiesString:
+    type: object
+    properties:
+      name:
+        type: string
+    additionalProperties:
+      type: string
+  AdditionalPropertiesInteger:
+    type: object
+    properties:
+      name:
+        type: string
+    additionalProperties:
+      type: integer
+  AdditionalPropertiesNumber:
+    type: object
+    properties:
+      name:
+        type: string
+    additionalProperties:
+      type: number
+  AdditionalPropertiesBoolean:
+    type: object
+    properties:
+      name:
+        type: string
+    additionalProperties:
+      type: boolean
+  AdditionalPropertiesArray:
+    type: object
+    properties:
+      name:
+        type: string
+    additionalProperties:
+      type: array
+      items:
+        type: object
+  AdditionalPropertiesObject:
+    type: object
+    properties:
+      name:
+        type: string
+    additionalProperties:
+      type: object
+      additionalProperties:
+        type: object
+  AdditionalPropertiesAnyType:
+    type: object
+    properties:
+      name:
+        type: string
+    additionalProperties:
+      type: object
   MixedPropertiesAndAdditionalPropertiesClass:
     type: object
     properties:

modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml

@@ -1380,7 +1380,7 @@ components:
           maxLength: 64
           minLength: 10
         pattern_with_digits:
-          description: A string that is a 10 digit number. Can have leading zeros. 
+          description: A string that is a 10 digit number. Can have leading zeros.
           type: string
           pattern: '^\d{10}$'
         pattern_with_digits_and_delimiter:
@@ -1654,3 +1654,61 @@ components:
           nullable: true
           type: string
       description: Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
+    NullableClass:
+      type: object
+      properties:
+        integer_prop:
+          type: integer
+          nullable: true
+        number_prop:
+          type: number
+          nullable: true
+        boolean_prop:
+          type: boolean
+          nullable: true
+        string_prop:
+          type: string
+          nullable: true
+        date_prop:
+          type: string
+          format: date
+          nullable: true
+        datetime_prop:
+          type: string
+          format: date-time
+          nullable: true
+        array_nullable_prop:
+          type: array
+          nullable: true
+          items:
+            type: object
+        array_and_items_nullable_prop:
+          type: array
+          nullable: true
+          items:
+            type: object
+            nullable: true
+        array_items_nullable:
+          type: array
+          items:
+            type: object
+            nullable: true
+        object_nullable_prop:
+          type: object
+          nullable: true
+          additionalProperties:
+            type: object
+        object_and_items_nullable_prop:
+          type: object
+          nullable: true
+          additionalProperties:
+            type: object
+            nullable: true
+        object_items_nullable:
+          type: object
+          additionalProperties:
+            type: object
+            nullable: true
+      additionalProperties:
+        type: object
+        nullable: true

samples/client/petstore/csharp/OpenAPIClient/README.md

@@ -137,7 +137,14 @@ Class | Method | HTTP request | Description
 <a name="documentation-for-models"></a>
 ## Documentation for Models
 
+ - [Model.AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [Model.AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [Model.AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [Model.AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [Model.AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [Model.AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [Model.AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [Model.AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Model.Animal](docs/Animal.md)
  - [Model.ApiResponse](docs/ApiResponse.md)
  - [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)

samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesAnyType.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesAnyType
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesArray.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesArray
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesBoolean.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesBoolean
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesClass.md

@@ -3,8 +3,17 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MapProperty** | **Dictionary<string, string>** |  | [optional] 
+**MapString** | **Dictionary<string, string>** |  | [optional] 
-**MapOfMapProperty** | **Dictionary<string, Dictionary<string, string>>** |  | [optional] 
+**MapNumber** | **Dictionary<string, decimal?>** |  | [optional] 
+**MapInteger** | **Dictionary<string, int?>** |  | [optional] 
+**MapBoolean** | **Dictionary<string, bool?>** |  | [optional] 
+**MapArrayInteger** | **Dictionary<string, List<int?>>** |  | [optional] 
+**MapArrayAnytype** | **Dictionary<string, List<Object>>** |  | [optional] 
+**MapMapString** | **Dictionary<string, Dictionary<string, string>>** |  | [optional] 
+**MapMapAnytype** | **Dictionary<string, Dictionary<string, Object>>** |  | [optional] 
+**Anytype1** | [**Object**](.md) |  | [optional] 
+**Anytype2** | [**Object**](.md) |  | [optional] 
+**Anytype3** | [**Object**](.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesInteger.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesInteger
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesNumber.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesNumber
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesObject.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesObject
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesString.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesString
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesAnyTypeTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesAnyType
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesAnyTypeTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesAnyType
+        //private AdditionalPropertiesAnyType instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesAnyType
+            //instance = new AdditionalPropertiesAnyType();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesAnyType
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesAnyTypeInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesAnyType
+            //Assert.IsInstanceOfType<AdditionalPropertiesAnyType> (instance, "variable 'instance' is a AdditionalPropertiesAnyType");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesArrayTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesArray
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesArrayTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesArray
+        //private AdditionalPropertiesArray instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesArray
+            //instance = new AdditionalPropertiesArray();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesArray
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesArrayInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesArray
+            //Assert.IsInstanceOfType<AdditionalPropertiesArray> (instance, "variable 'instance' is a AdditionalPropertiesArray");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesBooleanTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesBoolean
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesBooleanTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesBoolean
+        //private AdditionalPropertiesBoolean instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesBoolean
+            //instance = new AdditionalPropertiesBoolean();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesBoolean
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesBooleanInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesBoolean
+            //Assert.IsInstanceOfType<AdditionalPropertiesBoolean> (instance, "variable 'instance' is a AdditionalPropertiesBoolean");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesIntegerTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesInteger
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesIntegerTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesInteger
+        //private AdditionalPropertiesInteger instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesInteger
+            //instance = new AdditionalPropertiesInteger();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesInteger
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesIntegerInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesInteger
+            //Assert.IsInstanceOfType<AdditionalPropertiesInteger> (instance, "variable 'instance' is a AdditionalPropertiesInteger");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesNumberTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesNumber
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesNumberTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesNumber
+        //private AdditionalPropertiesNumber instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesNumber
+            //instance = new AdditionalPropertiesNumber();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesNumber
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesNumberInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesNumber
+            //Assert.IsInstanceOfType<AdditionalPropertiesNumber> (instance, "variable 'instance' is a AdditionalPropertiesNumber");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesObjectTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesObject
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesObjectTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesObject
+        //private AdditionalPropertiesObject instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesObject
+            //instance = new AdditionalPropertiesObject();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesObject
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesObjectInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesObject
+            //Assert.IsInstanceOfType<AdditionalPropertiesObject> (instance, "variable 'instance' is a AdditionalPropertiesObject");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesStringTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesString
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesStringTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesString
+        //private AdditionalPropertiesString instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesString
+            //instance = new AdditionalPropertiesString();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesString
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesStringInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesString
+            //Assert.IsInstanceOfType<AdditionalPropertiesString> (instance, "variable 'instance' is a AdditionalPropertiesString");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs

@@ -0,0 +1,125 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesAnyType
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesAnyType : Dictionary<String, Object>,  IEquatable<AdditionalPropertiesAnyType>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesAnyType" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesAnyType(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesAnyType {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesAnyType);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesAnyType instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesAnyType to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesAnyType input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs

@@ -0,0 +1,125 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesArray
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesArray : Dictionary<String, List>,  IEquatable<AdditionalPropertiesArray>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesArray" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesArray(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesArray {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesArray);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesArray instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesArray to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesArray input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs

@@ -0,0 +1,125 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesBoolean
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesBoolean : Dictionary<String, bool?>,  IEquatable<AdditionalPropertiesBoolean>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesBoolean" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesBoolean(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesBoolean {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesBoolean);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesBoolean instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesBoolean to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesBoolean input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs

@@ -33,25 +33,97 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="AdditionalPropertiesClass" /> class.
         /// </summary>
-        /// <param name="mapProperty">mapProperty.</param>
+        /// <param name="mapString">mapString.</param>
-        /// <param name="mapOfMapProperty">mapOfMapProperty.</param>
+        /// <param name="mapNumber">mapNumber.</param>
-        public AdditionalPropertiesClass(Dictionary<string, string> mapProperty = default(Dictionary<string, string>), Dictionary<string, Dictionary<string, string>> mapOfMapProperty = default(Dictionary<string, Dictionary<string, string>>))
+        /// <param name="mapInteger">mapInteger.</param>
+        /// <param name="mapBoolean">mapBoolean.</param>
+        /// <param name="mapArrayInteger">mapArrayInteger.</param>
+        /// <param name="mapArrayAnytype">mapArrayAnytype.</param>
+        /// <param name="mapMapString">mapMapString.</param>
+        /// <param name="mapMapAnytype">mapMapAnytype.</param>
+        /// <param name="anytype1">anytype1.</param>
+        /// <param name="anytype2">anytype2.</param>
+        /// <param name="anytype3">anytype3.</param>
+        public AdditionalPropertiesClass(Dictionary<string, string> mapString = default(Dictionary<string, string>), Dictionary<string, decimal?> mapNumber = default(Dictionary<string, decimal?>), Dictionary<string, int?> mapInteger = default(Dictionary<string, int?>), Dictionary<string, bool?> mapBoolean = default(Dictionary<string, bool?>), Dictionary<string, List<int?>> mapArrayInteger = default(Dictionary<string, List<int?>>), Dictionary<string, List<Object>> mapArrayAnytype = default(Dictionary<string, List<Object>>), Dictionary<string, Dictionary<string, string>> mapMapString = default(Dictionary<string, Dictionary<string, string>>), Dictionary<string, Dictionary<string, Object>> mapMapAnytype = default(Dictionary<string, Dictionary<string, Object>>), Object anytype1 = default(Object), Object anytype2 = default(Object), Object anytype3 = default(Object))
         {
-            this.MapProperty = mapProperty;
+            this.MapString = mapString;
-            this.MapOfMapProperty = mapOfMapProperty;
+            this.MapNumber = mapNumber;
+            this.MapInteger = mapInteger;
+            this.MapBoolean = mapBoolean;
+            this.MapArrayInteger = mapArrayInteger;
+            this.MapArrayAnytype = mapArrayAnytype;
+            this.MapMapString = mapMapString;
+            this.MapMapAnytype = mapMapAnytype;
+            this.Anytype1 = anytype1;
+            this.Anytype2 = anytype2;
+            this.Anytype3 = anytype3;
         }
         
         /// <summary>
-        /// Gets or Sets MapProperty
+        /// Gets or Sets MapString
         /// </summary>
-        [DataMember(Name="map_property", EmitDefaultValue=false)]
+        [DataMember(Name="map_string", EmitDefaultValue=false)]
-        public Dictionary<string, string> MapProperty { get; set; }
+        public Dictionary<string, string> MapString { get; set; }
 
         /// <summary>
-        /// Gets or Sets MapOfMapProperty
+        /// Gets or Sets MapNumber
         /// </summary>
-        [DataMember(Name="map_of_map_property", EmitDefaultValue=false)]
+        [DataMember(Name="map_number", EmitDefaultValue=false)]
-        public Dictionary<string, Dictionary<string, string>> MapOfMapProperty { get; set; }
+        public Dictionary<string, decimal?> MapNumber { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapInteger
+        /// </summary>
+        [DataMember(Name="map_integer", EmitDefaultValue=false)]
+        public Dictionary<string, int?> MapInteger { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapBoolean
+        /// </summary>
+        [DataMember(Name="map_boolean", EmitDefaultValue=false)]
+        public Dictionary<string, bool?> MapBoolean { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapArrayInteger
+        /// </summary>
+        [DataMember(Name="map_array_integer", EmitDefaultValue=false)]
+        public Dictionary<string, List<int?>> MapArrayInteger { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapArrayAnytype
+        /// </summary>
+        [DataMember(Name="map_array_anytype", EmitDefaultValue=false)]
+        public Dictionary<string, List<Object>> MapArrayAnytype { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapMapString
+        /// </summary>
+        [DataMember(Name="map_map_string", EmitDefaultValue=false)]
+        public Dictionary<string, Dictionary<string, string>> MapMapString { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapMapAnytype
+        /// </summary>
+        [DataMember(Name="map_map_anytype", EmitDefaultValue=false)]
+        public Dictionary<string, Dictionary<string, Object>> MapMapAnytype { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Anytype1
+        /// </summary>
+        [DataMember(Name="anytype_1", EmitDefaultValue=false)]
+        public Object Anytype1 { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Anytype2
+        /// </summary>
+        [DataMember(Name="anytype_2", EmitDefaultValue=false)]
+        public Object Anytype2 { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Anytype3
+        /// </summary>
+        [DataMember(Name="anytype_3", EmitDefaultValue=false)]
+        public Object Anytype3 { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -61,8 +133,17 @@ namespace Org.OpenAPITools.Model
         {
             var sb = new StringBuilder();
             sb.Append("class AdditionalPropertiesClass {\n");
-            sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
+            sb.Append("  MapString: ").Append(MapString).Append("\n");
-            sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
+            sb.Append("  MapNumber: ").Append(MapNumber).Append("\n");
+            sb.Append("  MapInteger: ").Append(MapInteger).Append("\n");
+            sb.Append("  MapBoolean: ").Append(MapBoolean).Append("\n");
+            sb.Append("  MapArrayInteger: ").Append(MapArrayInteger).Append("\n");
+            sb.Append("  MapArrayAnytype: ").Append(MapArrayAnytype).Append("\n");
+            sb.Append("  MapMapString: ").Append(MapMapString).Append("\n");
+            sb.Append("  MapMapAnytype: ").Append(MapMapAnytype).Append("\n");
+            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
+            sb.Append("  Anytype2: ").Append(Anytype2).Append("\n");
+            sb.Append("  Anytype3: ").Append(Anytype3).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -98,14 +179,59 @@ namespace Org.OpenAPITools.Model
 
             return 
                 (
-                    this.MapProperty == input.MapProperty ||
+                    this.MapString == input.MapString ||
-                    this.MapProperty != null &&
+                    this.MapString != null &&
-                    this.MapProperty.SequenceEqual(input.MapProperty)
+                    this.MapString.SequenceEqual(input.MapString)
                 ) && 
                 (
-                    this.MapOfMapProperty == input.MapOfMapProperty ||
+                    this.MapNumber == input.MapNumber ||
-                    this.MapOfMapProperty != null &&
+                    this.MapNumber != null &&
-                    this.MapOfMapProperty.SequenceEqual(input.MapOfMapProperty)
+                    this.MapNumber.SequenceEqual(input.MapNumber)
+                ) && 
+                (
+                    this.MapInteger == input.MapInteger ||
+                    this.MapInteger != null &&
+                    this.MapInteger.SequenceEqual(input.MapInteger)
+                ) && 
+                (
+                    this.MapBoolean == input.MapBoolean ||
+                    this.MapBoolean != null &&
+                    this.MapBoolean.SequenceEqual(input.MapBoolean)
+                ) && 
+                (
+                    this.MapArrayInteger == input.MapArrayInteger ||
+                    this.MapArrayInteger != null &&
+                    this.MapArrayInteger.SequenceEqual(input.MapArrayInteger)
+                ) && 
+                (
+                    this.MapArrayAnytype == input.MapArrayAnytype ||
+                    this.MapArrayAnytype != null &&
+                    this.MapArrayAnytype.SequenceEqual(input.MapArrayAnytype)
+                ) && 
+                (
+                    this.MapMapString == input.MapMapString ||
+                    this.MapMapString != null &&
+                    this.MapMapString.SequenceEqual(input.MapMapString)
+                ) && 
+                (
+                    this.MapMapAnytype == input.MapMapAnytype ||
+                    this.MapMapAnytype != null &&
+                    this.MapMapAnytype.SequenceEqual(input.MapMapAnytype)
+                ) && 
+                (
+                    this.Anytype1 == input.Anytype1 ||
+                    (this.Anytype1 != null &&
+                    this.Anytype1.Equals(input.Anytype1))
+                ) && 
+                (
+                    this.Anytype2 == input.Anytype2 ||
+                    (this.Anytype2 != null &&
+                    this.Anytype2.Equals(input.Anytype2))
+                ) && 
+                (
+                    this.Anytype3 == input.Anytype3 ||
+                    (this.Anytype3 != null &&
+                    this.Anytype3.Equals(input.Anytype3))
                 );
         }
 
@@ -118,10 +244,28 @@ namespace Org.OpenAPITools.Model
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
-                if (this.MapProperty != null)
+                if (this.MapString != null)
-                    hashCode = hashCode * 59 + this.MapProperty.GetHashCode();
+                    hashCode = hashCode * 59 + this.MapString.GetHashCode();
-                if (this.MapOfMapProperty != null)
+                if (this.MapNumber != null)
-                    hashCode = hashCode * 59 + this.MapOfMapProperty.GetHashCode();
+                    hashCode = hashCode * 59 + this.MapNumber.GetHashCode();
+                if (this.MapInteger != null)
+                    hashCode = hashCode * 59 + this.MapInteger.GetHashCode();
+                if (this.MapBoolean != null)
+                    hashCode = hashCode * 59 + this.MapBoolean.GetHashCode();
+                if (this.MapArrayInteger != null)
+                    hashCode = hashCode * 59 + this.MapArrayInteger.GetHashCode();
+                if (this.MapArrayAnytype != null)
+                    hashCode = hashCode * 59 + this.MapArrayAnytype.GetHashCode();
+                if (this.MapMapString != null)
+                    hashCode = hashCode * 59 + this.MapMapString.GetHashCode();
+                if (this.MapMapAnytype != null)
+                    hashCode = hashCode * 59 + this.MapMapAnytype.GetHashCode();
+                if (this.Anytype1 != null)
+                    hashCode = hashCode * 59 + this.Anytype1.GetHashCode();
+                if (this.Anytype2 != null)
+                    hashCode = hashCode * 59 + this.Anytype2.GetHashCode();
+                if (this.Anytype3 != null)
+                    hashCode = hashCode * 59 + this.Anytype3.GetHashCode();
                 return hashCode;
             }
         }

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs

@@ -0,0 +1,125 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesInteger
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesInteger : Dictionary<String, int?>,  IEquatable<AdditionalPropertiesInteger>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesInteger" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesInteger(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesInteger {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesInteger);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesInteger instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesInteger to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesInteger input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs

@@ -0,0 +1,125 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesNumber
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesNumber : Dictionary<String, decimal?>,  IEquatable<AdditionalPropertiesNumber>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesNumber" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesNumber(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesNumber {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesNumber);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesNumber instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesNumber to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesNumber input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs

@@ -0,0 +1,125 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesObject
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesObject : Dictionary<String, Dictionary<String, Object>>,  IEquatable<AdditionalPropertiesObject>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesObject" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesObject(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesObject {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesObject);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesObject instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesObject to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesObject input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs

@@ -0,0 +1,125 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesString
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesString : Dictionary<String, string>,  IEquatable<AdditionalPropertiesString>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesString" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesString(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesString {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesString);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesString instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesString to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesString input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/README.md

@@ -97,6 +97,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**CreateXmlItem**](docs/FakeApi.md#createxmlitem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**FakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
@@ -136,7 +137,14 @@ Class | Method | HTTP request | Description
 <a name="documentation-for-models"></a>
 ## Documentation for Models
 
+ - [Model.AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [Model.AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [Model.AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [Model.AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [Model.AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [Model.AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [Model.AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [Model.AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Model.Animal](docs/Animal.md)
  - [Model.ApiResponse](docs/ApiResponse.md)
  - [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
@@ -169,7 +177,10 @@ Class | Method | HTTP request | Description
  - [Model.Return](docs/Return.md)
  - [Model.SpecialModelName](docs/SpecialModelName.md)
  - [Model.Tag](docs/Tag.md)
+ - [Model.TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [Model.TypeHolderExample](docs/TypeHolderExample.md)
  - [Model.User](docs/User.md)
+ - [Model.XmlItem](docs/XmlItem.md)
 
 
 <a name="documentation-for-authorization"></a>

samples/client/petstore/csharp/OpenAPIClientNet35/docs/AdditionalPropertiesAnyType.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesAnyType
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet35/docs/AdditionalPropertiesArray.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesArray
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet35/docs/AdditionalPropertiesBoolean.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesBoolean
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet35/docs/AdditionalPropertiesClass.md

@@ -3,8 +3,17 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MapProperty** | **Dictionary<string, string>** |  | [optional] 
+**MapString** | **Dictionary<string, string>** |  | [optional] 
-**MapOfMapProperty** | **Dictionary<string, Dictionary<string, string>>** |  | [optional] 
+**MapNumber** | **Dictionary<string, decimal?>** |  | [optional] 
+**MapInteger** | **Dictionary<string, int?>** |  | [optional] 
+**MapBoolean** | **Dictionary<string, bool?>** |  | [optional] 
+**MapArrayInteger** | **Dictionary<string, List<int?>>** |  | [optional] 
+**MapArrayAnytype** | **Dictionary<string, List<Object>>** |  | [optional] 
+**MapMapString** | **Dictionary<string, Dictionary<string, string>>** |  | [optional] 
+**MapMapAnytype** | **Dictionary<string, Dictionary<string, Object>>** |  | [optional] 
+**Anytype1** | [**Object**](.md) |  | [optional] 
+**Anytype2** | [**Object**](.md) |  | [optional] 
+**Anytype3** | [**Object**](.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/client/petstore/csharp/OpenAPIClientNet35/docs/AdditionalPropertiesInteger.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesInteger
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet35/docs/AdditionalPropertiesNumber.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesNumber
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet35/docs/AdditionalPropertiesObject.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesObject
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet35/docs/AdditionalPropertiesString.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesString
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet35/docs/FakeApi.md

@@ -4,6 +4,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**CreateXmlItem**](FakeApi.md#createxmlitem) | **POST** /fake/create_xml_item | creates an XmlItem
 [**FakeOuterBooleanSerialize**](FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
 [**FakeOuterCompositeSerialize**](FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
 [**FakeOuterNumberSerialize**](FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
@@ -18,6 +19,66 @@ Method | HTTP request | Description
 [**TestJsonFormData**](FakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
 
 
+<a name="createxmlitem"></a>
+# **CreateXmlItem**
+> void CreateXmlItem (XmlItem xmlItem)
+
+creates an XmlItem
+
+this route creates an XmlItem
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class CreateXmlItemExample
+    {
+        public void main()
+        {
+            var apiInstance = new FakeApi();
+            var xmlItem = new XmlItem(); // XmlItem | XmlItem Body
+
+            try
+            {
+                // creates an XmlItem
+                apiInstance.CreateXmlItem(xmlItem);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.CreateXmlItem: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **xmlItem** | [**XmlItem**](XmlItem.md)| XmlItem Body | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="fakeouterbooleanserialize"></a>
 # **FakeOuterBooleanSerialize**
 > bool? FakeOuterBooleanSerialize (bool? body = null)
@@ -161,7 +222,7 @@ namespace Example
         public void main()
         {
             var apiInstance = new FakeApi();
-            var body = 1.2D;  // decimal? | Input number as post body (optional) 
+            var body = 8.14;  // decimal? | Input number as post body (optional) 
 
             try
             {

samples/client/petstore/csharp/OpenAPIClientNet35/docs/TypeHolderDefault.md

@@ -0,0 +1,13 @@
+# Org.OpenAPITools.Model.TypeHolderDefault
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**StringItem** | **string** |  | [default to "what"]
+**NumberItem** | **decimal?** |  | 
+**IntegerItem** | **int?** |  | 
+**BoolItem** | **bool?** |  | [default to true]
+**ArrayItem** | **List<int?>** |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet35/docs/TypeHolderExample.md

@@ -0,0 +1,13 @@
+# Org.OpenAPITools.Model.TypeHolderExample
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**StringItem** | **string** |  | 
+**NumberItem** | **decimal?** |  | 
+**IntegerItem** | **int?** |  | 
+**BoolItem** | **bool?** |  | 
+**ArrayItem** | **List<int?>** |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet35/docs/XmlItem.md

@@ -0,0 +1,37 @@
+# Org.OpenAPITools.Model.XmlItem
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**AttributeString** | **string** |  | [optional] 
+**AttributeNumber** | **decimal?** |  | [optional] 
+**AttributeInteger** | **int?** |  | [optional] 
+**AttributeBoolean** | **bool?** |  | [optional] 
+**WrappedArray** | **List<int?>** |  | [optional] 
+**NameString** | **string** |  | [optional] 
+**NameNumber** | **decimal?** |  | [optional] 
+**NameInteger** | **int?** |  | [optional] 
+**NameBoolean** | **bool?** |  | [optional] 
+**NameArray** | **List<int?>** |  | [optional] 
+**NameWrappedArray** | **List<int?>** |  | [optional] 
+**PrefixString** | **string** |  | [optional] 
+**PrefixNumber** | **decimal?** |  | [optional] 
+**PrefixInteger** | **int?** |  | [optional] 
+**PrefixBoolean** | **bool?** |  | [optional] 
+**PrefixArray** | **List<int?>** |  | [optional] 
+**PrefixWrappedArray** | **List<int?>** |  | [optional] 
+**NamespaceString** | **string** |  | [optional] 
+**NamespaceNumber** | **decimal?** |  | [optional] 
+**NamespaceInteger** | **int?** |  | [optional] 
+**NamespaceBoolean** | **bool?** |  | [optional] 
+**NamespaceArray** | **List<int?>** |  | [optional] 
+**NamespaceWrappedArray** | **List<int?>** |  | [optional] 
+**PrefixNsString** | **string** |  | [optional] 
+**PrefixNsNumber** | **decimal?** |  | [optional] 
+**PrefixNsInteger** | **int?** |  | [optional] 
+**PrefixNsBoolean** | **bool?** |  | [optional] 
+**PrefixNsArray** | **List<int?>** |  | [optional] 
+**PrefixNsWrappedArray** | **List<int?>** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesAnyTypeTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesAnyType
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesAnyTypeTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesAnyType
+        //private AdditionalPropertiesAnyType instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesAnyType
+            //instance = new AdditionalPropertiesAnyType();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesAnyType
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesAnyTypeInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesAnyType
+            //Assert.IsInstanceOfType<AdditionalPropertiesAnyType> (instance, "variable 'instance' is a AdditionalPropertiesAnyType");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesArrayTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesArray
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesArrayTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesArray
+        //private AdditionalPropertiesArray instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesArray
+            //instance = new AdditionalPropertiesArray();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesArray
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesArrayInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesArray
+            //Assert.IsInstanceOfType<AdditionalPropertiesArray> (instance, "variable 'instance' is a AdditionalPropertiesArray");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesBooleanTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesBoolean
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesBooleanTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesBoolean
+        //private AdditionalPropertiesBoolean instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesBoolean
+            //instance = new AdditionalPropertiesBoolean();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesBoolean
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesBooleanInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesBoolean
+            //Assert.IsInstanceOfType<AdditionalPropertiesBoolean> (instance, "variable 'instance' is a AdditionalPropertiesBoolean");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesIntegerTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesInteger
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesIntegerTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesInteger
+        //private AdditionalPropertiesInteger instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesInteger
+            //instance = new AdditionalPropertiesInteger();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesInteger
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesIntegerInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesInteger
+            //Assert.IsInstanceOfType<AdditionalPropertiesInteger> (instance, "variable 'instance' is a AdditionalPropertiesInteger");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesNumberTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesNumber
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesNumberTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesNumber
+        //private AdditionalPropertiesNumber instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesNumber
+            //instance = new AdditionalPropertiesNumber();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesNumber
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesNumberInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesNumber
+            //Assert.IsInstanceOfType<AdditionalPropertiesNumber> (instance, "variable 'instance' is a AdditionalPropertiesNumber");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesObjectTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesObject
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesObjectTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesObject
+        //private AdditionalPropertiesObject instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesObject
+            //instance = new AdditionalPropertiesObject();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesObject
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesObjectInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesObject
+            //Assert.IsInstanceOfType<AdditionalPropertiesObject> (instance, "variable 'instance' is a AdditionalPropertiesObject");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesStringTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesString
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesStringTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesString
+        //private AdditionalPropertiesString instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesString
+            //instance = new AdditionalPropertiesString();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesString
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesStringInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesString
+            //Assert.IsInstanceOfType<AdditionalPropertiesString> (instance, "variable 'instance' is a AdditionalPropertiesString");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/TypeHolderDefaultTests.cs

@@ -0,0 +1,112 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing TypeHolderDefault
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class TypeHolderDefaultTests
+    {
+        // TODO uncomment below to declare an instance variable for TypeHolderDefault
+        //private TypeHolderDefault instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of TypeHolderDefault
+            //instance = new TypeHolderDefault();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of TypeHolderDefault
+        /// </summary>
+        [Test]
+        public void TypeHolderDefaultInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" TypeHolderDefault
+            //Assert.IsInstanceOfType<TypeHolderDefault> (instance, "variable 'instance' is a TypeHolderDefault");
+        }
+
+
+        /// <summary>
+        /// Test the property 'StringItem'
+        /// </summary>
+        [Test]
+        public void StringItemTest()
+        {
+            // TODO unit test for the property 'StringItem'
+        }
+        /// <summary>
+        /// Test the property 'NumberItem'
+        /// </summary>
+        [Test]
+        public void NumberItemTest()
+        {
+            // TODO unit test for the property 'NumberItem'
+        }
+        /// <summary>
+        /// Test the property 'IntegerItem'
+        /// </summary>
+        [Test]
+        public void IntegerItemTest()
+        {
+            // TODO unit test for the property 'IntegerItem'
+        }
+        /// <summary>
+        /// Test the property 'BoolItem'
+        /// </summary>
+        [Test]
+        public void BoolItemTest()
+        {
+            // TODO unit test for the property 'BoolItem'
+        }
+        /// <summary>
+        /// Test the property 'ArrayItem'
+        /// </summary>
+        [Test]
+        public void ArrayItemTest()
+        {
+            // TODO unit test for the property 'ArrayItem'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/TypeHolderExampleTests.cs

@@ -0,0 +1,112 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing TypeHolderExample
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class TypeHolderExampleTests
+    {
+        // TODO uncomment below to declare an instance variable for TypeHolderExample
+        //private TypeHolderExample instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of TypeHolderExample
+            //instance = new TypeHolderExample();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of TypeHolderExample
+        /// </summary>
+        [Test]
+        public void TypeHolderExampleInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" TypeHolderExample
+            //Assert.IsInstanceOfType<TypeHolderExample> (instance, "variable 'instance' is a TypeHolderExample");
+        }
+
+
+        /// <summary>
+        /// Test the property 'StringItem'
+        /// </summary>
+        [Test]
+        public void StringItemTest()
+        {
+            // TODO unit test for the property 'StringItem'
+        }
+        /// <summary>
+        /// Test the property 'NumberItem'
+        /// </summary>
+        [Test]
+        public void NumberItemTest()
+        {
+            // TODO unit test for the property 'NumberItem'
+        }
+        /// <summary>
+        /// Test the property 'IntegerItem'
+        /// </summary>
+        [Test]
+        public void IntegerItemTest()
+        {
+            // TODO unit test for the property 'IntegerItem'
+        }
+        /// <summary>
+        /// Test the property 'BoolItem'
+        /// </summary>
+        [Test]
+        public void BoolItemTest()
+        {
+            // TODO unit test for the property 'BoolItem'
+        }
+        /// <summary>
+        /// Test the property 'ArrayItem'
+        /// </summary>
+        [Test]
+        public void ArrayItemTest()
+        {
+            // TODO unit test for the property 'ArrayItem'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/XmlItemTests.cs

@@ -0,0 +1,304 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing XmlItem
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class XmlItemTests
+    {
+        // TODO uncomment below to declare an instance variable for XmlItem
+        //private XmlItem instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of XmlItem
+            //instance = new XmlItem();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of XmlItem
+        /// </summary>
+        [Test]
+        public void XmlItemInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" XmlItem
+            //Assert.IsInstanceOfType<XmlItem> (instance, "variable 'instance' is a XmlItem");
+        }
+
+
+        /// <summary>
+        /// Test the property 'AttributeString'
+        /// </summary>
+        [Test]
+        public void AttributeStringTest()
+        {
+            // TODO unit test for the property 'AttributeString'
+        }
+        /// <summary>
+        /// Test the property 'AttributeNumber'
+        /// </summary>
+        [Test]
+        public void AttributeNumberTest()
+        {
+            // TODO unit test for the property 'AttributeNumber'
+        }
+        /// <summary>
+        /// Test the property 'AttributeInteger'
+        /// </summary>
+        [Test]
+        public void AttributeIntegerTest()
+        {
+            // TODO unit test for the property 'AttributeInteger'
+        }
+        /// <summary>
+        /// Test the property 'AttributeBoolean'
+        /// </summary>
+        [Test]
+        public void AttributeBooleanTest()
+        {
+            // TODO unit test for the property 'AttributeBoolean'
+        }
+        /// <summary>
+        /// Test the property 'WrappedArray'
+        /// </summary>
+        [Test]
+        public void WrappedArrayTest()
+        {
+            // TODO unit test for the property 'WrappedArray'
+        }
+        /// <summary>
+        /// Test the property 'NameString'
+        /// </summary>
+        [Test]
+        public void NameStringTest()
+        {
+            // TODO unit test for the property 'NameString'
+        }
+        /// <summary>
+        /// Test the property 'NameNumber'
+        /// </summary>
+        [Test]
+        public void NameNumberTest()
+        {
+            // TODO unit test for the property 'NameNumber'
+        }
+        /// <summary>
+        /// Test the property 'NameInteger'
+        /// </summary>
+        [Test]
+        public void NameIntegerTest()
+        {
+            // TODO unit test for the property 'NameInteger'
+        }
+        /// <summary>
+        /// Test the property 'NameBoolean'
+        /// </summary>
+        [Test]
+        public void NameBooleanTest()
+        {
+            // TODO unit test for the property 'NameBoolean'
+        }
+        /// <summary>
+        /// Test the property 'NameArray'
+        /// </summary>
+        [Test]
+        public void NameArrayTest()
+        {
+            // TODO unit test for the property 'NameArray'
+        }
+        /// <summary>
+        /// Test the property 'NameWrappedArray'
+        /// </summary>
+        [Test]
+        public void NameWrappedArrayTest()
+        {
+            // TODO unit test for the property 'NameWrappedArray'
+        }
+        /// <summary>
+        /// Test the property 'PrefixString'
+        /// </summary>
+        [Test]
+        public void PrefixStringTest()
+        {
+            // TODO unit test for the property 'PrefixString'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNumber'
+        /// </summary>
+        [Test]
+        public void PrefixNumberTest()
+        {
+            // TODO unit test for the property 'PrefixNumber'
+        }
+        /// <summary>
+        /// Test the property 'PrefixInteger'
+        /// </summary>
+        [Test]
+        public void PrefixIntegerTest()
+        {
+            // TODO unit test for the property 'PrefixInteger'
+        }
+        /// <summary>
+        /// Test the property 'PrefixBoolean'
+        /// </summary>
+        [Test]
+        public void PrefixBooleanTest()
+        {
+            // TODO unit test for the property 'PrefixBoolean'
+        }
+        /// <summary>
+        /// Test the property 'PrefixArray'
+        /// </summary>
+        [Test]
+        public void PrefixArrayTest()
+        {
+            // TODO unit test for the property 'PrefixArray'
+        }
+        /// <summary>
+        /// Test the property 'PrefixWrappedArray'
+        /// </summary>
+        [Test]
+        public void PrefixWrappedArrayTest()
+        {
+            // TODO unit test for the property 'PrefixWrappedArray'
+        }
+        /// <summary>
+        /// Test the property 'NamespaceString'
+        /// </summary>
+        [Test]
+        public void NamespaceStringTest()
+        {
+            // TODO unit test for the property 'NamespaceString'
+        }
+        /// <summary>
+        /// Test the property 'NamespaceNumber'
+        /// </summary>
+        [Test]
+        public void NamespaceNumberTest()
+        {
+            // TODO unit test for the property 'NamespaceNumber'
+        }
+        /// <summary>
+        /// Test the property 'NamespaceInteger'
+        /// </summary>
+        [Test]
+        public void NamespaceIntegerTest()
+        {
+            // TODO unit test for the property 'NamespaceInteger'
+        }
+        /// <summary>
+        /// Test the property 'NamespaceBoolean'
+        /// </summary>
+        [Test]
+        public void NamespaceBooleanTest()
+        {
+            // TODO unit test for the property 'NamespaceBoolean'
+        }
+        /// <summary>
+        /// Test the property 'NamespaceArray'
+        /// </summary>
+        [Test]
+        public void NamespaceArrayTest()
+        {
+            // TODO unit test for the property 'NamespaceArray'
+        }
+        /// <summary>
+        /// Test the property 'NamespaceWrappedArray'
+        /// </summary>
+        [Test]
+        public void NamespaceWrappedArrayTest()
+        {
+            // TODO unit test for the property 'NamespaceWrappedArray'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNsString'
+        /// </summary>
+        [Test]
+        public void PrefixNsStringTest()
+        {
+            // TODO unit test for the property 'PrefixNsString'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNsNumber'
+        /// </summary>
+        [Test]
+        public void PrefixNsNumberTest()
+        {
+            // TODO unit test for the property 'PrefixNsNumber'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNsInteger'
+        /// </summary>
+        [Test]
+        public void PrefixNsIntegerTest()
+        {
+            // TODO unit test for the property 'PrefixNsInteger'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNsBoolean'
+        /// </summary>
+        [Test]
+        public void PrefixNsBooleanTest()
+        {
+            // TODO unit test for the property 'PrefixNsBoolean'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNsArray'
+        /// </summary>
+        [Test]
+        public void PrefixNsArrayTest()
+        {
+            // TODO unit test for the property 'PrefixNsArray'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNsWrappedArray'
+        /// </summary>
+        [Test]
+        public void PrefixNsWrappedArrayTest()
+        {
+            // TODO unit test for the property 'PrefixNsWrappedArray'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/AnotherFakeApi.cs

@@ -226,7 +226,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<ModelClient>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
         }
 

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeApi.cs

@@ -25,6 +25,27 @@ namespace Org.OpenAPITools.Api
     {
         #region Synchronous Operations
         /// <summary>
+        /// creates an XmlItem
+        /// </summary>
+        /// <remarks>
+        /// this route creates an XmlItem
+        /// </remarks>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="xmlItem">XmlItem Body</param>
+        /// <returns></returns>
+        void CreateXmlItem (XmlItem xmlItem);
+
+        /// <summary>
+        /// creates an XmlItem
+        /// </summary>
+        /// <remarks>
+        /// this route creates an XmlItem
+        /// </remarks>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="xmlItem">XmlItem Body</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> CreateXmlItemWithHttpInfo (XmlItem xmlItem);
+        /// <summary>
         /// 
         /// </summary>
         /// <remarks>
@@ -441,6 +462,83 @@ namespace Org.OpenAPITools.Api
             this.Configuration.AddDefaultHeader(key, value);
         }
 
+        /// <summary>
+        /// creates an XmlItem this route creates an XmlItem
+        /// </summary>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="xmlItem">XmlItem Body</param>
+        /// <returns></returns>
+        public void CreateXmlItem (XmlItem xmlItem)
+        {
+             CreateXmlItemWithHttpInfo(xmlItem);
+        }
+
+        /// <summary>
+        /// creates an XmlItem this route creates an XmlItem
+        /// </summary>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="xmlItem">XmlItem Body</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> CreateXmlItemWithHttpInfo (XmlItem xmlItem)
+        {
+            // verify the required parameter 'xmlItem' is set
+            if (xmlItem == null)
+                throw new ApiException(400, "Missing required parameter 'xmlItem' when calling FakeApi->CreateXmlItem");
+
+            var localVarPath = "/fake/create_xml_item";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/xml", 
+                "application/xml; charset=utf-8", 
+                "application/xml; charset=utf-16", 
+                "text/xml", 
+                "text/xml; charset=utf-8", 
+                "text/xml; charset=utf-16"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (xmlItem != null && xmlItem.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(xmlItem); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = xmlItem; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateXmlItem", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
+                null);
+        }
+
         /// <summary>
         ///  Test serialization of outer boolean types
         /// </summary>
@@ -507,7 +605,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<bool?>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (bool?) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(bool?)));
         }
 
@@ -577,7 +675,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<OuterComposite>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (OuterComposite) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(OuterComposite)));
         }
 
@@ -647,7 +745,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<decimal?>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (decimal?) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(decimal?)));
         }
 
@@ -717,7 +815,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
         }
 
@@ -789,7 +887,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -867,7 +965,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -941,7 +1039,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<ModelClient>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
         }
 
@@ -1060,7 +1158,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -1143,7 +1241,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -1228,7 +1326,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -1300,7 +1398,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -1371,7 +1469,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs

@@ -231,7 +231,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<ModelClient>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
         }
 

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/PetApi.cs

@@ -413,7 +413,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -486,7 +486,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -559,7 +559,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<List<Pet>>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (List<Pet>) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Pet>)));
         }
 
@@ -632,7 +632,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<List<Pet>>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (List<Pet>) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Pet>)));
         }
 
@@ -704,7 +704,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Pet>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (Pet) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Pet)));
         }
 
@@ -783,7 +783,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -860,7 +860,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -939,7 +939,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<ApiResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (ApiResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ApiResponse)));
         }
 
@@ -1021,7 +1021,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<ApiResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (ApiResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ApiResponse)));
         }
 

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/StoreApi.cs

@@ -277,7 +277,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -342,7 +342,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Dictionary<string, int?>>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (Dictionary<string, int?>) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Dictionary<string, int?>)));
         }
 
@@ -409,7 +409,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Order>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (Order) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
         }
 
@@ -483,7 +483,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Order>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (Order) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
         }
 

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/UserApi.cs

@@ -372,7 +372,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -443,7 +443,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -514,7 +514,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -578,7 +578,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -645,7 +645,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<User>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (User) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(User)));
         }
 
@@ -718,7 +718,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
         }
 
@@ -776,7 +776,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -853,7 +853,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs

@@ -0,0 +1,116 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesAnyType
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesAnyType : Dictionary<String, Object>,  IEquatable<AdditionalPropertiesAnyType>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesAnyType" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesAnyType(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesAnyType {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesAnyType);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesAnyType instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesAnyType to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesAnyType input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs

@@ -0,0 +1,116 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesArray
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesArray : Dictionary<String, List>,  IEquatable<AdditionalPropertiesArray>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesArray" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesArray(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesArray {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesArray);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesArray instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesArray to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesArray input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs

@@ -0,0 +1,116 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesBoolean
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesBoolean : Dictionary<String, bool?>,  IEquatable<AdditionalPropertiesBoolean>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesBoolean" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesBoolean(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesBoolean {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesBoolean);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesBoolean instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesBoolean to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesBoolean input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs

@@ -33,25 +33,97 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="AdditionalPropertiesClass" /> class.
         /// </summary>
-        /// <param name="mapProperty">mapProperty.</param>
+        /// <param name="mapString">mapString.</param>
-        /// <param name="mapOfMapProperty">mapOfMapProperty.</param>
+        /// <param name="mapNumber">mapNumber.</param>
-        public AdditionalPropertiesClass(Dictionary<string, string> mapProperty = default(Dictionary<string, string>), Dictionary<string, Dictionary<string, string>> mapOfMapProperty = default(Dictionary<string, Dictionary<string, string>>))
+        /// <param name="mapInteger">mapInteger.</param>
+        /// <param name="mapBoolean">mapBoolean.</param>
+        /// <param name="mapArrayInteger">mapArrayInteger.</param>
+        /// <param name="mapArrayAnytype">mapArrayAnytype.</param>
+        /// <param name="mapMapString">mapMapString.</param>
+        /// <param name="mapMapAnytype">mapMapAnytype.</param>
+        /// <param name="anytype1">anytype1.</param>
+        /// <param name="anytype2">anytype2.</param>
+        /// <param name="anytype3">anytype3.</param>
+        public AdditionalPropertiesClass(Dictionary<string, string> mapString = default(Dictionary<string, string>), Dictionary<string, decimal?> mapNumber = default(Dictionary<string, decimal?>), Dictionary<string, int?> mapInteger = default(Dictionary<string, int?>), Dictionary<string, bool?> mapBoolean = default(Dictionary<string, bool?>), Dictionary<string, List<int?>> mapArrayInteger = default(Dictionary<string, List<int?>>), Dictionary<string, List<Object>> mapArrayAnytype = default(Dictionary<string, List<Object>>), Dictionary<string, Dictionary<string, string>> mapMapString = default(Dictionary<string, Dictionary<string, string>>), Dictionary<string, Dictionary<string, Object>> mapMapAnytype = default(Dictionary<string, Dictionary<string, Object>>), Object anytype1 = default(Object), Object anytype2 = default(Object), Object anytype3 = default(Object))
         {
-            this.MapProperty = mapProperty;
+            this.MapString = mapString;
-            this.MapOfMapProperty = mapOfMapProperty;
+            this.MapNumber = mapNumber;
+            this.MapInteger = mapInteger;
+            this.MapBoolean = mapBoolean;
+            this.MapArrayInteger = mapArrayInteger;
+            this.MapArrayAnytype = mapArrayAnytype;
+            this.MapMapString = mapMapString;
+            this.MapMapAnytype = mapMapAnytype;
+            this.Anytype1 = anytype1;
+            this.Anytype2 = anytype2;
+            this.Anytype3 = anytype3;
         }
         
         /// <summary>
-        /// Gets or Sets MapProperty
+        /// Gets or Sets MapString
         /// </summary>
-        [DataMember(Name="map_property", EmitDefaultValue=false)]
+        [DataMember(Name="map_string", EmitDefaultValue=false)]
-        public Dictionary<string, string> MapProperty { get; set; }
+        public Dictionary<string, string> MapString { get; set; }
 
         /// <summary>
-        /// Gets or Sets MapOfMapProperty
+        /// Gets or Sets MapNumber
         /// </summary>
-        [DataMember(Name="map_of_map_property", EmitDefaultValue=false)]
+        [DataMember(Name="map_number", EmitDefaultValue=false)]
-        public Dictionary<string, Dictionary<string, string>> MapOfMapProperty { get; set; }
+        public Dictionary<string, decimal?> MapNumber { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapInteger
+        /// </summary>
+        [DataMember(Name="map_integer", EmitDefaultValue=false)]
+        public Dictionary<string, int?> MapInteger { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapBoolean
+        /// </summary>
+        [DataMember(Name="map_boolean", EmitDefaultValue=false)]
+        public Dictionary<string, bool?> MapBoolean { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapArrayInteger
+        /// </summary>
+        [DataMember(Name="map_array_integer", EmitDefaultValue=false)]
+        public Dictionary<string, List<int?>> MapArrayInteger { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapArrayAnytype
+        /// </summary>
+        [DataMember(Name="map_array_anytype", EmitDefaultValue=false)]
+        public Dictionary<string, List<Object>> MapArrayAnytype { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapMapString
+        /// </summary>
+        [DataMember(Name="map_map_string", EmitDefaultValue=false)]
+        public Dictionary<string, Dictionary<string, string>> MapMapString { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapMapAnytype
+        /// </summary>
+        [DataMember(Name="map_map_anytype", EmitDefaultValue=false)]
+        public Dictionary<string, Dictionary<string, Object>> MapMapAnytype { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Anytype1
+        /// </summary>
+        [DataMember(Name="anytype_1", EmitDefaultValue=false)]
+        public Object Anytype1 { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Anytype2
+        /// </summary>
+        [DataMember(Name="anytype_2", EmitDefaultValue=false)]
+        public Object Anytype2 { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Anytype3
+        /// </summary>
+        [DataMember(Name="anytype_3", EmitDefaultValue=false)]
+        public Object Anytype3 { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -61,8 +133,17 @@ namespace Org.OpenAPITools.Model
         {
             var sb = new StringBuilder();
             sb.Append("class AdditionalPropertiesClass {\n");
-            sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
+            sb.Append("  MapString: ").Append(MapString).Append("\n");
-            sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
+            sb.Append("  MapNumber: ").Append(MapNumber).Append("\n");
+            sb.Append("  MapInteger: ").Append(MapInteger).Append("\n");
+            sb.Append("  MapBoolean: ").Append(MapBoolean).Append("\n");
+            sb.Append("  MapArrayInteger: ").Append(MapArrayInteger).Append("\n");
+            sb.Append("  MapArrayAnytype: ").Append(MapArrayAnytype).Append("\n");
+            sb.Append("  MapMapString: ").Append(MapMapString).Append("\n");
+            sb.Append("  MapMapAnytype: ").Append(MapMapAnytype).Append("\n");
+            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
+            sb.Append("  Anytype2: ").Append(Anytype2).Append("\n");
+            sb.Append("  Anytype3: ").Append(Anytype3).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -98,14 +179,59 @@ namespace Org.OpenAPITools.Model
 
             return 
                 (
-                    this.MapProperty == input.MapProperty ||
+                    this.MapString == input.MapString ||
-                    this.MapProperty != null &&
+                    this.MapString != null &&
-                    this.MapProperty.SequenceEqual(input.MapProperty)
+                    this.MapString.SequenceEqual(input.MapString)
                 ) && 
                 (
-                    this.MapOfMapProperty == input.MapOfMapProperty ||
+                    this.MapNumber == input.MapNumber ||
-                    this.MapOfMapProperty != null &&
+                    this.MapNumber != null &&
-                    this.MapOfMapProperty.SequenceEqual(input.MapOfMapProperty)
+                    this.MapNumber.SequenceEqual(input.MapNumber)
+                ) && 
+                (
+                    this.MapInteger == input.MapInteger ||
+                    this.MapInteger != null &&
+                    this.MapInteger.SequenceEqual(input.MapInteger)
+                ) && 
+                (
+                    this.MapBoolean == input.MapBoolean ||
+                    this.MapBoolean != null &&
+                    this.MapBoolean.SequenceEqual(input.MapBoolean)
+                ) && 
+                (
+                    this.MapArrayInteger == input.MapArrayInteger ||
+                    this.MapArrayInteger != null &&
+                    this.MapArrayInteger.SequenceEqual(input.MapArrayInteger)
+                ) && 
+                (
+                    this.MapArrayAnytype == input.MapArrayAnytype ||
+                    this.MapArrayAnytype != null &&
+                    this.MapArrayAnytype.SequenceEqual(input.MapArrayAnytype)
+                ) && 
+                (
+                    this.MapMapString == input.MapMapString ||
+                    this.MapMapString != null &&
+                    this.MapMapString.SequenceEqual(input.MapMapString)
+                ) && 
+                (
+                    this.MapMapAnytype == input.MapMapAnytype ||
+                    this.MapMapAnytype != null &&
+                    this.MapMapAnytype.SequenceEqual(input.MapMapAnytype)
+                ) && 
+                (
+                    this.Anytype1 == input.Anytype1 ||
+                    (this.Anytype1 != null &&
+                    this.Anytype1.Equals(input.Anytype1))
+                ) && 
+                (
+                    this.Anytype2 == input.Anytype2 ||
+                    (this.Anytype2 != null &&
+                    this.Anytype2.Equals(input.Anytype2))
+                ) && 
+                (
+                    this.Anytype3 == input.Anytype3 ||
+                    (this.Anytype3 != null &&
+                    this.Anytype3.Equals(input.Anytype3))
                 );
         }
 
@@ -118,10 +244,28 @@ namespace Org.OpenAPITools.Model
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
-                if (this.MapProperty != null)
+                if (this.MapString != null)
-                    hashCode = hashCode * 59 + this.MapProperty.GetHashCode();
+                    hashCode = hashCode * 59 + this.MapString.GetHashCode();
-                if (this.MapOfMapProperty != null)
+                if (this.MapNumber != null)
-                    hashCode = hashCode * 59 + this.MapOfMapProperty.GetHashCode();
+                    hashCode = hashCode * 59 + this.MapNumber.GetHashCode();
+                if (this.MapInteger != null)
+                    hashCode = hashCode * 59 + this.MapInteger.GetHashCode();
+                if (this.MapBoolean != null)
+                    hashCode = hashCode * 59 + this.MapBoolean.GetHashCode();
+                if (this.MapArrayInteger != null)
+                    hashCode = hashCode * 59 + this.MapArrayInteger.GetHashCode();
+                if (this.MapArrayAnytype != null)
+                    hashCode = hashCode * 59 + this.MapArrayAnytype.GetHashCode();
+                if (this.MapMapString != null)
+                    hashCode = hashCode * 59 + this.MapMapString.GetHashCode();
+                if (this.MapMapAnytype != null)
+                    hashCode = hashCode * 59 + this.MapMapAnytype.GetHashCode();
+                if (this.Anytype1 != null)
+                    hashCode = hashCode * 59 + this.Anytype1.GetHashCode();
+                if (this.Anytype2 != null)
+                    hashCode = hashCode * 59 + this.Anytype2.GetHashCode();
+                if (this.Anytype3 != null)
+                    hashCode = hashCode * 59 + this.Anytype3.GetHashCode();
                 return hashCode;
             }
         }

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs

@@ -0,0 +1,116 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesInteger
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesInteger : Dictionary<String, int?>,  IEquatable<AdditionalPropertiesInteger>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesInteger" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesInteger(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesInteger {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesInteger);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesInteger instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesInteger to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesInteger input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs

@@ -0,0 +1,116 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesNumber
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesNumber : Dictionary<String, decimal?>,  IEquatable<AdditionalPropertiesNumber>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesNumber" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesNumber(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesNumber {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesNumber);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesNumber instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesNumber to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesNumber input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs

@@ -0,0 +1,116 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesObject
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesObject : Dictionary<String, Dictionary<String, Object>>,  IEquatable<AdditionalPropertiesObject>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesObject" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesObject(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesObject {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesObject);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesObject instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesObject to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesObject input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs

@@ -0,0 +1,116 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesString
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesString : Dictionary<String, string>,  IEquatable<AdditionalPropertiesString>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesString" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesString(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesString {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesString);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesString instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesString to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesString input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/TypeHolderDefault.cs

@@ -0,0 +1,224 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// TypeHolderDefault
+    /// </summary>
+    [DataContract]
+    public partial class TypeHolderDefault :  IEquatable<TypeHolderDefault>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TypeHolderDefault" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected TypeHolderDefault() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TypeHolderDefault" /> class.
+        /// </summary>
+        /// <param name="stringItem">stringItem (required) (default to &quot;what&quot;).</param>
+        /// <param name="numberItem">numberItem (required).</param>
+        /// <param name="integerItem">integerItem (required).</param>
+        /// <param name="boolItem">boolItem (required) (default to true).</param>
+        /// <param name="arrayItem">arrayItem (required).</param>
+        public TypeHolderDefault(string stringItem = "what", decimal? numberItem = default(decimal?), int? integerItem = default(int?), bool? boolItem = true, List<int?> arrayItem = default(List<int?>))
+        {
+            // to ensure "stringItem" is required (not null)
+            if (stringItem == null)
+            {
+                throw new InvalidDataException("stringItem is a required property for TypeHolderDefault and cannot be null");
+            }
+            else
+            {
+                this.StringItem = stringItem;
+            }
+            // to ensure "numberItem" is required (not null)
+            if (numberItem == null)
+            {
+                throw new InvalidDataException("numberItem is a required property for TypeHolderDefault and cannot be null");
+            }
+            else
+            {
+                this.NumberItem = numberItem;
+            }
+            // to ensure "integerItem" is required (not null)
+            if (integerItem == null)
+            {
+                throw new InvalidDataException("integerItem is a required property for TypeHolderDefault and cannot be null");
+            }
+            else
+            {
+                this.IntegerItem = integerItem;
+            }
+            // to ensure "boolItem" is required (not null)
+            if (boolItem == null)
+            {
+                throw new InvalidDataException("boolItem is a required property for TypeHolderDefault and cannot be null");
+            }
+            else
+            {
+                this.BoolItem = boolItem;
+            }
+            // to ensure "arrayItem" is required (not null)
+            if (arrayItem == null)
+            {
+                throw new InvalidDataException("arrayItem is a required property for TypeHolderDefault and cannot be null");
+            }
+            else
+            {
+                this.ArrayItem = arrayItem;
+            }
+        }
+        
+        /// <summary>
+        /// Gets or Sets StringItem
+        /// </summary>
+        [DataMember(Name="string_item", EmitDefaultValue=false)]
+        public string StringItem { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NumberItem
+        /// </summary>
+        [DataMember(Name="number_item", EmitDefaultValue=false)]
+        public decimal? NumberItem { get; set; }
+
+        /// <summary>
+        /// Gets or Sets IntegerItem
+        /// </summary>
+        [DataMember(Name="integer_item", EmitDefaultValue=false)]
+        public int? IntegerItem { get; set; }
+
+        /// <summary>
+        /// Gets or Sets BoolItem
+        /// </summary>
+        [DataMember(Name="bool_item", EmitDefaultValue=false)]
+        public bool? BoolItem { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ArrayItem
+        /// </summary>
+        [DataMember(Name="array_item", EmitDefaultValue=false)]
+        public List<int?> ArrayItem { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class TypeHolderDefault {\n");
+            sb.Append("  StringItem: ").Append(StringItem).Append("\n");
+            sb.Append("  NumberItem: ").Append(NumberItem).Append("\n");
+            sb.Append("  IntegerItem: ").Append(IntegerItem).Append("\n");
+            sb.Append("  BoolItem: ").Append(BoolItem).Append("\n");
+            sb.Append("  ArrayItem: ").Append(ArrayItem).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as TypeHolderDefault);
+        }
+
+        /// <summary>
+        /// Returns true if TypeHolderDefault instances are equal
+        /// </summary>
+        /// <param name="input">Instance of TypeHolderDefault to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(TypeHolderDefault input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.StringItem == input.StringItem ||
+                    (this.StringItem != null &&
+                    this.StringItem.Equals(input.StringItem))
+                ) && 
+                (
+                    this.NumberItem == input.NumberItem ||
+                    (this.NumberItem != null &&
+                    this.NumberItem.Equals(input.NumberItem))
+                ) && 
+                (
+                    this.IntegerItem == input.IntegerItem ||
+                    (this.IntegerItem != null &&
+                    this.IntegerItem.Equals(input.IntegerItem))
+                ) && 
+                (
+                    this.BoolItem == input.BoolItem ||
+                    (this.BoolItem != null &&
+                    this.BoolItem.Equals(input.BoolItem))
+                ) && 
+                (
+                    this.ArrayItem == input.ArrayItem ||
+                    this.ArrayItem != null &&
+                    this.ArrayItem.SequenceEqual(input.ArrayItem)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.StringItem != null)
+                    hashCode = hashCode * 59 + this.StringItem.GetHashCode();
+                if (this.NumberItem != null)
+                    hashCode = hashCode * 59 + this.NumberItem.GetHashCode();
+                if (this.IntegerItem != null)
+                    hashCode = hashCode * 59 + this.IntegerItem.GetHashCode();
+                if (this.BoolItem != null)
+                    hashCode = hashCode * 59 + this.BoolItem.GetHashCode();
+                if (this.ArrayItem != null)
+                    hashCode = hashCode * 59 + this.ArrayItem.GetHashCode();
+                return hashCode;
+            }
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/TypeHolderExample.cs

@@ -0,0 +1,224 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// TypeHolderExample
+    /// </summary>
+    [DataContract]
+    public partial class TypeHolderExample :  IEquatable<TypeHolderExample>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TypeHolderExample" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected TypeHolderExample() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TypeHolderExample" /> class.
+        /// </summary>
+        /// <param name="stringItem">stringItem (required).</param>
+        /// <param name="numberItem">numberItem (required).</param>
+        /// <param name="integerItem">integerItem (required).</param>
+        /// <param name="boolItem">boolItem (required).</param>
+        /// <param name="arrayItem">arrayItem (required).</param>
+        public TypeHolderExample(string stringItem = default(string), decimal? numberItem = default(decimal?), int? integerItem = default(int?), bool? boolItem = default(bool?), List<int?> arrayItem = default(List<int?>))
+        {
+            // to ensure "stringItem" is required (not null)
+            if (stringItem == null)
+            {
+                throw new InvalidDataException("stringItem is a required property for TypeHolderExample and cannot be null");
+            }
+            else
+            {
+                this.StringItem = stringItem;
+            }
+            // to ensure "numberItem" is required (not null)
+            if (numberItem == null)
+            {
+                throw new InvalidDataException("numberItem is a required property for TypeHolderExample and cannot be null");
+            }
+            else
+            {
+                this.NumberItem = numberItem;
+            }
+            // to ensure "integerItem" is required (not null)
+            if (integerItem == null)
+            {
+                throw new InvalidDataException("integerItem is a required property for TypeHolderExample and cannot be null");
+            }
+            else
+            {
+                this.IntegerItem = integerItem;
+            }
+            // to ensure "boolItem" is required (not null)
+            if (boolItem == null)
+            {
+                throw new InvalidDataException("boolItem is a required property for TypeHolderExample and cannot be null");
+            }
+            else
+            {
+                this.BoolItem = boolItem;
+            }
+            // to ensure "arrayItem" is required (not null)
+            if (arrayItem == null)
+            {
+                throw new InvalidDataException("arrayItem is a required property for TypeHolderExample and cannot be null");
+            }
+            else
+            {
+                this.ArrayItem = arrayItem;
+            }
+        }
+        
+        /// <summary>
+        /// Gets or Sets StringItem
+        /// </summary>
+        [DataMember(Name="string_item", EmitDefaultValue=false)]
+        public string StringItem { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NumberItem
+        /// </summary>
+        [DataMember(Name="number_item", EmitDefaultValue=false)]
+        public decimal? NumberItem { get; set; }
+
+        /// <summary>
+        /// Gets or Sets IntegerItem
+        /// </summary>
+        [DataMember(Name="integer_item", EmitDefaultValue=false)]
+        public int? IntegerItem { get; set; }
+
+        /// <summary>
+        /// Gets or Sets BoolItem
+        /// </summary>
+        [DataMember(Name="bool_item", EmitDefaultValue=false)]
+        public bool? BoolItem { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ArrayItem
+        /// </summary>
+        [DataMember(Name="array_item", EmitDefaultValue=false)]
+        public List<int?> ArrayItem { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class TypeHolderExample {\n");
+            sb.Append("  StringItem: ").Append(StringItem).Append("\n");
+            sb.Append("  NumberItem: ").Append(NumberItem).Append("\n");
+            sb.Append("  IntegerItem: ").Append(IntegerItem).Append("\n");
+            sb.Append("  BoolItem: ").Append(BoolItem).Append("\n");
+            sb.Append("  ArrayItem: ").Append(ArrayItem).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as TypeHolderExample);
+        }
+
+        /// <summary>
+        /// Returns true if TypeHolderExample instances are equal
+        /// </summary>
+        /// <param name="input">Instance of TypeHolderExample to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(TypeHolderExample input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.StringItem == input.StringItem ||
+                    (this.StringItem != null &&
+                    this.StringItem.Equals(input.StringItem))
+                ) && 
+                (
+                    this.NumberItem == input.NumberItem ||
+                    (this.NumberItem != null &&
+                    this.NumberItem.Equals(input.NumberItem))
+                ) && 
+                (
+                    this.IntegerItem == input.IntegerItem ||
+                    (this.IntegerItem != null &&
+                    this.IntegerItem.Equals(input.IntegerItem))
+                ) && 
+                (
+                    this.BoolItem == input.BoolItem ||
+                    (this.BoolItem != null &&
+                    this.BoolItem.Equals(input.BoolItem))
+                ) && 
+                (
+                    this.ArrayItem == input.ArrayItem ||
+                    this.ArrayItem != null &&
+                    this.ArrayItem.SequenceEqual(input.ArrayItem)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.StringItem != null)
+                    hashCode = hashCode * 59 + this.StringItem.GetHashCode();
+                if (this.NumberItem != null)
+                    hashCode = hashCode * 59 + this.NumberItem.GetHashCode();
+                if (this.IntegerItem != null)
+                    hashCode = hashCode * 59 + this.IntegerItem.GetHashCode();
+                if (this.BoolItem != null)
+                    hashCode = hashCode * 59 + this.BoolItem.GetHashCode();
+                if (this.ArrayItem != null)
+                    hashCode = hashCode * 59 + this.ArrayItem.GetHashCode();
+                return hashCode;
+            }
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/XmlItem.cs

@@ -0,0 +1,563 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// XmlItem
+    /// </summary>
+    [DataContract]
+    public partial class XmlItem :  IEquatable<XmlItem>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XmlItem" /> class.
+        /// </summary>
+        /// <param name="attributeString">attributeString.</param>
+        /// <param name="attributeNumber">attributeNumber.</param>
+        /// <param name="attributeInteger">attributeInteger.</param>
+        /// <param name="attributeBoolean">attributeBoolean.</param>
+        /// <param name="wrappedArray">wrappedArray.</param>
+        /// <param name="nameString">nameString.</param>
+        /// <param name="nameNumber">nameNumber.</param>
+        /// <param name="nameInteger">nameInteger.</param>
+        /// <param name="nameBoolean">nameBoolean.</param>
+        /// <param name="nameArray">nameArray.</param>
+        /// <param name="nameWrappedArray">nameWrappedArray.</param>
+        /// <param name="prefixString">prefixString.</param>
+        /// <param name="prefixNumber">prefixNumber.</param>
+        /// <param name="prefixInteger">prefixInteger.</param>
+        /// <param name="prefixBoolean">prefixBoolean.</param>
+        /// <param name="prefixArray">prefixArray.</param>
+        /// <param name="prefixWrappedArray">prefixWrappedArray.</param>
+        /// <param name="namespaceString">namespaceString.</param>
+        /// <param name="namespaceNumber">namespaceNumber.</param>
+        /// <param name="namespaceInteger">namespaceInteger.</param>
+        /// <param name="namespaceBoolean">namespaceBoolean.</param>
+        /// <param name="namespaceArray">namespaceArray.</param>
+        /// <param name="namespaceWrappedArray">namespaceWrappedArray.</param>
+        /// <param name="prefixNsString">prefixNsString.</param>
+        /// <param name="prefixNsNumber">prefixNsNumber.</param>
+        /// <param name="prefixNsInteger">prefixNsInteger.</param>
+        /// <param name="prefixNsBoolean">prefixNsBoolean.</param>
+        /// <param name="prefixNsArray">prefixNsArray.</param>
+        /// <param name="prefixNsWrappedArray">prefixNsWrappedArray.</param>
+        public XmlItem(string attributeString = default(string), decimal? attributeNumber = default(decimal?), int? attributeInteger = default(int?), bool? attributeBoolean = default(bool?), List<int?> wrappedArray = default(List<int?>), string nameString = default(string), decimal? nameNumber = default(decimal?), int? nameInteger = default(int?), bool? nameBoolean = default(bool?), List<int?> nameArray = default(List<int?>), List<int?> nameWrappedArray = default(List<int?>), string prefixString = default(string), decimal? prefixNumber = default(decimal?), int? prefixInteger = default(int?), bool? prefixBoolean = default(bool?), List<int?> prefixArray = default(List<int?>), List<int?> prefixWrappedArray = default(List<int?>), string namespaceString = default(string), decimal? namespaceNumber = default(decimal?), int? namespaceInteger = default(int?), bool? namespaceBoolean = default(bool?), List<int?> namespaceArray = default(List<int?>), List<int?> namespaceWrappedArray = default(List<int?>), string prefixNsString = default(string), decimal? prefixNsNumber = default(decimal?), int? prefixNsInteger = default(int?), bool? prefixNsBoolean = default(bool?), List<int?> prefixNsArray = default(List<int?>), List<int?> prefixNsWrappedArray = default(List<int?>))
+        {
+            this.AttributeString = attributeString;
+            this.AttributeNumber = attributeNumber;
+            this.AttributeInteger = attributeInteger;
+            this.AttributeBoolean = attributeBoolean;
+            this.WrappedArray = wrappedArray;
+            this.NameString = nameString;
+            this.NameNumber = nameNumber;
+            this.NameInteger = nameInteger;
+            this.NameBoolean = nameBoolean;
+            this.NameArray = nameArray;
+            this.NameWrappedArray = nameWrappedArray;
+            this.PrefixString = prefixString;
+            this.PrefixNumber = prefixNumber;
+            this.PrefixInteger = prefixInteger;
+            this.PrefixBoolean = prefixBoolean;
+            this.PrefixArray = prefixArray;
+            this.PrefixWrappedArray = prefixWrappedArray;
+            this.NamespaceString = namespaceString;
+            this.NamespaceNumber = namespaceNumber;
+            this.NamespaceInteger = namespaceInteger;
+            this.NamespaceBoolean = namespaceBoolean;
+            this.NamespaceArray = namespaceArray;
+            this.NamespaceWrappedArray = namespaceWrappedArray;
+            this.PrefixNsString = prefixNsString;
+            this.PrefixNsNumber = prefixNsNumber;
+            this.PrefixNsInteger = prefixNsInteger;
+            this.PrefixNsBoolean = prefixNsBoolean;
+            this.PrefixNsArray = prefixNsArray;
+            this.PrefixNsWrappedArray = prefixNsWrappedArray;
+        }
+        
+        /// <summary>
+        /// Gets or Sets AttributeString
+        /// </summary>
+        [DataMember(Name="attribute_string", EmitDefaultValue=false)]
+        public string AttributeString { get; set; }
+
+        /// <summary>
+        /// Gets or Sets AttributeNumber
+        /// </summary>
+        [DataMember(Name="attribute_number", EmitDefaultValue=false)]
+        public decimal? AttributeNumber { get; set; }
+
+        /// <summary>
+        /// Gets or Sets AttributeInteger
+        /// </summary>
+        [DataMember(Name="attribute_integer", EmitDefaultValue=false)]
+        public int? AttributeInteger { get; set; }
+
+        /// <summary>
+        /// Gets or Sets AttributeBoolean
+        /// </summary>
+        [DataMember(Name="attribute_boolean", EmitDefaultValue=false)]
+        public bool? AttributeBoolean { get; set; }
+
+        /// <summary>
+        /// Gets or Sets WrappedArray
+        /// </summary>
+        [DataMember(Name="wrapped_array", EmitDefaultValue=false)]
+        public List<int?> WrappedArray { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NameString
+        /// </summary>
+        [DataMember(Name="name_string", EmitDefaultValue=false)]
+        public string NameString { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NameNumber
+        /// </summary>
+        [DataMember(Name="name_number", EmitDefaultValue=false)]
+        public decimal? NameNumber { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NameInteger
+        /// </summary>
+        [DataMember(Name="name_integer", EmitDefaultValue=false)]
+        public int? NameInteger { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NameBoolean
+        /// </summary>
+        [DataMember(Name="name_boolean", EmitDefaultValue=false)]
+        public bool? NameBoolean { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NameArray
+        /// </summary>
+        [DataMember(Name="name_array", EmitDefaultValue=false)]
+        public List<int?> NameArray { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NameWrappedArray
+        /// </summary>
+        [DataMember(Name="name_wrapped_array", EmitDefaultValue=false)]
+        public List<int?> NameWrappedArray { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PrefixString
+        /// </summary>
+        [DataMember(Name="prefix_string", EmitDefaultValue=false)]
+        public string PrefixString { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PrefixNumber
+        /// </summary>
+        [DataMember(Name="prefix_number", EmitDefaultValue=false)]
+        public decimal? PrefixNumber { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PrefixInteger
+        /// </summary>
+        [DataMember(Name="prefix_integer", EmitDefaultValue=false)]
+        public int? PrefixInteger { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PrefixBoolean
+        /// </summary>
+        [DataMember(Name="prefix_boolean", EmitDefaultValue=false)]
+        public bool? PrefixBoolean { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PrefixArray
+        /// </summary>
+        [DataMember(Name="prefix_array", EmitDefaultValue=false)]
+        public List<int?> PrefixArray { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PrefixWrappedArray
+        /// </summary>
+        [DataMember(Name="prefix_wrapped_array", EmitDefaultValue=false)]
+        public List<int?> PrefixWrappedArray { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NamespaceString
+        /// </summary>
+        [DataMember(Name="namespace_string", EmitDefaultValue=false)]
+        public string NamespaceString { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NamespaceNumber
+        /// </summary>
+        [DataMember(Name="namespace_number", EmitDefaultValue=false)]
+        public decimal? NamespaceNumber { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NamespaceInteger
+        /// </summary>
+        [DataMember(Name="namespace_integer", EmitDefaultValue=false)]
+        public int? NamespaceInteger { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NamespaceBoolean
+        /// </summary>
+        [DataMember(Name="namespace_boolean", EmitDefaultValue=false)]
+        public bool? NamespaceBoolean { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NamespaceArray
+        /// </summary>
+        [DataMember(Name="namespace_array", EmitDefaultValue=false)]
+        public List<int?> NamespaceArray { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NamespaceWrappedArray
+        /// </summary>
+        [DataMember(Name="namespace_wrapped_array", EmitDefaultValue=false)]
+        public List<int?> NamespaceWrappedArray { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PrefixNsString
+        /// </summary>
+        [DataMember(Name="prefix_ns_string", EmitDefaultValue=false)]
+        public string PrefixNsString { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PrefixNsNumber
+        /// </summary>
+        [DataMember(Name="prefix_ns_number", EmitDefaultValue=false)]
+        public decimal? PrefixNsNumber { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PrefixNsInteger
+        /// </summary>
+        [DataMember(Name="prefix_ns_integer", EmitDefaultValue=false)]
+        public int? PrefixNsInteger { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PrefixNsBoolean
+        /// </summary>
+        [DataMember(Name="prefix_ns_boolean", EmitDefaultValue=false)]
+        public bool? PrefixNsBoolean { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PrefixNsArray
+        /// </summary>
+        [DataMember(Name="prefix_ns_array", EmitDefaultValue=false)]
+        public List<int?> PrefixNsArray { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PrefixNsWrappedArray
+        /// </summary>
+        [DataMember(Name="prefix_ns_wrapped_array", EmitDefaultValue=false)]
+        public List<int?> PrefixNsWrappedArray { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class XmlItem {\n");
+            sb.Append("  AttributeString: ").Append(AttributeString).Append("\n");
+            sb.Append("  AttributeNumber: ").Append(AttributeNumber).Append("\n");
+            sb.Append("  AttributeInteger: ").Append(AttributeInteger).Append("\n");
+            sb.Append("  AttributeBoolean: ").Append(AttributeBoolean).Append("\n");
+            sb.Append("  WrappedArray: ").Append(WrappedArray).Append("\n");
+            sb.Append("  NameString: ").Append(NameString).Append("\n");
+            sb.Append("  NameNumber: ").Append(NameNumber).Append("\n");
+            sb.Append("  NameInteger: ").Append(NameInteger).Append("\n");
+            sb.Append("  NameBoolean: ").Append(NameBoolean).Append("\n");
+            sb.Append("  NameArray: ").Append(NameArray).Append("\n");
+            sb.Append("  NameWrappedArray: ").Append(NameWrappedArray).Append("\n");
+            sb.Append("  PrefixString: ").Append(PrefixString).Append("\n");
+            sb.Append("  PrefixNumber: ").Append(PrefixNumber).Append("\n");
+            sb.Append("  PrefixInteger: ").Append(PrefixInteger).Append("\n");
+            sb.Append("  PrefixBoolean: ").Append(PrefixBoolean).Append("\n");
+            sb.Append("  PrefixArray: ").Append(PrefixArray).Append("\n");
+            sb.Append("  PrefixWrappedArray: ").Append(PrefixWrappedArray).Append("\n");
+            sb.Append("  NamespaceString: ").Append(NamespaceString).Append("\n");
+            sb.Append("  NamespaceNumber: ").Append(NamespaceNumber).Append("\n");
+            sb.Append("  NamespaceInteger: ").Append(NamespaceInteger).Append("\n");
+            sb.Append("  NamespaceBoolean: ").Append(NamespaceBoolean).Append("\n");
+            sb.Append("  NamespaceArray: ").Append(NamespaceArray).Append("\n");
+            sb.Append("  NamespaceWrappedArray: ").Append(NamespaceWrappedArray).Append("\n");
+            sb.Append("  PrefixNsString: ").Append(PrefixNsString).Append("\n");
+            sb.Append("  PrefixNsNumber: ").Append(PrefixNsNumber).Append("\n");
+            sb.Append("  PrefixNsInteger: ").Append(PrefixNsInteger).Append("\n");
+            sb.Append("  PrefixNsBoolean: ").Append(PrefixNsBoolean).Append("\n");
+            sb.Append("  PrefixNsArray: ").Append(PrefixNsArray).Append("\n");
+            sb.Append("  PrefixNsWrappedArray: ").Append(PrefixNsWrappedArray).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as XmlItem);
+        }
+
+        /// <summary>
+        /// Returns true if XmlItem instances are equal
+        /// </summary>
+        /// <param name="input">Instance of XmlItem to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(XmlItem input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.AttributeString == input.AttributeString ||
+                    (this.AttributeString != null &&
+                    this.AttributeString.Equals(input.AttributeString))
+                ) && 
+                (
+                    this.AttributeNumber == input.AttributeNumber ||
+                    (this.AttributeNumber != null &&
+                    this.AttributeNumber.Equals(input.AttributeNumber))
+                ) && 
+                (
+                    this.AttributeInteger == input.AttributeInteger ||
+                    (this.AttributeInteger != null &&
+                    this.AttributeInteger.Equals(input.AttributeInteger))
+                ) && 
+                (
+                    this.AttributeBoolean == input.AttributeBoolean ||
+                    (this.AttributeBoolean != null &&
+                    this.AttributeBoolean.Equals(input.AttributeBoolean))
+                ) && 
+                (
+                    this.WrappedArray == input.WrappedArray ||
+                    this.WrappedArray != null &&
+                    this.WrappedArray.SequenceEqual(input.WrappedArray)
+                ) && 
+                (
+                    this.NameString == input.NameString ||
+                    (this.NameString != null &&
+                    this.NameString.Equals(input.NameString))
+                ) && 
+                (
+                    this.NameNumber == input.NameNumber ||
+                    (this.NameNumber != null &&
+                    this.NameNumber.Equals(input.NameNumber))
+                ) && 
+                (
+                    this.NameInteger == input.NameInteger ||
+                    (this.NameInteger != null &&
+                    this.NameInteger.Equals(input.NameInteger))
+                ) && 
+                (
+                    this.NameBoolean == input.NameBoolean ||
+                    (this.NameBoolean != null &&
+                    this.NameBoolean.Equals(input.NameBoolean))
+                ) && 
+                (
+                    this.NameArray == input.NameArray ||
+                    this.NameArray != null &&
+                    this.NameArray.SequenceEqual(input.NameArray)
+                ) && 
+                (
+                    this.NameWrappedArray == input.NameWrappedArray ||
+                    this.NameWrappedArray != null &&
+                    this.NameWrappedArray.SequenceEqual(input.NameWrappedArray)
+                ) && 
+                (
+                    this.PrefixString == input.PrefixString ||
+                    (this.PrefixString != null &&
+                    this.PrefixString.Equals(input.PrefixString))
+                ) && 
+                (
+                    this.PrefixNumber == input.PrefixNumber ||
+                    (this.PrefixNumber != null &&
+                    this.PrefixNumber.Equals(input.PrefixNumber))
+                ) && 
+                (
+                    this.PrefixInteger == input.PrefixInteger ||
+                    (this.PrefixInteger != null &&
+                    this.PrefixInteger.Equals(input.PrefixInteger))
+                ) && 
+                (
+                    this.PrefixBoolean == input.PrefixBoolean ||
+                    (this.PrefixBoolean != null &&
+                    this.PrefixBoolean.Equals(input.PrefixBoolean))
+                ) && 
+                (
+                    this.PrefixArray == input.PrefixArray ||
+                    this.PrefixArray != null &&
+                    this.PrefixArray.SequenceEqual(input.PrefixArray)
+                ) && 
+                (
+                    this.PrefixWrappedArray == input.PrefixWrappedArray ||
+                    this.PrefixWrappedArray != null &&
+                    this.PrefixWrappedArray.SequenceEqual(input.PrefixWrappedArray)
+                ) && 
+                (
+                    this.NamespaceString == input.NamespaceString ||
+                    (this.NamespaceString != null &&
+                    this.NamespaceString.Equals(input.NamespaceString))
+                ) && 
+                (
+                    this.NamespaceNumber == input.NamespaceNumber ||
+                    (this.NamespaceNumber != null &&
+                    this.NamespaceNumber.Equals(input.NamespaceNumber))
+                ) && 
+                (
+                    this.NamespaceInteger == input.NamespaceInteger ||
+                    (this.NamespaceInteger != null &&
+                    this.NamespaceInteger.Equals(input.NamespaceInteger))
+                ) && 
+                (
+                    this.NamespaceBoolean == input.NamespaceBoolean ||
+                    (this.NamespaceBoolean != null &&
+                    this.NamespaceBoolean.Equals(input.NamespaceBoolean))
+                ) && 
+                (
+                    this.NamespaceArray == input.NamespaceArray ||
+                    this.NamespaceArray != null &&
+                    this.NamespaceArray.SequenceEqual(input.NamespaceArray)
+                ) && 
+                (
+                    this.NamespaceWrappedArray == input.NamespaceWrappedArray ||
+                    this.NamespaceWrappedArray != null &&
+                    this.NamespaceWrappedArray.SequenceEqual(input.NamespaceWrappedArray)
+                ) && 
+                (
+                    this.PrefixNsString == input.PrefixNsString ||
+                    (this.PrefixNsString != null &&
+                    this.PrefixNsString.Equals(input.PrefixNsString))
+                ) && 
+                (
+                    this.PrefixNsNumber == input.PrefixNsNumber ||
+                    (this.PrefixNsNumber != null &&
+                    this.PrefixNsNumber.Equals(input.PrefixNsNumber))
+                ) && 
+                (
+                    this.PrefixNsInteger == input.PrefixNsInteger ||
+                    (this.PrefixNsInteger != null &&
+                    this.PrefixNsInteger.Equals(input.PrefixNsInteger))
+                ) && 
+                (
+                    this.PrefixNsBoolean == input.PrefixNsBoolean ||
+                    (this.PrefixNsBoolean != null &&
+                    this.PrefixNsBoolean.Equals(input.PrefixNsBoolean))
+                ) && 
+                (
+                    this.PrefixNsArray == input.PrefixNsArray ||
+                    this.PrefixNsArray != null &&
+                    this.PrefixNsArray.SequenceEqual(input.PrefixNsArray)
+                ) && 
+                (
+                    this.PrefixNsWrappedArray == input.PrefixNsWrappedArray ||
+                    this.PrefixNsWrappedArray != null &&
+                    this.PrefixNsWrappedArray.SequenceEqual(input.PrefixNsWrappedArray)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.AttributeString != null)
+                    hashCode = hashCode * 59 + this.AttributeString.GetHashCode();
+                if (this.AttributeNumber != null)
+                    hashCode = hashCode * 59 + this.AttributeNumber.GetHashCode();
+                if (this.AttributeInteger != null)
+                    hashCode = hashCode * 59 + this.AttributeInteger.GetHashCode();
+                if (this.AttributeBoolean != null)
+                    hashCode = hashCode * 59 + this.AttributeBoolean.GetHashCode();
+                if (this.WrappedArray != null)
+                    hashCode = hashCode * 59 + this.WrappedArray.GetHashCode();
+                if (this.NameString != null)
+                    hashCode = hashCode * 59 + this.NameString.GetHashCode();
+                if (this.NameNumber != null)
+                    hashCode = hashCode * 59 + this.NameNumber.GetHashCode();
+                if (this.NameInteger != null)
+                    hashCode = hashCode * 59 + this.NameInteger.GetHashCode();
+                if (this.NameBoolean != null)
+                    hashCode = hashCode * 59 + this.NameBoolean.GetHashCode();
+                if (this.NameArray != null)
+                    hashCode = hashCode * 59 + this.NameArray.GetHashCode();
+                if (this.NameWrappedArray != null)
+                    hashCode = hashCode * 59 + this.NameWrappedArray.GetHashCode();
+                if (this.PrefixString != null)
+                    hashCode = hashCode * 59 + this.PrefixString.GetHashCode();
+                if (this.PrefixNumber != null)
+                    hashCode = hashCode * 59 + this.PrefixNumber.GetHashCode();
+                if (this.PrefixInteger != null)
+                    hashCode = hashCode * 59 + this.PrefixInteger.GetHashCode();
+                if (this.PrefixBoolean != null)
+                    hashCode = hashCode * 59 + this.PrefixBoolean.GetHashCode();
+                if (this.PrefixArray != null)
+                    hashCode = hashCode * 59 + this.PrefixArray.GetHashCode();
+                if (this.PrefixWrappedArray != null)
+                    hashCode = hashCode * 59 + this.PrefixWrappedArray.GetHashCode();
+                if (this.NamespaceString != null)
+                    hashCode = hashCode * 59 + this.NamespaceString.GetHashCode();
+                if (this.NamespaceNumber != null)
+                    hashCode = hashCode * 59 + this.NamespaceNumber.GetHashCode();
+                if (this.NamespaceInteger != null)
+                    hashCode = hashCode * 59 + this.NamespaceInteger.GetHashCode();
+                if (this.NamespaceBoolean != null)
+                    hashCode = hashCode * 59 + this.NamespaceBoolean.GetHashCode();
+                if (this.NamespaceArray != null)
+                    hashCode = hashCode * 59 + this.NamespaceArray.GetHashCode();
+                if (this.NamespaceWrappedArray != null)
+                    hashCode = hashCode * 59 + this.NamespaceWrappedArray.GetHashCode();
+                if (this.PrefixNsString != null)
+                    hashCode = hashCode * 59 + this.PrefixNsString.GetHashCode();
+                if (this.PrefixNsNumber != null)
+                    hashCode = hashCode * 59 + this.PrefixNsNumber.GetHashCode();
+                if (this.PrefixNsInteger != null)
+                    hashCode = hashCode * 59 + this.PrefixNsInteger.GetHashCode();
+                if (this.PrefixNsBoolean != null)
+                    hashCode = hashCode * 59 + this.PrefixNsBoolean.GetHashCode();
+                if (this.PrefixNsArray != null)
+                    hashCode = hashCode * 59 + this.PrefixNsArray.GetHashCode();
+                if (this.PrefixNsWrappedArray != null)
+                    hashCode = hashCode * 59 + this.PrefixNsWrappedArray.GetHashCode();
+                return hashCode;
+            }
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/README.md

@@ -97,6 +97,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**CreateXmlItem**](docs/FakeApi.md#createxmlitem) | **POST** /fake/create_xml_item | creates an XmlItem
 *FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**FakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
@@ -136,7 +137,14 @@ Class | Method | HTTP request | Description
 <a name="documentation-for-models"></a>
 ## Documentation for Models
 
+ - [Model.AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [Model.AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [Model.AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
  - [Model.AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [Model.AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [Model.AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [Model.AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [Model.AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [Model.Animal](docs/Animal.md)
  - [Model.ApiResponse](docs/ApiResponse.md)
  - [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
@@ -169,7 +177,10 @@ Class | Method | HTTP request | Description
  - [Model.Return](docs/Return.md)
  - [Model.SpecialModelName](docs/SpecialModelName.md)
  - [Model.Tag](docs/Tag.md)
+ - [Model.TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [Model.TypeHolderExample](docs/TypeHolderExample.md)
  - [Model.User](docs/User.md)
+ - [Model.XmlItem](docs/XmlItem.md)
 
 
 <a name="documentation-for-authorization"></a>

samples/client/petstore/csharp/OpenAPIClientNet40/docs/AdditionalPropertiesAnyType.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesAnyType
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet40/docs/AdditionalPropertiesArray.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesArray
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet40/docs/AdditionalPropertiesBoolean.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesBoolean
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet40/docs/AdditionalPropertiesClass.md

@@ -3,8 +3,17 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MapProperty** | **Dictionary<string, string>** |  | [optional] 
+**MapString** | **Dictionary<string, string>** |  | [optional] 
-**MapOfMapProperty** | **Dictionary<string, Dictionary<string, string>>** |  | [optional] 
+**MapNumber** | **Dictionary<string, decimal?>** |  | [optional] 
+**MapInteger** | **Dictionary<string, int?>** |  | [optional] 
+**MapBoolean** | **Dictionary<string, bool?>** |  | [optional] 
+**MapArrayInteger** | **Dictionary<string, List<int?>>** |  | [optional] 
+**MapArrayAnytype** | **Dictionary<string, List<Object>>** |  | [optional] 
+**MapMapString** | **Dictionary<string, Dictionary<string, string>>** |  | [optional] 
+**MapMapAnytype** | **Dictionary<string, Dictionary<string, Object>>** |  | [optional] 
+**Anytype1** | [**Object**](.md) |  | [optional] 
+**Anytype2** | [**Object**](.md) |  | [optional] 
+**Anytype3** | [**Object**](.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/client/petstore/csharp/OpenAPIClientNet40/docs/AdditionalPropertiesInteger.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesInteger
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet40/docs/AdditionalPropertiesNumber.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesNumber
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet40/docs/AdditionalPropertiesObject.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesObject
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet40/docs/AdditionalPropertiesString.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.AdditionalPropertiesString
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet40/docs/FakeApi.md

@@ -4,6 +4,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**CreateXmlItem**](FakeApi.md#createxmlitem) | **POST** /fake/create_xml_item | creates an XmlItem
 [**FakeOuterBooleanSerialize**](FakeApi.md#fakeouterbooleanserialize) | **POST** /fake/outer/boolean | 
 [**FakeOuterCompositeSerialize**](FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
 [**FakeOuterNumberSerialize**](FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
@@ -18,6 +19,66 @@ Method | HTTP request | Description
 [**TestJsonFormData**](FakeApi.md#testjsonformdata) | **GET** /fake/jsonFormData | test json serialization of form data
 
 
+<a name="createxmlitem"></a>
+# **CreateXmlItem**
+> void CreateXmlItem (XmlItem xmlItem)
+
+creates an XmlItem
+
+this route creates an XmlItem
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class CreateXmlItemExample
+    {
+        public void main()
+        {
+            var apiInstance = new FakeApi();
+            var xmlItem = new XmlItem(); // XmlItem | XmlItem Body
+
+            try
+            {
+                // creates an XmlItem
+                apiInstance.CreateXmlItem(xmlItem);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FakeApi.CreateXmlItem: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **xmlItem** | [**XmlItem**](XmlItem.md)| XmlItem Body | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="fakeouterbooleanserialize"></a>
 # **FakeOuterBooleanSerialize**
 > bool? FakeOuterBooleanSerialize (bool? body = null)
@@ -161,7 +222,7 @@ namespace Example
         public void main()
         {
             var apiInstance = new FakeApi();
-            var body = 1.2D;  // decimal? | Input number as post body (optional) 
+            var body = 8.14;  // decimal? | Input number as post body (optional) 
 
             try
             {

samples/client/petstore/csharp/OpenAPIClientNet40/docs/TypeHolderDefault.md

@@ -0,0 +1,13 @@
+# Org.OpenAPITools.Model.TypeHolderDefault
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**StringItem** | **string** |  | [default to "what"]
+**NumberItem** | **decimal?** |  | 
+**IntegerItem** | **int?** |  | 
+**BoolItem** | **bool?** |  | [default to true]
+**ArrayItem** | **List<int?>** |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet40/docs/TypeHolderExample.md

@@ -0,0 +1,13 @@
+# Org.OpenAPITools.Model.TypeHolderExample
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**StringItem** | **string** |  | 
+**NumberItem** | **decimal?** |  | 
+**IntegerItem** | **int?** |  | 
+**BoolItem** | **bool?** |  | 
+**ArrayItem** | **List<int?>** |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet40/docs/XmlItem.md

@@ -0,0 +1,37 @@
+# Org.OpenAPITools.Model.XmlItem
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**AttributeString** | **string** |  | [optional] 
+**AttributeNumber** | **decimal?** |  | [optional] 
+**AttributeInteger** | **int?** |  | [optional] 
+**AttributeBoolean** | **bool?** |  | [optional] 
+**WrappedArray** | **List<int?>** |  | [optional] 
+**NameString** | **string** |  | [optional] 
+**NameNumber** | **decimal?** |  | [optional] 
+**NameInteger** | **int?** |  | [optional] 
+**NameBoolean** | **bool?** |  | [optional] 
+**NameArray** | **List<int?>** |  | [optional] 
+**NameWrappedArray** | **List<int?>** |  | [optional] 
+**PrefixString** | **string** |  | [optional] 
+**PrefixNumber** | **decimal?** |  | [optional] 
+**PrefixInteger** | **int?** |  | [optional] 
+**PrefixBoolean** | **bool?** |  | [optional] 
+**PrefixArray** | **List<int?>** |  | [optional] 
+**PrefixWrappedArray** | **List<int?>** |  | [optional] 
+**NamespaceString** | **string** |  | [optional] 
+**NamespaceNumber** | **decimal?** |  | [optional] 
+**NamespaceInteger** | **int?** |  | [optional] 
+**NamespaceBoolean** | **bool?** |  | [optional] 
+**NamespaceArray** | **List<int?>** |  | [optional] 
+**NamespaceWrappedArray** | **List<int?>** |  | [optional] 
+**PrefixNsString** | **string** |  | [optional] 
+**PrefixNsNumber** | **decimal?** |  | [optional] 
+**PrefixNsInteger** | **int?** |  | [optional] 
+**PrefixNsBoolean** | **bool?** |  | [optional] 
+**PrefixNsArray** | **List<int?>** |  | [optional] 
+**PrefixNsWrappedArray** | **List<int?>** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesAnyTypeTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesAnyType
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesAnyTypeTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesAnyType
+        //private AdditionalPropertiesAnyType instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesAnyType
+            //instance = new AdditionalPropertiesAnyType();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesAnyType
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesAnyTypeInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesAnyType
+            //Assert.IsInstanceOfType<AdditionalPropertiesAnyType> (instance, "variable 'instance' is a AdditionalPropertiesAnyType");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesArrayTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesArray
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesArrayTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesArray
+        //private AdditionalPropertiesArray instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesArray
+            //instance = new AdditionalPropertiesArray();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesArray
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesArrayInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesArray
+            //Assert.IsInstanceOfType<AdditionalPropertiesArray> (instance, "variable 'instance' is a AdditionalPropertiesArray");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesBooleanTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesBoolean
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesBooleanTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesBoolean
+        //private AdditionalPropertiesBoolean instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesBoolean
+            //instance = new AdditionalPropertiesBoolean();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesBoolean
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesBooleanInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesBoolean
+            //Assert.IsInstanceOfType<AdditionalPropertiesBoolean> (instance, "variable 'instance' is a AdditionalPropertiesBoolean");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesIntegerTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesInteger
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesIntegerTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesInteger
+        //private AdditionalPropertiesInteger instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesInteger
+            //instance = new AdditionalPropertiesInteger();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesInteger
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesIntegerInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesInteger
+            //Assert.IsInstanceOfType<AdditionalPropertiesInteger> (instance, "variable 'instance' is a AdditionalPropertiesInteger");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesNumberTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesNumber
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesNumberTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesNumber
+        //private AdditionalPropertiesNumber instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesNumber
+            //instance = new AdditionalPropertiesNumber();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesNumber
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesNumberInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesNumber
+            //Assert.IsInstanceOfType<AdditionalPropertiesNumber> (instance, "variable 'instance' is a AdditionalPropertiesNumber");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesObjectTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesObject
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesObjectTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesObject
+        //private AdditionalPropertiesObject instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesObject
+            //instance = new AdditionalPropertiesObject();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesObject
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesObjectInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesObject
+            //Assert.IsInstanceOfType<AdditionalPropertiesObject> (instance, "variable 'instance' is a AdditionalPropertiesObject");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesStringTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing AdditionalPropertiesString
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class AdditionalPropertiesStringTests
+    {
+        // TODO uncomment below to declare an instance variable for AdditionalPropertiesString
+        //private AdditionalPropertiesString instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of AdditionalPropertiesString
+            //instance = new AdditionalPropertiesString();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of AdditionalPropertiesString
+        /// </summary>
+        [Test]
+        public void AdditionalPropertiesStringInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesString
+            //Assert.IsInstanceOfType<AdditionalPropertiesString> (instance, "variable 'instance' is a AdditionalPropertiesString");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Test]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/TypeHolderDefaultTests.cs

@@ -0,0 +1,112 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing TypeHolderDefault
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class TypeHolderDefaultTests
+    {
+        // TODO uncomment below to declare an instance variable for TypeHolderDefault
+        //private TypeHolderDefault instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of TypeHolderDefault
+            //instance = new TypeHolderDefault();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of TypeHolderDefault
+        /// </summary>
+        [Test]
+        public void TypeHolderDefaultInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" TypeHolderDefault
+            //Assert.IsInstanceOfType<TypeHolderDefault> (instance, "variable 'instance' is a TypeHolderDefault");
+        }
+
+
+        /// <summary>
+        /// Test the property 'StringItem'
+        /// </summary>
+        [Test]
+        public void StringItemTest()
+        {
+            // TODO unit test for the property 'StringItem'
+        }
+        /// <summary>
+        /// Test the property 'NumberItem'
+        /// </summary>
+        [Test]
+        public void NumberItemTest()
+        {
+            // TODO unit test for the property 'NumberItem'
+        }
+        /// <summary>
+        /// Test the property 'IntegerItem'
+        /// </summary>
+        [Test]
+        public void IntegerItemTest()
+        {
+            // TODO unit test for the property 'IntegerItem'
+        }
+        /// <summary>
+        /// Test the property 'BoolItem'
+        /// </summary>
+        [Test]
+        public void BoolItemTest()
+        {
+            // TODO unit test for the property 'BoolItem'
+        }
+        /// <summary>
+        /// Test the property 'ArrayItem'
+        /// </summary>
+        [Test]
+        public void ArrayItemTest()
+        {
+            // TODO unit test for the property 'ArrayItem'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/TypeHolderExampleTests.cs

@@ -0,0 +1,112 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing TypeHolderExample
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class TypeHolderExampleTests
+    {
+        // TODO uncomment below to declare an instance variable for TypeHolderExample
+        //private TypeHolderExample instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of TypeHolderExample
+            //instance = new TypeHolderExample();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of TypeHolderExample
+        /// </summary>
+        [Test]
+        public void TypeHolderExampleInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" TypeHolderExample
+            //Assert.IsInstanceOfType<TypeHolderExample> (instance, "variable 'instance' is a TypeHolderExample");
+        }
+
+
+        /// <summary>
+        /// Test the property 'StringItem'
+        /// </summary>
+        [Test]
+        public void StringItemTest()
+        {
+            // TODO unit test for the property 'StringItem'
+        }
+        /// <summary>
+        /// Test the property 'NumberItem'
+        /// </summary>
+        [Test]
+        public void NumberItemTest()
+        {
+            // TODO unit test for the property 'NumberItem'
+        }
+        /// <summary>
+        /// Test the property 'IntegerItem'
+        /// </summary>
+        [Test]
+        public void IntegerItemTest()
+        {
+            // TODO unit test for the property 'IntegerItem'
+        }
+        /// <summary>
+        /// Test the property 'BoolItem'
+        /// </summary>
+        [Test]
+        public void BoolItemTest()
+        {
+            // TODO unit test for the property 'BoolItem'
+        }
+        /// <summary>
+        /// Test the property 'ArrayItem'
+        /// </summary>
+        [Test]
+        public void ArrayItemTest()
+        {
+            // TODO unit test for the property 'ArrayItem'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/XmlItemTests.cs

@@ -0,0 +1,304 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing XmlItem
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class XmlItemTests
+    {
+        // TODO uncomment below to declare an instance variable for XmlItem
+        //private XmlItem instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of XmlItem
+            //instance = new XmlItem();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of XmlItem
+        /// </summary>
+        [Test]
+        public void XmlItemInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" XmlItem
+            //Assert.IsInstanceOfType<XmlItem> (instance, "variable 'instance' is a XmlItem");
+        }
+
+
+        /// <summary>
+        /// Test the property 'AttributeString'
+        /// </summary>
+        [Test]
+        public void AttributeStringTest()
+        {
+            // TODO unit test for the property 'AttributeString'
+        }
+        /// <summary>
+        /// Test the property 'AttributeNumber'
+        /// </summary>
+        [Test]
+        public void AttributeNumberTest()
+        {
+            // TODO unit test for the property 'AttributeNumber'
+        }
+        /// <summary>
+        /// Test the property 'AttributeInteger'
+        /// </summary>
+        [Test]
+        public void AttributeIntegerTest()
+        {
+            // TODO unit test for the property 'AttributeInteger'
+        }
+        /// <summary>
+        /// Test the property 'AttributeBoolean'
+        /// </summary>
+        [Test]
+        public void AttributeBooleanTest()
+        {
+            // TODO unit test for the property 'AttributeBoolean'
+        }
+        /// <summary>
+        /// Test the property 'WrappedArray'
+        /// </summary>
+        [Test]
+        public void WrappedArrayTest()
+        {
+            // TODO unit test for the property 'WrappedArray'
+        }
+        /// <summary>
+        /// Test the property 'NameString'
+        /// </summary>
+        [Test]
+        public void NameStringTest()
+        {
+            // TODO unit test for the property 'NameString'
+        }
+        /// <summary>
+        /// Test the property 'NameNumber'
+        /// </summary>
+        [Test]
+        public void NameNumberTest()
+        {
+            // TODO unit test for the property 'NameNumber'
+        }
+        /// <summary>
+        /// Test the property 'NameInteger'
+        /// </summary>
+        [Test]
+        public void NameIntegerTest()
+        {
+            // TODO unit test for the property 'NameInteger'
+        }
+        /// <summary>
+        /// Test the property 'NameBoolean'
+        /// </summary>
+        [Test]
+        public void NameBooleanTest()
+        {
+            // TODO unit test for the property 'NameBoolean'
+        }
+        /// <summary>
+        /// Test the property 'NameArray'
+        /// </summary>
+        [Test]
+        public void NameArrayTest()
+        {
+            // TODO unit test for the property 'NameArray'
+        }
+        /// <summary>
+        /// Test the property 'NameWrappedArray'
+        /// </summary>
+        [Test]
+        public void NameWrappedArrayTest()
+        {
+            // TODO unit test for the property 'NameWrappedArray'
+        }
+        /// <summary>
+        /// Test the property 'PrefixString'
+        /// </summary>
+        [Test]
+        public void PrefixStringTest()
+        {
+            // TODO unit test for the property 'PrefixString'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNumber'
+        /// </summary>
+        [Test]
+        public void PrefixNumberTest()
+        {
+            // TODO unit test for the property 'PrefixNumber'
+        }
+        /// <summary>
+        /// Test the property 'PrefixInteger'
+        /// </summary>
+        [Test]
+        public void PrefixIntegerTest()
+        {
+            // TODO unit test for the property 'PrefixInteger'
+        }
+        /// <summary>
+        /// Test the property 'PrefixBoolean'
+        /// </summary>
+        [Test]
+        public void PrefixBooleanTest()
+        {
+            // TODO unit test for the property 'PrefixBoolean'
+        }
+        /// <summary>
+        /// Test the property 'PrefixArray'
+        /// </summary>
+        [Test]
+        public void PrefixArrayTest()
+        {
+            // TODO unit test for the property 'PrefixArray'
+        }
+        /// <summary>
+        /// Test the property 'PrefixWrappedArray'
+        /// </summary>
+        [Test]
+        public void PrefixWrappedArrayTest()
+        {
+            // TODO unit test for the property 'PrefixWrappedArray'
+        }
+        /// <summary>
+        /// Test the property 'NamespaceString'
+        /// </summary>
+        [Test]
+        public void NamespaceStringTest()
+        {
+            // TODO unit test for the property 'NamespaceString'
+        }
+        /// <summary>
+        /// Test the property 'NamespaceNumber'
+        /// </summary>
+        [Test]
+        public void NamespaceNumberTest()
+        {
+            // TODO unit test for the property 'NamespaceNumber'
+        }
+        /// <summary>
+        /// Test the property 'NamespaceInteger'
+        /// </summary>
+        [Test]
+        public void NamespaceIntegerTest()
+        {
+            // TODO unit test for the property 'NamespaceInteger'
+        }
+        /// <summary>
+        /// Test the property 'NamespaceBoolean'
+        /// </summary>
+        [Test]
+        public void NamespaceBooleanTest()
+        {
+            // TODO unit test for the property 'NamespaceBoolean'
+        }
+        /// <summary>
+        /// Test the property 'NamespaceArray'
+        /// </summary>
+        [Test]
+        public void NamespaceArrayTest()
+        {
+            // TODO unit test for the property 'NamespaceArray'
+        }
+        /// <summary>
+        /// Test the property 'NamespaceWrappedArray'
+        /// </summary>
+        [Test]
+        public void NamespaceWrappedArrayTest()
+        {
+            // TODO unit test for the property 'NamespaceWrappedArray'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNsString'
+        /// </summary>
+        [Test]
+        public void PrefixNsStringTest()
+        {
+            // TODO unit test for the property 'PrefixNsString'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNsNumber'
+        /// </summary>
+        [Test]
+        public void PrefixNsNumberTest()
+        {
+            // TODO unit test for the property 'PrefixNsNumber'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNsInteger'
+        /// </summary>
+        [Test]
+        public void PrefixNsIntegerTest()
+        {
+            // TODO unit test for the property 'PrefixNsInteger'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNsBoolean'
+        /// </summary>
+        [Test]
+        public void PrefixNsBooleanTest()
+        {
+            // TODO unit test for the property 'PrefixNsBoolean'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNsArray'
+        /// </summary>
+        [Test]
+        public void PrefixNsArrayTest()
+        {
+            // TODO unit test for the property 'PrefixNsArray'
+        }
+        /// <summary>
+        /// Test the property 'PrefixNsWrappedArray'
+        /// </summary>
+        [Test]
+        public void PrefixNsWrappedArrayTest()
+        {
+            // TODO unit test for the property 'PrefixNsWrappedArray'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/AnotherFakeApi.cs

@@ -226,7 +226,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<ModelClient>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
         }
 

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/FakeApi.cs

@@ -25,6 +25,27 @@ namespace Org.OpenAPITools.Api
     {
         #region Synchronous Operations
         /// <summary>
+        /// creates an XmlItem
+        /// </summary>
+        /// <remarks>
+        /// this route creates an XmlItem
+        /// </remarks>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="xmlItem">XmlItem Body</param>
+        /// <returns></returns>
+        void CreateXmlItem (XmlItem xmlItem);
+
+        /// <summary>
+        /// creates an XmlItem
+        /// </summary>
+        /// <remarks>
+        /// this route creates an XmlItem
+        /// </remarks>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="xmlItem">XmlItem Body</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> CreateXmlItemWithHttpInfo (XmlItem xmlItem);
+        /// <summary>
         /// 
         /// </summary>
         /// <remarks>
@@ -441,6 +462,83 @@ namespace Org.OpenAPITools.Api
             this.Configuration.AddDefaultHeader(key, value);
         }
 
+        /// <summary>
+        /// creates an XmlItem this route creates an XmlItem
+        /// </summary>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="xmlItem">XmlItem Body</param>
+        /// <returns></returns>
+        public void CreateXmlItem (XmlItem xmlItem)
+        {
+             CreateXmlItemWithHttpInfo(xmlItem);
+        }
+
+        /// <summary>
+        /// creates an XmlItem this route creates an XmlItem
+        /// </summary>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="xmlItem">XmlItem Body</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> CreateXmlItemWithHttpInfo (XmlItem xmlItem)
+        {
+            // verify the required parameter 'xmlItem' is set
+            if (xmlItem == null)
+                throw new ApiException(400, "Missing required parameter 'xmlItem' when calling FakeApi->CreateXmlItem");
+
+            var localVarPath = "/fake/create_xml_item";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/xml", 
+                "application/xml; charset=utf-8", 
+                "application/xml; charset=utf-16", 
+                "text/xml", 
+                "text/xml; charset=utf-8", 
+                "text/xml; charset=utf-16"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (xmlItem != null && xmlItem.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(xmlItem); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = xmlItem; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateXmlItem", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
+                null);
+        }
+
         /// <summary>
         ///  Test serialization of outer boolean types
         /// </summary>
@@ -507,7 +605,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<bool?>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (bool?) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(bool?)));
         }
 
@@ -577,7 +675,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<OuterComposite>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (OuterComposite) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(OuterComposite)));
         }
 
@@ -647,7 +745,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<decimal?>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (decimal?) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(decimal?)));
         }
 
@@ -717,7 +815,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
         }
 
@@ -789,7 +887,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -867,7 +965,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -941,7 +1039,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<ModelClient>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
         }
 
@@ -1060,7 +1158,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -1143,7 +1241,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -1228,7 +1326,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -1300,7 +1398,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -1371,7 +1469,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs

@@ -231,7 +231,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<ModelClient>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (ModelClient) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ModelClient)));
         }
 

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/PetApi.cs

@@ -413,7 +413,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -486,7 +486,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -559,7 +559,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<List<Pet>>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (List<Pet>) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Pet>)));
         }
 
@@ -632,7 +632,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<List<Pet>>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (List<Pet>) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(List<Pet>)));
         }
 
@@ -704,7 +704,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Pet>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (Pet) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Pet)));
         }
 
@@ -783,7 +783,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -860,7 +860,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -939,7 +939,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<ApiResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (ApiResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ApiResponse)));
         }
 
@@ -1021,7 +1021,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<ApiResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (ApiResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ApiResponse)));
         }
 

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/StoreApi.cs

@@ -277,7 +277,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -342,7 +342,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Dictionary<string, int?>>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (Dictionary<string, int?>) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Dictionary<string, int?>)));
         }
 
@@ -409,7 +409,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Order>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (Order) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
         }
 
@@ -483,7 +483,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Order>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (Order) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Order)));
         }
 

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/UserApi.cs

@@ -372,7 +372,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -443,7 +443,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -514,7 +514,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -578,7 +578,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -645,7 +645,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<User>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (User) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(User)));
         }
 
@@ -718,7 +718,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
         }
 
@@ -776,7 +776,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 
@@ -853,7 +853,7 @@ namespace Org.OpenAPITools.Api
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
                 null);
         }
 

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs

@@ -0,0 +1,125 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesAnyType
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesAnyType : Dictionary<String, Object>,  IEquatable<AdditionalPropertiesAnyType>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesAnyType" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesAnyType(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesAnyType {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesAnyType);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesAnyType instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesAnyType to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesAnyType input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs

@@ -0,0 +1,125 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesArray
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesArray : Dictionary<String, List>,  IEquatable<AdditionalPropertiesArray>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesArray" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesArray(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesArray {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesArray);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesArray instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesArray to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesArray input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs

@@ -0,0 +1,125 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// AdditionalPropertiesBoolean
+    /// </summary>
+    [DataContract]
+    public partial class AdditionalPropertiesBoolean : Dictionary<String, bool?>,  IEquatable<AdditionalPropertiesBoolean>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdditionalPropertiesBoolean" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public AdditionalPropertiesBoolean(string name = default(string)) : base()
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AdditionalPropertiesBoolean {\n");
+            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AdditionalPropertiesBoolean);
+        }
+
+        /// <summary>
+        /// Returns true if AdditionalPropertiesBoolean instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AdditionalPropertiesBoolean to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AdditionalPropertiesBoolean input)
+        {
+            if (input == null)
+                return false;
+
+            return base.Equals(input) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = base.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs

@@ -33,25 +33,97 @@ namespace Org.OpenAPITools.Model
         /// <summary>
         /// Initializes a new instance of the <see cref="AdditionalPropertiesClass" /> class.
         /// </summary>
-        /// <param name="mapProperty">mapProperty.</param>
+        /// <param name="mapString">mapString.</param>
-        /// <param name="mapOfMapProperty">mapOfMapProperty.</param>
+        /// <param name="mapNumber">mapNumber.</param>
-        public AdditionalPropertiesClass(Dictionary<string, string> mapProperty = default(Dictionary<string, string>), Dictionary<string, Dictionary<string, string>> mapOfMapProperty = default(Dictionary<string, Dictionary<string, string>>))
+        /// <param name="mapInteger">mapInteger.</param>
+        /// <param name="mapBoolean">mapBoolean.</param>
+        /// <param name="mapArrayInteger">mapArrayInteger.</param>
+        /// <param name="mapArrayAnytype">mapArrayAnytype.</param>
+        /// <param name="mapMapString">mapMapString.</param>
+        /// <param name="mapMapAnytype">mapMapAnytype.</param>
+        /// <param name="anytype1">anytype1.</param>
+        /// <param name="anytype2">anytype2.</param>
+        /// <param name="anytype3">anytype3.</param>
+        public AdditionalPropertiesClass(Dictionary<string, string> mapString = default(Dictionary<string, string>), Dictionary<string, decimal?> mapNumber = default(Dictionary<string, decimal?>), Dictionary<string, int?> mapInteger = default(Dictionary<string, int?>), Dictionary<string, bool?> mapBoolean = default(Dictionary<string, bool?>), Dictionary<string, List<int?>> mapArrayInteger = default(Dictionary<string, List<int?>>), Dictionary<string, List<Object>> mapArrayAnytype = default(Dictionary<string, List<Object>>), Dictionary<string, Dictionary<string, string>> mapMapString = default(Dictionary<string, Dictionary<string, string>>), Dictionary<string, Dictionary<string, Object>> mapMapAnytype = default(Dictionary<string, Dictionary<string, Object>>), Object anytype1 = default(Object), Object anytype2 = default(Object), Object anytype3 = default(Object))
         {
-            this.MapProperty = mapProperty;
+            this.MapString = mapString;
-            this.MapOfMapProperty = mapOfMapProperty;
+            this.MapNumber = mapNumber;
+            this.MapInteger = mapInteger;
+            this.MapBoolean = mapBoolean;
+            this.MapArrayInteger = mapArrayInteger;
+            this.MapArrayAnytype = mapArrayAnytype;
+            this.MapMapString = mapMapString;
+            this.MapMapAnytype = mapMapAnytype;
+            this.Anytype1 = anytype1;
+            this.Anytype2 = anytype2;
+            this.Anytype3 = anytype3;
         }
         
         /// <summary>
-        /// Gets or Sets MapProperty
+        /// Gets or Sets MapString
         /// </summary>
-        [DataMember(Name="map_property", EmitDefaultValue=false)]
+        [DataMember(Name="map_string", EmitDefaultValue=false)]
-        public Dictionary<string, string> MapProperty { get; set; }
+        public Dictionary<string, string> MapString { get; set; }
 
         /// <summary>
-        /// Gets or Sets MapOfMapProperty
+        /// Gets or Sets MapNumber
         /// </summary>
-        [DataMember(Name="map_of_map_property", EmitDefaultValue=false)]
+        [DataMember(Name="map_number", EmitDefaultValue=false)]
-        public Dictionary<string, Dictionary<string, string>> MapOfMapProperty { get; set; }
+        public Dictionary<string, decimal?> MapNumber { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapInteger
+        /// </summary>
+        [DataMember(Name="map_integer", EmitDefaultValue=false)]
+        public Dictionary<string, int?> MapInteger { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapBoolean
+        /// </summary>
+        [DataMember(Name="map_boolean", EmitDefaultValue=false)]
+        public Dictionary<string, bool?> MapBoolean { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapArrayInteger
+        /// </summary>
+        [DataMember(Name="map_array_integer", EmitDefaultValue=false)]
+        public Dictionary<string, List<int?>> MapArrayInteger { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapArrayAnytype
+        /// </summary>
+        [DataMember(Name="map_array_anytype", EmitDefaultValue=false)]
+        public Dictionary<string, List<Object>> MapArrayAnytype { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapMapString
+        /// </summary>
+        [DataMember(Name="map_map_string", EmitDefaultValue=false)]
+        public Dictionary<string, Dictionary<string, string>> MapMapString { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MapMapAnytype
+        /// </summary>
+        [DataMember(Name="map_map_anytype", EmitDefaultValue=false)]
+        public Dictionary<string, Dictionary<string, Object>> MapMapAnytype { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Anytype1
+        /// </summary>
+        [DataMember(Name="anytype_1", EmitDefaultValue=false)]
+        public Object Anytype1 { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Anytype2
+        /// </summary>
+        [DataMember(Name="anytype_2", EmitDefaultValue=false)]
+        public Object Anytype2 { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Anytype3
+        /// </summary>
+        [DataMember(Name="anytype_3", EmitDefaultValue=false)]
+        public Object Anytype3 { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -61,8 +133,17 @@ namespace Org.OpenAPITools.Model
         {
             var sb = new StringBuilder();
             sb.Append("class AdditionalPropertiesClass {\n");
-            sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
+            sb.Append("  MapString: ").Append(MapString).Append("\n");
-            sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
+            sb.Append("  MapNumber: ").Append(MapNumber).Append("\n");
+            sb.Append("  MapInteger: ").Append(MapInteger).Append("\n");
+            sb.Append("  MapBoolean: ").Append(MapBoolean).Append("\n");
+            sb.Append("  MapArrayInteger: ").Append(MapArrayInteger).Append("\n");
+            sb.Append("  MapArrayAnytype: ").Append(MapArrayAnytype).Append("\n");
+            sb.Append("  MapMapString: ").Append(MapMapString).Append("\n");
+            sb.Append("  MapMapAnytype: ").Append(MapMapAnytype).Append("\n");
+            sb.Append("  Anytype1: ").Append(Anytype1).Append("\n");
+            sb.Append("  Anytype2: ").Append(Anytype2).Append("\n");
+            sb.Append("  Anytype3: ").Append(Anytype3).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -98,14 +179,59 @@ namespace Org.OpenAPITools.Model
 
             return 
                 (
-                    this.MapProperty == input.MapProperty ||
+                    this.MapString == input.MapString ||
-                    this.MapProperty != null &&
+                    this.MapString != null &&
-                    this.MapProperty.SequenceEqual(input.MapProperty)
+                    this.MapString.SequenceEqual(input.MapString)
                 ) && 
                 (
-                    this.MapOfMapProperty == input.MapOfMapProperty ||
+                    this.MapNumber == input.MapNumber ||
-                    this.MapOfMapProperty != null &&
+                    this.MapNumber != null &&
-                    this.MapOfMapProperty.SequenceEqual(input.MapOfMapProperty)
+                    this.MapNumber.SequenceEqual(input.MapNumber)
+                ) && 
+                (
+                    this.MapInteger == input.MapInteger ||
+                    this.MapInteger != null &&
+                    this.MapInteger.SequenceEqual(input.MapInteger)
+                ) && 
+                (
+                    this.MapBoolean == input.MapBoolean ||
+                    this.MapBoolean != null &&
+                    this.MapBoolean.SequenceEqual(input.MapBoolean)
+                ) && 
+                (
+                    this.MapArrayInteger == input.MapArrayInteger ||
+                    this.MapArrayInteger != null &&
+                    this.MapArrayInteger.SequenceEqual(input.MapArrayInteger)
+                ) && 
+                (
+                    this.MapArrayAnytype == input.MapArrayAnytype ||
+                    this.MapArrayAnytype != null &&
+                    this.MapArrayAnytype.SequenceEqual(input.MapArrayAnytype)
+                ) && 
+                (
+                    this.MapMapString == input.MapMapString ||
+                    this.MapMapString != null &&
+                    this.MapMapString.SequenceEqual(input.MapMapString)
+                ) && 
+                (
+                    this.MapMapAnytype == input.MapMapAnytype ||
+                    this.MapMapAnytype != null &&
+                    this.MapMapAnytype.SequenceEqual(input.MapMapAnytype)
+                ) && 
+                (
+                    this.Anytype1 == input.Anytype1 ||
+                    (this.Anytype1 != null &&
+                    this.Anytype1.Equals(input.Anytype1))
+                ) && 
+                (
+                    this.Anytype2 == input.Anytype2 ||
+                    (this.Anytype2 != null &&
+                    this.Anytype2.Equals(input.Anytype2))
+                ) && 
+                (
+                    this.Anytype3 == input.Anytype3 ||
+                    (this.Anytype3 != null &&
+                    this.Anytype3.Equals(input.Anytype3))
                 );
         }
 
@@ -118,10 +244,28 @@ namespace Org.OpenAPITools.Model
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
-                if (this.MapProperty != null)
+                if (this.MapString != null)
-                    hashCode = hashCode * 59 + this.MapProperty.GetHashCode();
+                    hashCode = hashCode * 59 + this.MapString.GetHashCode();
-                if (this.MapOfMapProperty != null)
+                if (this.MapNumber != null)
-                    hashCode = hashCode * 59 + this.MapOfMapProperty.GetHashCode();
+                    hashCode = hashCode * 59 + this.MapNumber.GetHashCode();
+                if (this.MapInteger != null)
+                    hashCode = hashCode * 59 + this.MapInteger.GetHashCode();
+                if (this.MapBoolean != null)
+                    hashCode = hashCode * 59 + this.MapBoolean.GetHashCode();
+                if (this.MapArrayInteger != null)
+                    hashCode = hashCode * 59 + this.MapArrayInteger.GetHashCode();
+                if (this.MapArrayAnytype != null)
+                    hashCode = hashCode * 59 + this.MapArrayAnytype.GetHashCode();
+                if (this.MapMapString != null)
+                    hashCode = hashCode * 59 + this.MapMapString.GetHashCode();
+                if (this.MapMapAnytype != null)
+                    hashCode = hashCode * 59 + this.MapMapAnytype.GetHashCode();
+                if (this.Anytype1 != null)
+                    hashCode = hashCode * 59 + this.Anytype1.GetHashCode();
+                if (this.Anytype2 != null)
+                    hashCode = hashCode * 59 + this.Anytype2.GetHashCode();
+                if (this.Anytype3 != null)
+                    hashCode = hashCode * 59 + this.Anytype3.GetHashCode();
                 return hashCode;
             }
         }