diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java
index f0d3591ba3f..83330477b65 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java
@@ -77,6 +77,9 @@ public class CodegenConstants {
     public static final String MODEL_PROPERTY_NAMING = "modelPropertyNaming";
     public static final String MODEL_PROPERTY_NAMING_DESC = "Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name";
 
+    public static final String DOTNET_FRAMEWORK = "targetFramework";
+    public static final String DOTNET_FRAMEWORK_DESC = "The target .NET framework version.";
+
     public static enum MODEL_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case, original}
 
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
index 0da5b72f57f..3ef8e35e93e 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
@@ -1,5 +1,7 @@
 package io.swagger.codegen.languages;
 
+import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.ImmutableMap;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenType;
@@ -25,6 +27,8 @@
 public class CSharpClientCodegen extends AbstractCSharpCodegen {
     @SuppressWarnings({"unused", "hiding"})
     private static final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class);
+    private static final String NET45 = "v4.5";
+    private static final String NET35 = "v3.5";
 
     protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase() + "}";
     protected String packageTitle = "Swagger Library";
@@ -34,6 +38,13 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
     protected String packageCopyright = "No Copyright";
     protected String clientPackage = "IO.Swagger.Client";
 
+    protected String targetFramework = NET45;
+    protected String targetFrameworkNuget = "net45";
+    protected boolean supportsAsync = Boolean.TRUE;
+
+
+    protected final Map<String, String> frameworks;
+
     public CSharpClientCodegen() {
         super();
         modelTemplateFiles.put("model.mustache", ".cs");
@@ -64,6 +75,18 @@ public CSharpClientCodegen() {
                 CodegenConstants.OPTIONAL_PROJECT_GUID_DESC,
                 null);
 
+        CliOption framework = new CliOption(
+                CodegenConstants.DOTNET_FRAMEWORK,
+                CodegenConstants.DOTNET_FRAMEWORK_DESC
+        );
+        frameworks = new ImmutableMap.Builder<String, String>()
+                .put(NET35, ".NET Framework 3.5 compatible")
+                .put(NET45, ".NET Framework 4.5+ compatible")
+                .build();
+        framework.defaultValue(this.targetFramework);
+        framework.setEnum(frameworks);
+        cliOptions.add(framework);
+
         // CLI Switches
         addSwitch(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG,
                 CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC,
@@ -111,6 +134,24 @@ public void processOpts() {
         additionalProperties.put("packageCompany", packageCompany);
         additionalProperties.put("packageCopyright", packageCopyright);
 
+        if (additionalProperties.containsKey(CodegenConstants.DOTNET_FRAMEWORK)) {
+            setTargetFramework((String) additionalProperties.get(CodegenConstants.DOTNET_FRAMEWORK));
+        }
+
+        if (NET35.equals(this.targetFramework)) {
+            setTargetFrameworkNuget("net35");
+            setSupportsAsync(Boolean.FALSE);
+            if(additionalProperties.containsKey("supportsAsync")){
+                additionalProperties.remove("supportsAsync");
+            }
+        } else {
+            setTargetFrameworkNuget("net45");
+            setSupportsAsync(Boolean.TRUE);
+            additionalProperties.put("supportsAsync", this.supportsAsync);
+        }
+
+        additionalProperties.put("targetFrameworkNuget", this.targetFrameworkNuget);
+
         if (additionalProperties.containsKey(CodegenConstants.OPTIONAL_PROJECT_FILE)) {
             setOptionalProjectFileFlag(Boolean.valueOf(
                     additionalProperties.get(CodegenConstants.OPTIONAL_PROJECT_FILE).toString()));
@@ -141,7 +182,7 @@ public void processOpts() {
         String binRelativePath = "..\\";
         for (int i = 0; i < packageDepth; i = i + 1)
             binRelativePath += "..\\";
-        binRelativePath += "bin\\";
+        binRelativePath += "vendor\\";
         additionalProperties.put("binRelativePath", binRelativePath);
 
         supportingFiles.add(new SupportingFile("Configuration.mustache",
@@ -153,8 +194,6 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("ApiResponse.mustache",
                 clientPackageDir, "ApiResponse.cs"));
 
-        supportingFiles.add(new SupportingFile("Newtonsoft.Json.dll", "bin", "Newtonsoft.Json.dll"));
-        supportingFiles.add(new SupportingFile("RestSharp.dll", "bin", "RestSharp.dll"));
         supportingFiles.add(new SupportingFile("compile.mustache", "", "compile.bat"));
         supportingFiles.add(new SupportingFile("compile-mono.sh.mustache", "", "compile-mono.sh"));
         supportingFiles.add(new SupportingFile("packages.config.mustache", "vendor" + java.io.File.separator, "packages.config"));
@@ -222,4 +261,20 @@ public void setPackageGuid(String packageGuid) {
         this.packageGuid = packageGuid;
     }
 
+    public void setTargetFramework(String dotnetFramework) {
+        if(!frameworks.containsKey(dotnetFramework)){
+            LOGGER.warn("Invalid .NET framework version, defaulting to " + this.targetFramework);
+        } else {
+            this.targetFramework = dotnetFramework;
+        }
+        LOGGER.info("Generating code for .NET Framework " + this.targetFramework);
+    }
+
+    public void setTargetFrameworkNuget(String targetFrameworkNuget) {
+        this.targetFrameworkNuget = targetFrameworkNuget;
+    }
+
+    public void setSupportsAsync(Boolean supportsAsync){
+        this.supportsAsync = supportsAsync;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
index 4fabfa4667b..60b573e1a6c 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
@@ -146,7 +146,7 @@ namespace {{packageName}}.Client
             var response = RestClient.Execute(request);
             return (Object) response;
         }
-
+        {{#supportsAsync}}
         /// <summary>
         /// Makes the asynchronous HTTP request.
         /// </summary>
@@ -171,7 +171,7 @@ namespace {{packageName}}.Client
                 pathParams, contentType);
             var response = await RestClient.ExecuteTaskAsync(request);
             return (Object)response;
-        }
+        }{{/supportsAsync}}
     
         /// <summary>
         /// Escape string (url-encoded).
@@ -367,7 +367,7 @@ namespace {{packageName}}.Client
         /// <param name="source">Object to be casted</param>
         /// <param name="dest">Target type</param>
         /// <returns>Casted object</returns>
-        public static dynamic ConvertType(dynamic source, Type dest)
+        {{#supportsAsync}}public static dynamic ConvertType(dynamic source, Type dest){{/supportsAsync}}{{^supportsAsync}}public static object ConvertType<T>(T source, Type dest) where T : class{{/supportsAsync}}
         {
             return Convert.ChangeType(source, dest);
         }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
index 09dbd0dce50..8e56fb31f43 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
@@ -17,7 +17,7 @@ namespace {{packageName}}.Client
         /// Gets or sets the error content (body json object)
         /// </summary>
         /// <value>The error content (Http response body).</value>
-        public dynamic ErrorContent { get; private set; }
+        public {{#supportsAsync}}dynamic{{/supportsAsync}}{{^supportsAsync}}object{{/supportsAsync}} ErrorContent { get; private set; }
   
         /// <summary>
         /// Initializes a new instance of the <see cref="ApiException"/> class.
@@ -40,7 +40,7 @@ namespace {{packageName}}.Client
         /// <param name="errorCode">HTTP status code.</param>
         /// <param name="message">Error message.</param>
         /// <param name="errorContent">Error content.</param>
-        public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message)
+        public ApiException(int errorCode, string message, {{#supportsAsync}}dynamic{{/supportsAsync}}{{^supportsAsync}}object{{/supportsAsync}} errorContent = null) : base(message)
         {
             this.ErrorCode = errorCode;
             this.ErrorContent = errorContent;
diff --git a/modules/swagger-codegen/src/main/resources/csharp/AssemblyInfo.mustache b/modules/swagger-codegen/src/main/resources/csharp/AssemblyInfo.mustache
index 8a19fd01393..bf80d7d4568 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/AssemblyInfo.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/AssemblyInfo.mustache
@@ -1,6 +1,5 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Windows;
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
diff --git a/modules/swagger-codegen/src/main/resources/csharp/Newtonsoft.Json.dll b/modules/swagger-codegen/src/main/resources/csharp/Newtonsoft.Json.dll
deleted file mode 100644
index ae725c4b598..00000000000
Binary files a/modules/swagger-codegen/src/main/resources/csharp/Newtonsoft.Json.dll and /dev/null differ
diff --git a/modules/swagger-codegen/src/main/resources/csharp/Project.mustache b/modules/swagger-codegen/src/main/resources/csharp/Project.mustache
index 333cb5088ff..d418dc74f8b 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/Project.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/Project.mustache
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>{{packageTitle}}</RootNamespace>
     <AssemblyName>{{packageTitle}}</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>{{targetFramework}}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +41,10 @@
     <Reference Include="System.Xml" />
     <Reference Include="Newtonsoft.Json">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>{{binRelativePath}}Newtonsoft.Json.dll</HintPath>
+      <HintPath>{{binRelativePath}}/Newtonsoft.Json.8.0.2/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp">
-      <HintPath>{{binRelativePath}}RestSharp.dll</HintPath>
+      <HintPath>{{binRelativePath}}/RestSharp.105.2.3/lib/{{targetFrameworkNuget}}/RestSharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/modules/swagger-codegen/src/main/resources/csharp/README.md b/modules/swagger-codegen/src/main/resources/csharp/README.md
index 3ce83da957b..794a7c49b1b 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/README.md
+++ b/modules/swagger-codegen/src/main/resources/csharp/README.md
@@ -6,12 +6,14 @@
 - [RestSharp] (https://www.nuget.org/packages/RestSharp) - 105.1.0 or later
 - [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later 
 
-NOTE: The DLLs included in the package may not be the latest version. We recommned using [NuGet] (https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
+The DLLs included in the package may not be the latest version. We recommned using [NuGet] (https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
 ```
 Install-Package RestSharp
 Install-Package Newtonsoft.Json
 ```
 
+NOTE: RestSharp versions greater than 105.1.0 have a bug which causes file uploads to fail. See [RestSharp#742](https://github.com/restsharp/RestSharp/issues/742)
+
 ## Installation
 Run the following command to generate the DLL
 - [Mac/Linux] compile-mono.sh
diff --git a/modules/swagger-codegen/src/main/resources/csharp/RestSharp.dll b/modules/swagger-codegen/src/main/resources/csharp/RestSharp.dll
deleted file mode 100644
index a7331ed6e23..00000000000
Binary files a/modules/swagger-codegen/src/main/resources/csharp/RestSharp.dll and /dev/null differ
diff --git a/modules/swagger-codegen/src/main/resources/csharp/api.mustache b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
index b1a6a321c56..47139b52865 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
@@ -16,6 +16,7 @@ namespace {{packageName}}.Api
     /// </summary>
     public interface I{{classname}}
     {
+        #region Synchronous Operations
         {{#operation}}
         /// <summary>
         /// {{summary}}
@@ -36,7 +37,11 @@ namespace {{packageName}}.Api
         {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
         {{/allParams}}/// <returns>ApiResponse of {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Object(void){{/returnType}}</returns>
         ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> {{operationId}}WithHttpInfo ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = null{{/optionalMethodArgument}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-
+        {{/operation}}
+        #endregion Synchronous Operations
+        {{#supportsAsync}}
+        #region Asynchronous Operations
+        {{#operation}}
         /// <summary>
         /// {{summary}}
         /// </summary>
@@ -57,6 +62,8 @@ namespace {{packageName}}.Api
         {{/allParams}}/// <returns>Task of ApiResponse{{#returnType}} ({{returnType}}){{/returnType}}</returns>
         System.Threading.Tasks.Task<ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}>> {{operationId}}AsyncWithHttpInfo ({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{#optionalMethodArgument}} = null{{/optionalMethodArgument}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
         {{/operation}}
+        #endregion Asynchronous Operations
+        {{/supportsAsync}}
     }
   
     /// <summary>
@@ -245,7 +252,8 @@ namespace {{packageName}}.Api
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);{{/returnType}}
         }
-    
+
+        {{#supportsAsync}}
         /// <summary>
         /// {{summary}} {{notes}}
         /// </summary>
@@ -349,7 +357,7 @@ namespace {{packageName}}.Api
             {{^returnType}}return new ApiResponse<Object>(statusCode,
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);{{/returnType}}
-        }
+        }{{/supportsAsync}}
         {{/operation}}
     }
     {{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache b/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
index b84363cae39..b1b0c4f0c73 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache
@@ -1,10 +1,17 @@
 #!/usr/bin/env bash
+frameworkVersion={{targetFrameworkNuget}}
+netfx=${frameworkVersion#net}
+
 wget -nc https://nuget.org/nuget.exe;
 mozroots --import --sync
 mono nuget.exe install vendor/packages.config -o vendor;
 mkdir -p bin;
-mcs -sdk:45 -r:vendor/Newtonsoft.Json.8.0.2/lib/net45/Newtonsoft.Json.dll,\
-vendor/RestSharp.105.2.3/lib/net45/RestSharp.dll,\
+
+cp vendor/Newtonsoft.Json.8.0.2/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
+cp vendor/RestSharp.105.1.0/lib/{{targetFrameworkNuget}}/RestSharp.dll bin/RestSharp.dll;
+
+mcs -sdk:${netfx} -r:bin/Newtonsoft.Json.dll,\
+bin/RestSharp.dll,\
 System.Runtime.Serialization.dll \
 -target:library \
 -out:bin/{{packageName}}.dll \
diff --git a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
index e35879e0efa..6014320b2f7 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
@@ -1,3 +1,12 @@
-SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
-%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll;bin/RestSharp.dll /target:library /out:bin/{{packageName}}.dll /recurse:src\*.cs /doc:bin/{{packageName}}.xml
+@echo off
+
+{{#supportsAsync}}SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319{{/supportsAsync}}
+{{^supportsAsync}}SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v3.5{{/supportsAsync}}
+
+if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient).DownloadFile('https://nuget.org/nuget.exe', '.\nuget.exe')"
+.\nuget.exe install vendor/packages.config -o vendor
 
+cp vendor/Newtonsoft.Json.8.0.2/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll
+cp vendor/RestSharp.105.1.0/lib/{{targetFrameworkNuget}}/RestSharp.dll bin/RestSharp.dll
+
+%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll;bin/RestSharp.dll /target:library /out:bin/{{packageName}}.dll /recurse:src\*.cs /doc:bin/{{packageName}}.xml
diff --git a/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache b/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache
index c87bbb79fa6..bd4428e687e 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="RestSharp" version="105.2.3" targetFramework="net45" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" developmentDependency="true" />
+  <package id="RestSharp" version="105.1.0" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
+  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="{{targetFrameworkNuget}}" developmentDependency="true" />
 </packages>
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java
index f7abe83f8f4..ce810faea8b 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/CSharpClientOptionsProvider.java
@@ -31,6 +31,7 @@ public Map<String, String> createOptions() {
                 .put(CodegenConstants.RETURN_ICOLLECTION, "false")
                 .put(CodegenConstants.OPTIONAL_PROJECT_FILE, "true")
                 .put(CodegenConstants.OPTIONAL_PROJECT_GUID, PACKAGE_GUID_VALUE)
+                .put(CodegenConstants.DOTNET_FRAMEWORK, "4.x")
                 .build();
     }
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/.gitignore b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/.gitignore
new file mode 100644
index 00000000000..08d9d469ba8
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/.gitignore
@@ -0,0 +1,2 @@
+vendor/Newtonsoft.Json.8.0.2/
+vendor/RestSharp.105.2.3/
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/Newtonsoft.Json.dll b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/Newtonsoft.Json.dll
index ae725c4b598..4d42dd9c5fe 100644
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/Newtonsoft.Json.dll and b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/Newtonsoft.Json.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/RestSharp.dll b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/RestSharp.dll
index a7331ed6e23..59d82f94198 100644
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/RestSharp.dll and b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/bin/RestSharp.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh
index 67bc67e57a8..d768c892f31 100755
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile-mono.sh
@@ -1,10 +1,17 @@
 #!/usr/bin/env bash
+frameworkVersion=net45
+netfx=${frameworkVersion#net}
+
 wget -nc https://nuget.org/nuget.exe;
 mozroots --import --sync
 mono nuget.exe install vendor/packages.config -o vendor;
 mkdir -p bin;
-mcs -sdk:45 -r:vendor/Newtonsoft.Json.8.0.2/lib/net45/Newtonsoft.Json.dll,\
-vendor/RestSharp.105.2.3/lib/net45/RestSharp.dll,\
+
+cp vendor/Newtonsoft.Json.8.0.2/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll;
+cp vendor/RestSharp.105.1.0/lib/net45/RestSharp.dll bin/RestSharp.dll;
+
+mcs -sdk:${netfx} -r:bin/Newtonsoft.Json.dll,\
+bin/RestSharp.dll,\
 System.Runtime.Serialization.dll \
 -target:library \
 -out:bin/IO.Swagger.dll \
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile.bat b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile.bat
index 90963356690..27681fc968d 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile.bat
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/compile.bat
@@ -1,3 +1,12 @@
+@echo off
+
 SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
-%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll;bin/RestSharp.dll /target:library /out:bin/IO.Swagger.dll /recurse:src\*.cs /doc:bin/IO.Swagger.xml
 
+
+if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient).DownloadFile('https://nuget.org/nuget.exe', '.\nuget.exe')"
+.\nuget.exe install vendor/packages.config -o vendor
+
+cp vendor/Newtonsoft.Json.8.0.2/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll
+cp vendor/RestSharp.105.1.0/lib/net45/RestSharp.dll bin/RestSharp.dll
+
+%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll;bin/RestSharp.dll /target:library /out:bin/IO.Swagger.dll /recurse:src\*.cs /doc:bin/IO.Swagger.xml
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
index 96f6b3a4d0f..27c73638479 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
@@ -15,6 +15,7 @@ namespace IO.Swagger.Api
     /// </summary>
     public interface IPetApi
     {
+        #region Synchronous Operations
         
         /// <summary>
         /// Update an existing pet
@@ -35,87 +36,241 @@ public interface IPetApi
         /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdatePetWithHttpInfo (Pet body = null);
-
+        
         /// <summary>
-        /// Update an existing pet
+        /// Add a new pet to the store
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <param name="body">Pet object that needs to be added to the store</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task UpdatePetAsync (Pet body = null);
-
+        /// <returns></returns>
+        void AddPet (Pet body = null);
+  
         /// <summary>
-        /// Update an existing pet
+        /// Add a new pet to the store
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <param name="body">Pet object that needs to be added to the store</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetAsyncWithHttpInfo (Pet body = null);
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> AddPetWithHttpInfo (Pet body = null);
         
         /// <summary>
-        /// Add a new pet to the store
+        /// Finds Pets by status
+        /// </summary>
+        /// <remarks>
+        /// Multiple status values can be provided with comma seperated strings
+        /// </remarks>
+        /// <param name="status">Status values that need to be considered for filter</param>
+        /// <returns>List&lt;Pet&gt;</returns>
+        List<Pet> FindPetsByStatus (List<string> status = null);
+  
+        /// <summary>
+        /// Finds Pets by status
+        /// </summary>
+        /// <remarks>
+        /// Multiple status values can be provided with comma seperated strings
+        /// </remarks>
+        /// <param name="status">Status values that need to be considered for filter</param>
+        /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
+        ApiResponse<List<Pet>> FindPetsByStatusWithHttpInfo (List<string> status = null);
+        
+        /// <summary>
+        /// Finds Pets by tags
+        /// </summary>
+        /// <remarks>
+        /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </remarks>
+        /// <param name="tags">Tags to filter by</param>
+        /// <returns>List&lt;Pet&gt;</returns>
+        List<Pet> FindPetsByTags (List<string> tags = null);
+  
+        /// <summary>
+        /// Finds Pets by tags
+        /// </summary>
+        /// <remarks>
+        /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </remarks>
+        /// <param name="tags">Tags to filter by</param>
+        /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
+        ApiResponse<List<Pet>> FindPetsByTagsWithHttpInfo (List<string> tags = null);
+        
+        /// <summary>
+        /// Find pet by ID
+        /// </summary>
+        /// <remarks>
+        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </remarks>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Pet</returns>
+        Pet GetPetById (long? petId);
+  
+        /// <summary>
+        /// Find pet by ID
+        /// </summary>
+        /// <remarks>
+        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </remarks>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>ApiResponse of Pet</returns>
+        ApiResponse<Pet> GetPetByIdWithHttpInfo (long? petId);
+        
+        /// <summary>
+        /// Updates a pet in the store with form data
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <param name="petId">ID of pet that needs to be updated</param>
+        /// <param name="name">Updated name of the pet</param>
+        /// <param name="status">Updated status of the pet</param>
         /// <returns></returns>
-        void AddPet (Pet body = null);
+        void UpdatePetWithForm (string petId, string name = null, string status = null);
   
         /// <summary>
-        /// Add a new pet to the store
+        /// Updates a pet in the store with form data
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <param name="petId">ID of pet that needs to be updated</param>
+        /// <param name="name">Updated name of the pet</param>
+        /// <param name="status">Updated status of the pet</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> AddPetWithHttpInfo (Pet body = null);
-
+        ApiResponse<Object> UpdatePetWithFormWithHttpInfo (string petId, string name = null, string status = null);
+        
         /// <summary>
-        /// Add a new pet to the store
+        /// Deletes a pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <param name="petId">Pet id to delete</param>
+        /// <param name="apiKey"></param>
+        /// <returns></returns>
+        void DeletePet (long? petId, string apiKey = null);
+  
+        /// <summary>
+        /// Deletes a pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <param name="petId">Pet id to delete</param>
+        /// <param name="apiKey"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> DeletePetWithHttpInfo (long? petId, string apiKey = null);
+        
+        /// <summary>
+        /// uploads an image
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <param name="petId">ID of pet to update</param>
+        /// <param name="additionalMetadata">Additional data to pass to server</param>
+        /// <param name="file">file to upload</param>
+        /// <returns></returns>
+        void UploadFile (long? petId, string additionalMetadata = null, Stream file = null);
+  
+        /// <summary>
+        /// uploads an image
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <param name="petId">ID of pet to update</param>
+        /// <param name="additionalMetadata">Additional data to pass to server</param>
+        /// <param name="file">file to upload</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UploadFileWithHttpInfo (long? petId, string additionalMetadata = null, Stream file = null);
+        
+        /// <summary>
+        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </remarks>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>byte[]</returns>
+        byte[] GetPetByIdWithByteArray (long? petId);
+  
+        /// <summary>
+        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
+        /// </summary>
+        /// <remarks>
+        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </remarks>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>ApiResponse of byte[]</returns>
+        ApiResponse<byte[]> GetPetByIdWithByteArrayWithHttpInfo (long? petId);
+        
+        /// <summary>
+        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <param name="body">Pet object in the form of byte array</param>
+        /// <returns></returns>
+        void AddPetUsingByteArray (byte[] body = null);
+  
+        /// <summary>
+        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <param name="body">Pet object in the form of byte array</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> AddPetUsingByteArrayWithHttpInfo (byte[] body = null);
+        
+        #endregion Synchronous Operations
+        
+        #region Asynchronous Operations
+        
+        /// <summary>
+        /// Update an existing pet
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task AddPetAsync (Pet body = null);
+        System.Threading.Tasks.Task UpdatePetAsync (Pet body = null);
 
         /// <summary>
-        /// Add a new pet to the store
+        /// Update an existing pet
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <param name="body">Pet object that needs to be added to the store</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> AddPetAsyncWithHttpInfo (Pet body = null);
+        System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetAsyncWithHttpInfo (Pet body = null);
         
         /// <summary>
-        /// Finds Pets by status
+        /// Add a new pet to the store
         /// </summary>
         /// <remarks>
-        /// Multiple status values can be provided with comma seperated strings
+        /// 
         /// </remarks>
-        /// <param name="status">Status values that need to be considered for filter</param>
-        /// <returns>List&lt;Pet&gt;</returns>
-        List<Pet> FindPetsByStatus (List<string> status = null);
-  
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task AddPetAsync (Pet body = null);
+
         /// <summary>
-        /// Finds Pets by status
+        /// Add a new pet to the store
         /// </summary>
         /// <remarks>
-        /// Multiple status values can be provided with comma seperated strings
+        /// 
         /// </remarks>
-        /// <param name="status">Status values that need to be considered for filter</param>
-        /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
-        ApiResponse<List<Pet>> FindPetsByStatusWithHttpInfo (List<string> status = null);
-
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> AddPetAsyncWithHttpInfo (Pet body = null);
+        
         /// <summary>
         /// Finds Pets by status
         /// </summary>
@@ -136,26 +291,6 @@ public interface IPetApi
         /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
         System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByStatusAsyncWithHttpInfo (List<string> status = null);
         
-        /// <summary>
-        /// Finds Pets by tags
-        /// </summary>
-        /// <remarks>
-        /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-        /// </remarks>
-        /// <param name="tags">Tags to filter by</param>
-        /// <returns>List&lt;Pet&gt;</returns>
-        List<Pet> FindPetsByTags (List<string> tags = null);
-  
-        /// <summary>
-        /// Finds Pets by tags
-        /// </summary>
-        /// <remarks>
-        /// Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-        /// </remarks>
-        /// <param name="tags">Tags to filter by</param>
-        /// <returns>ApiResponse of List&lt;Pet&gt;</returns>
-        ApiResponse<List<Pet>> FindPetsByTagsWithHttpInfo (List<string> tags = null);
-
         /// <summary>
         /// Finds Pets by tags
         /// </summary>
@@ -176,26 +311,6 @@ public interface IPetApi
         /// <returns>Task of ApiResponse (List&lt;Pet&gt;)</returns>
         System.Threading.Tasks.Task<ApiResponse<List<Pet>>> FindPetsByTagsAsyncWithHttpInfo (List<string> tags = null);
         
-        /// <summary>
-        /// Find pet by ID
-        /// </summary>
-        /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </remarks>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>Pet</returns>
-        Pet GetPetById (long? petId);
-  
-        /// <summary>
-        /// Find pet by ID
-        /// </summary>
-        /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </remarks>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>ApiResponse of Pet</returns>
-        ApiResponse<Pet> GetPetByIdWithHttpInfo (long? petId);
-
         /// <summary>
         /// Find pet by ID
         /// </summary>
@@ -216,30 +331,6 @@ public interface IPetApi
         /// <returns>Task of ApiResponse (Pet)</returns>
         System.Threading.Tasks.Task<ApiResponse<Pet>> GetPetByIdAsyncWithHttpInfo (long? petId);
         
-        /// <summary>
-        /// Updates a pet in the store with form data
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">ID of pet that needs to be updated</param>
-        /// <param name="name">Updated name of the pet</param>
-        /// <param name="status">Updated status of the pet</param>
-        /// <returns></returns>
-        void UpdatePetWithForm (string petId, string name = null, string status = null);
-  
-        /// <summary>
-        /// Updates a pet in the store with form data
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">ID of pet that needs to be updated</param>
-        /// <param name="name">Updated name of the pet</param>
-        /// <param name="status">Updated status of the pet</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UpdatePetWithFormWithHttpInfo (string petId, string name = null, string status = null);
-
         /// <summary>
         /// Updates a pet in the store with form data
         /// </summary>
@@ -264,28 +355,6 @@ public interface IPetApi
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdatePetWithFormAsyncWithHttpInfo (string petId, string name = null, string status = null);
         
-        /// <summary>
-        /// Deletes a pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">Pet id to delete</param>
-        /// <param name="apiKey"></param>
-        /// <returns></returns>
-        void DeletePet (long? petId, string apiKey = null);
-  
-        /// <summary>
-        /// Deletes a pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">Pet id to delete</param>
-        /// <param name="apiKey"></param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> DeletePetWithHttpInfo (long? petId, string apiKey = null);
-
         /// <summary>
         /// Deletes a pet
         /// </summary>
@@ -308,30 +377,6 @@ public interface IPetApi
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeletePetAsyncWithHttpInfo (long? petId, string apiKey = null);
         
-        /// <summary>
-        /// uploads an image
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server</param>
-        /// <param name="file">file to upload</param>
-        /// <returns></returns>
-        void UploadFile (long? petId, string additionalMetadata = null, Stream file = null);
-  
-        /// <summary>
-        /// uploads an image
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="petId">ID of pet to update</param>
-        /// <param name="additionalMetadata">Additional data to pass to server</param>
-        /// <param name="file">file to upload</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UploadFileWithHttpInfo (long? petId, string additionalMetadata = null, Stream file = null);
-
         /// <summary>
         /// uploads an image
         /// </summary>
@@ -356,26 +401,6 @@ public interface IPetApi
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UploadFileAsyncWithHttpInfo (long? petId, string additionalMetadata = null, Stream file = null);
         
-        /// <summary>
-        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </remarks>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>byte[]</returns>
-        byte[] GetPetByIdWithByteArray (long? petId);
-  
-        /// <summary>
-        /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
-        /// </summary>
-        /// <remarks>
-        /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-        /// </remarks>
-        /// <param name="petId">ID of pet that needs to be fetched</param>
-        /// <returns>ApiResponse of byte[]</returns>
-        ApiResponse<byte[]> GetPetByIdWithByteArrayWithHttpInfo (long? petId);
-
         /// <summary>
         /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39;
         /// </summary>
@@ -396,26 +421,6 @@ public interface IPetApi
         /// <returns>Task of ApiResponse (byte[])</returns>
         System.Threading.Tasks.Task<ApiResponse<byte[]>> GetPetByIdWithByteArrayAsyncWithHttpInfo (long? petId);
         
-        /// <summary>
-        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">Pet object in the form of byte array</param>
-        /// <returns></returns>
-        void AddPetUsingByteArray (byte[] body = null);
-  
-        /// <summary>
-        /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">Pet object in the form of byte array</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> AddPetUsingByteArrayWithHttpInfo (byte[] body = null);
-
         /// <summary>
         /// Fake endpoint to test byte array in body parameter for adding a new pet to the store
         /// </summary>
@@ -436,6 +441,8 @@ public interface IPetApi
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> AddPetUsingByteArrayAsyncWithHttpInfo (byte[] body = null);
         
+        #endregion Asynchronous Operations
+        
     }
   
     /// <summary>
@@ -598,7 +605,8 @@ public ApiResponse<Object> UpdatePetWithHttpInfo (Pet body = null)
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Update an existing pet 
         /// </summary>
@@ -764,7 +772,8 @@ public ApiResponse<Object> AddPetWithHttpInfo (Pet body = null)
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Add a new pet to the store 
         /// </summary>
@@ -925,7 +934,8 @@ public ApiResponse< List<Pet> > FindPetsByStatusWithHttpInfo (List<string> statu
                 (List<Pet>) Configuration.ApiClient.Deserialize(response, typeof(List<Pet>)));
             
         }
-    
+
+        
         /// <summary>
         /// Finds Pets by status Multiple status values can be provided with comma seperated strings
         /// </summary>
@@ -1087,7 +1097,8 @@ public ApiResponse< List<Pet> > FindPetsByTagsWithHttpInfo (List<string> tags =
                 (List<Pet>) Configuration.ApiClient.Deserialize(response, typeof(List<Pet>)));
             
         }
-    
+
+        
         /// <summary>
         /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
         /// </summary>
@@ -1253,7 +1264,8 @@ public ApiResponse< Pet > GetPetByIdWithHttpInfo (long? petId)
                 (Pet) Configuration.ApiClient.Deserialize(response, typeof(Pet)));
             
         }
-    
+
+        
         /// <summary>
         /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
         /// </summary>
@@ -1426,7 +1438,8 @@ public ApiResponse<Object> UpdatePetWithFormWithHttpInfo (string petId, string n
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Updates a pet in the store with form data 
         /// </summary>
@@ -1601,7 +1614,8 @@ public ApiResponse<Object> DeletePetWithHttpInfo (long? petId, string apiKey = n
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Deletes a pet 
         /// </summary>
@@ -1776,7 +1790,8 @@ public ApiResponse<Object> UploadFileWithHttpInfo (long? petId, string additiona
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// uploads an image 
         /// </summary>
@@ -1949,7 +1964,8 @@ public ApiResponse< byte[] > GetPetByIdWithByteArrayWithHttpInfo (long? petId)
                 (byte[]) Configuration.ApiClient.Deserialize(response, typeof(byte[])));
             
         }
-    
+
+        
         /// <summary>
         /// Fake endpoint to test byte array return by &#39;Find pet by ID&#39; Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
         /// </summary>
@@ -2118,7 +2134,8 @@ public ApiResponse<Object> AddPetUsingByteArrayWithHttpInfo (byte[] body = null)
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Fake endpoint to test byte array in body parameter for adding a new pet to the store 
         /// </summary>
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
index ca876a043db..2646ef0619a 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
@@ -15,6 +15,7 @@ namespace IO.Swagger.Api
     /// </summary>
     public interface IStoreApi
     {
+        #region Synchronous Operations
         
         /// <summary>
         /// Returns pet inventories by status
@@ -33,24 +34,6 @@ public interface IStoreApi
         /// </remarks>
         /// <returns>ApiResponse of Dictionary&lt;string, int?&gt;</returns>
         ApiResponse<Dictionary<string, int?>> GetInventoryWithHttpInfo ();
-
-        /// <summary>
-        /// Returns pet inventories by status
-        /// </summary>
-        /// <remarks>
-        /// Returns a map of status codes to quantities
-        /// </remarks>
-        /// <returns>Task of Dictionary&lt;string, int?&gt;</returns>
-        System.Threading.Tasks.Task<Dictionary<string, int?>> GetInventoryAsync ();
-
-        /// <summary>
-        /// Returns pet inventories by status
-        /// </summary>
-        /// <remarks>
-        /// Returns a map of status codes to quantities
-        /// </remarks>
-        /// <returns>Task of ApiResponse (Dictionary&lt;string, int?&gt;)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Dictionary<string, int?>>> GetInventoryAsyncWithHttpInfo ();
         
         /// <summary>
         /// Place an order for a pet
@@ -71,26 +54,6 @@ public interface IStoreApi
         /// <param name="body">order placed for purchasing the pet</param>
         /// <returns>ApiResponse of Order</returns>
         ApiResponse<Order> PlaceOrderWithHttpInfo (Order body = null);
-
-        /// <summary>
-        /// Place an order for a pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">order placed for purchasing the pet</param>
-        /// <returns>Task of Order</returns>
-        System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body = null);
-
-        /// <summary>
-        /// Place an order for a pet
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="body">order placed for purchasing the pet</param>
-        /// <returns>Task of ApiResponse (Order)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Order>> PlaceOrderAsyncWithHttpInfo (Order body = null);
         
         /// <summary>
         /// Find purchase order by ID
@@ -111,26 +74,6 @@ public interface IStoreApi
         /// <param name="orderId">ID of pet that needs to be fetched</param>
         /// <returns>ApiResponse of Order</returns>
         ApiResponse<Order> GetOrderByIdWithHttpInfo (string orderId);
-
-        /// <summary>
-        /// Find purchase order by ID
-        /// </summary>
-        /// <remarks>
-        /// For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-        /// </remarks>
-        /// <param name="orderId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of Order</returns>
-        System.Threading.Tasks.Task<Order> GetOrderByIdAsync (string orderId);
-
-        /// <summary>
-        /// Find purchase order by ID
-        /// </summary>
-        /// <remarks>
-        /// For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
-        /// </remarks>
-        /// <param name="orderId">ID of pet that needs to be fetched</param>
-        /// <returns>Task of ApiResponse (Order)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Order>> GetOrderByIdAsyncWithHttpInfo (string orderId);
         
         /// <summary>
         /// Delete purchase order by ID
@@ -151,7 +94,69 @@ public interface IStoreApi
         /// <param name="orderId">ID of the order that needs to be deleted</param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> DeleteOrderWithHttpInfo (string orderId);
+        
+        #endregion Synchronous Operations
+        
+        #region Asynchronous Operations
+        
+        /// <summary>
+        /// Returns pet inventories by status
+        /// </summary>
+        /// <remarks>
+        /// Returns a map of status codes to quantities
+        /// </remarks>
+        /// <returns>Task of Dictionary&lt;string, int?&gt;</returns>
+        System.Threading.Tasks.Task<Dictionary<string, int?>> GetInventoryAsync ();
 
+        /// <summary>
+        /// Returns pet inventories by status
+        /// </summary>
+        /// <remarks>
+        /// Returns a map of status codes to quantities
+        /// </remarks>
+        /// <returns>Task of ApiResponse (Dictionary&lt;string, int?&gt;)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Dictionary<string, int?>>> GetInventoryAsyncWithHttpInfo ();
+        
+        /// <summary>
+        /// Place an order for a pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <param name="body">order placed for purchasing the pet</param>
+        /// <returns>Task of Order</returns>
+        System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body = null);
+
+        /// <summary>
+        /// Place an order for a pet
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <param name="body">order placed for purchasing the pet</param>
+        /// <returns>Task of ApiResponse (Order)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Order>> PlaceOrderAsyncWithHttpInfo (Order body = null);
+        
+        /// <summary>
+        /// Find purchase order by ID
+        /// </summary>
+        /// <remarks>
+        /// For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </remarks>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of Order</returns>
+        System.Threading.Tasks.Task<Order> GetOrderByIdAsync (string orderId);
+
+        /// <summary>
+        /// Find purchase order by ID
+        /// </summary>
+        /// <remarks>
+        /// For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+        /// </remarks>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>Task of ApiResponse (Order)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Order>> GetOrderByIdAsyncWithHttpInfo (string orderId);
+        
         /// <summary>
         /// Delete purchase order by ID
         /// </summary>
@@ -172,6 +177,8 @@ public interface IStoreApi
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeleteOrderAsyncWithHttpInfo (string orderId);
         
+        #endregion Asynchronous Operations
+        
     }
   
     /// <summary>
@@ -326,7 +333,8 @@ public void AddDefaultHeader(string key, string value)
                 (Dictionary<string, int?>) Configuration.ApiClient.Deserialize(response, typeof(Dictionary<string, int?>)));
             
         }
-    
+
+        
         /// <summary>
         /// Returns pet inventories by status Returns a map of status codes to quantities
         /// </summary>
@@ -484,7 +492,8 @@ public ApiResponse< Order > PlaceOrderWithHttpInfo (Order body = null)
                 (Order) Configuration.ApiClient.Deserialize(response, typeof(Order)));
             
         }
-    
+
+        
         /// <summary>
         /// Place an order for a pet 
         /// </summary>
@@ -635,7 +644,8 @@ public ApiResponse< Order > GetOrderByIdWithHttpInfo (string orderId)
                 (Order) Configuration.ApiClient.Deserialize(response, typeof(Order)));
             
         }
-    
+
+        
         /// <summary>
         /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
         /// </summary>
@@ -787,7 +797,8 @@ public ApiResponse<Object> DeleteOrderWithHttpInfo (string orderId)
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
         /// </summary>
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
index 168ce373ef9..b97bb313873 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
@@ -15,6 +15,7 @@ namespace IO.Swagger.Api
     /// </summary>
     public interface IUserApi
     {
+        #region Synchronous Operations
         
         /// <summary>
         /// Create user
@@ -35,26 +36,26 @@ public interface IUserApi
         /// <param name="body">Created user object</param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> CreateUserWithHttpInfo (User body = null);
-
+        
         /// <summary>
-        /// Create user
+        /// Creates list of users with given input array
         /// </summary>
         /// <remarks>
-        /// This can only be done by the logged in user.
+        /// 
         /// </remarks>
-        /// <param name="body">Created user object</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task CreateUserAsync (User body = null);
-
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        void CreateUsersWithArrayInput (List<User> body = null);
+  
         /// <summary>
-        /// Create user
+        /// Creates list of users with given input array
         /// </summary>
         /// <remarks>
-        /// This can only be done by the logged in user.
+        /// 
         /// </remarks>
-        /// <param name="body">Created user object</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUserAsyncWithHttpInfo (User body = null);
+        /// <param name="body">List of user object</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> CreateUsersWithArrayInputWithHttpInfo (List<User> body = null);
         
         /// <summary>
         /// Creates list of users with given input array
@@ -64,7 +65,7 @@ public interface IUserApi
         /// </remarks>
         /// <param name="body">List of user object</param>
         /// <returns></returns>
-        void CreateUsersWithArrayInput (List<User> body = null);
+        void CreateUsersWithListInput (List<User> body = null);
   
         /// <summary>
         /// Creates list of users with given input array
@@ -74,48 +75,134 @@ public interface IUserApi
         /// </remarks>
         /// <param name="body">List of user object</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> CreateUsersWithArrayInputWithHttpInfo (List<User> body = null);
-
+        ApiResponse<Object> CreateUsersWithListInputWithHttpInfo (List<User> body = null);
+        
         /// <summary>
-        /// Creates list of users with given input array
+        /// Logs user into the system
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">List of user object</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List<User> body = null);
-
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
+        /// <returns>string</returns>
+        string LoginUser (string username = null, string password = null);
+  
         /// <summary>
-        /// Creates list of users with given input array
+        /// Logs user into the system
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">List of user object</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithArrayInputAsyncWithHttpInfo (List<User> body = null);
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
+        /// <returns>ApiResponse of string</returns>
+        ApiResponse<string> LoginUserWithHttpInfo (string username = null, string password = null);
         
         /// <summary>
-        /// Creates list of users with given input array
+        /// Logs out current logged in user session
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">List of user object</param>
         /// <returns></returns>
-        void CreateUsersWithListInput (List<User> body = null);
+        void LogoutUser ();
   
         /// <summary>
-        /// Creates list of users with given input array
+        /// Logs out current logged in user session
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="body">List of user object</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> CreateUsersWithListInputWithHttpInfo (List<User> body = null);
+        ApiResponse<Object> LogoutUserWithHttpInfo ();
+        
+        /// <summary>
+        /// Get user by user name
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
+        /// <returns>User</returns>
+        User GetUserByName (string username);
+  
+        /// <summary>
+        /// Get user by user name
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
+        /// <returns>ApiResponse of User</returns>
+        ApiResponse<User> GetUserByNameWithHttpInfo (string username);
+        
+        /// <summary>
+        /// Updated user
+        /// </summary>
+        /// <remarks>
+        /// This can only be done by the logged in user.
+        /// </remarks>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object</param>
+        /// <returns></returns>
+        void UpdateUser (string username, User body = null);
+  
+        /// <summary>
+        /// Updated user
+        /// </summary>
+        /// <remarks>
+        /// This can only be done by the logged in user.
+        /// </remarks>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UpdateUserWithHttpInfo (string username, User body = null);
+        
+        /// <summary>
+        /// Delete user
+        /// </summary>
+        /// <remarks>
+        /// This can only be done by the logged in user.
+        /// </remarks>
+        /// <param name="username">The name that needs to be deleted</param>
+        /// <returns></returns>
+        void DeleteUser (string username);
+  
+        /// <summary>
+        /// Delete user
+        /// </summary>
+        /// <remarks>
+        /// This can only be done by the logged in user.
+        /// </remarks>
+        /// <param name="username">The name that needs to be deleted</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> DeleteUserWithHttpInfo (string username);
+        
+        #endregion Synchronous Operations
+        
+        #region Asynchronous Operations
+        
+        /// <summary>
+        /// Create user
+        /// </summary>
+        /// <remarks>
+        /// This can only be done by the logged in user.
+        /// </remarks>
+        /// <param name="body">Created user object</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task CreateUserAsync (User body = null);
 
+        /// <summary>
+        /// Create user
+        /// </summary>
+        /// <remarks>
+        /// This can only be done by the logged in user.
+        /// </remarks>
+        /// <param name="body">Created user object</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUserAsyncWithHttpInfo (User body = null);
+        
         /// <summary>
         /// Creates list of users with given input array
         /// </summary>
@@ -124,7 +211,7 @@ public interface IUserApi
         /// </remarks>
         /// <param name="body">List of user object</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task CreateUsersWithListInputAsync (List<User> body = null);
+        System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List<User> body = null);
 
         /// <summary>
         /// Creates list of users with given input array
@@ -134,30 +221,28 @@ public interface IUserApi
         /// </remarks>
         /// <param name="body">List of user object</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithListInputAsyncWithHttpInfo (List<User> body = null);
+        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithArrayInputAsyncWithHttpInfo (List<User> body = null);
         
         /// <summary>
-        /// Logs user into the system
+        /// Creates list of users with given input array
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="username">The user name for login</param>
-        /// <param name="password">The password for login in clear text</param>
-        /// <returns>string</returns>
-        string LoginUser (string username = null, string password = null);
-  
+        /// <param name="body">List of user object</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task CreateUsersWithListInputAsync (List<User> body = null);
+
         /// <summary>
-        /// Logs user into the system
+        /// Creates list of users with given input array
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
-        /// <param name="username">The user name for login</param>
-        /// <param name="password">The password for login in clear text</param>
-        /// <returns>ApiResponse of string</returns>
-        ApiResponse<string> LoginUserWithHttpInfo (string username = null, string password = null);
-
+        /// <param name="body">List of user object</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> CreateUsersWithListInputAsyncWithHttpInfo (List<User> body = null);
+        
         /// <summary>
         /// Logs user into the system
         /// </summary>
@@ -180,24 +265,6 @@ public interface IUserApi
         /// <returns>Task of ApiResponse (string)</returns>
         System.Threading.Tasks.Task<ApiResponse<string>> LoginUserAsyncWithHttpInfo (string username = null, string password = null);
         
-        /// <summary>
-        /// Logs out current logged in user session
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <returns></returns>
-        void LogoutUser ();
-  
-        /// <summary>
-        /// Logs out current logged in user session
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> LogoutUserWithHttpInfo ();
-
         /// <summary>
         /// Logs out current logged in user session
         /// </summary>
@@ -216,26 +283,6 @@ public interface IUserApi
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> LogoutUserAsyncWithHttpInfo ();
         
-        /// <summary>
-        /// Get user by user name
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
-        /// <returns>User</returns>
-        User GetUserByName (string username);
-  
-        /// <summary>
-        /// Get user by user name
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
-        /// <returns>ApiResponse of User</returns>
-        ApiResponse<User> GetUserByNameWithHttpInfo (string username);
-
         /// <summary>
         /// Get user by user name
         /// </summary>
@@ -256,28 +303,6 @@ public interface IUserApi
         /// <returns>Task of ApiResponse (User)</returns>
         System.Threading.Tasks.Task<ApiResponse<User>> GetUserByNameAsyncWithHttpInfo (string username);
         
-        /// <summary>
-        /// Updated user
-        /// </summary>
-        /// <remarks>
-        /// This can only be done by the logged in user.
-        /// </remarks>
-        /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object</param>
-        /// <returns></returns>
-        void UpdateUser (string username, User body = null);
-  
-        /// <summary>
-        /// Updated user
-        /// </summary>
-        /// <remarks>
-        /// This can only be done by the logged in user.
-        /// </remarks>
-        /// <param name="username">name that need to be deleted</param>
-        /// <param name="body">Updated user object</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UpdateUserWithHttpInfo (string username, User body = null);
-
         /// <summary>
         /// Updated user
         /// </summary>
@@ -300,26 +325,6 @@ public interface IUserApi
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateUserAsyncWithHttpInfo (string username, User body = null);
         
-        /// <summary>
-        /// Delete user
-        /// </summary>
-        /// <remarks>
-        /// This can only be done by the logged in user.
-        /// </remarks>
-        /// <param name="username">The name that needs to be deleted</param>
-        /// <returns></returns>
-        void DeleteUser (string username);
-  
-        /// <summary>
-        /// Delete user
-        /// </summary>
-        /// <remarks>
-        /// This can only be done by the logged in user.
-        /// </remarks>
-        /// <param name="username">The name that needs to be deleted</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> DeleteUserWithHttpInfo (string username);
-
         /// <summary>
         /// Delete user
         /// </summary>
@@ -340,6 +345,8 @@ public interface IUserApi
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeleteUserAsyncWithHttpInfo (string username);
         
+        #endregion Asynchronous Operations
+        
     }
   
     /// <summary>
@@ -495,7 +502,8 @@ public ApiResponse<Object> CreateUserWithHttpInfo (User body = null)
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Create user This can only be done by the logged in user.
         /// </summary>
@@ -646,7 +654,8 @@ public ApiResponse<Object> CreateUsersWithArrayInputWithHttpInfo (List<User> bod
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
@@ -797,7 +806,8 @@ public ApiResponse<Object> CreateUsersWithListInputWithHttpInfo (List<User> body
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Creates list of users with given input array 
         /// </summary>
@@ -946,7 +956,8 @@ public ApiResponse< string > LoginUserWithHttpInfo (string username = null, stri
                 (string) Configuration.ApiClient.Deserialize(response, typeof(string)));
             
         }
-    
+
+        
         /// <summary>
         /// Logs user into the system 
         /// </summary>
@@ -1092,7 +1103,8 @@ public ApiResponse<Object> LogoutUserWithHttpInfo ()
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Logs out current logged in user session 
         /// </summary>
@@ -1239,7 +1251,8 @@ public ApiResponse< User > GetUserByNameWithHttpInfo (string username)
                 (User) Configuration.ApiClient.Deserialize(response, typeof(User)));
             
         }
-    
+
+        
         /// <summary>
         /// Get user by user name 
         /// </summary>
@@ -1400,7 +1413,8 @@ public ApiResponse<Object> UpdateUserWithHttpInfo (string username, User body =
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Updated user This can only be done by the logged in user.
         /// </summary>
@@ -1554,7 +1568,8 @@ public ApiResponse<Object> DeleteUserWithHttpInfo (string username)
                 response.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
                 null);
         }
-    
+
+        
         /// <summary>
         /// Delete user This can only be done by the logged in user.
         /// </summary>
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
index 9ff8b481e14..104911520a6 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
@@ -146,7 +146,7 @@ public Object CallApi(
             var response = RestClient.Execute(request);
             return (Object) response;
         }
-
+        
         /// <summary>
         /// Makes the asynchronous HTTP request.
         /// </summary>
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Properties/AssemblyInfo.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Properties/AssemblyInfo.cs
index 1de9edb2a81..f3b9f7d1d14 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Properties/AssemblyInfo.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Properties/AssemblyInfo.cs
@@ -1,6 +1,5 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Windows;
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config
index c87bbb79fa6..91f17cd0819 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/vendor/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="RestSharp" version="105.2.3" targetFramework="net45" developmentDependency="true" />
+  <package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" developmentDependency="true" />
 </packages>