diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
index 0ad05b0762b..34a8534c6cd 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -430,6 +430,12 @@ public Map<String, Object> processOperations(CodegenConfig config, String tag, L
         }
 
         operations.put("imports", imports);
+
+        // add a flag to indicate whether there's any {{import}}
+        if (imports.size() > 0) {
+            operations.put("hasImport", true);
+        }
+
         config.postProcessOperations(operations);
         if (objs.size() > 0) {
             List<CodegenOperation> os = (List<CodegenOperation>) objs.get("operation");
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 33ea13b5e31..5833d7287cc 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
@@ -37,6 +37,7 @@ public CSharpClientCodegen() {
 
         languageSpecificPrimitives = new HashSet<String>(
                 Arrays.asList(
+                        "String",
                         "string",
                         "bool?",
                         "double?",
@@ -53,6 +54,7 @@ public CSharpClientCodegen() {
                         "Integer",
                         "Long",
                         "Float",
+                        "Stream", // not really a primitive, we include it to avoid model import
                         "Object")
         );
         instantiationTypes.put("array", "List");
@@ -68,7 +70,7 @@ public CSharpClientCodegen() {
         typeMapping.put("number", "double?");
         typeMapping.put("datetime", "DateTime?");
         typeMapping.put("date", "DateTime?");
-        typeMapping.put("file", "string"); // path to file
+        typeMapping.put("file", "Stream");
         typeMapping.put("array", "List");
         typeMapping.put("list", "List");
         typeMapping.put("map", "Dictionary");
@@ -110,6 +112,7 @@ public void processOpts() {
         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("README.md", "", "README.md"));
 
     }
 
@@ -163,8 +166,24 @@ public String toVarName(String name) {
 
     @Override
     public String toParamName(String name) {
-        // should be the same as variable name
-        return toVarName(name);
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$")) {
+            return name;
+        }
+
+        // camelize(lower) the variable name
+        // pet_id => petId
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, append _
+        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
index c6f57bd4a37..45316e679fa 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
@@ -1,217 +1,337 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Text.RegularExpressions;
 using System.IO;
+using System.Web;
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 using RestSharp;
+using RestSharp.Extensions;
 
-namespace {{packageName}}.Client {
-  /// <summary>
-  /// API client is mainly responible for making the HTTP call to the API backend
-  /// </summary>
-  public class ApiClient {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiClient"/> class.
-    /// </summary>
-    /// <param name="basePath">The base path.</param>
-    public ApiClient(String basePath="{{basePath}}") {
-      this.basePath = basePath;
-      this.restClient = new RestClient(this.basePath);
-    }
-
-    /// <summary>
-    /// Gets or sets the base path.
-    /// </summary>
-    /// <value>The base path.</value> 
-    public string basePath { get; set; }
-
+namespace {{packageName}}.Client
+{
     /// <summary>
-    /// Gets or sets the RestClient
+    /// API client is mainly responible for making the HTTP call to the API backend.
     /// </summary>
-    /// <value>The RestClient.</value> 
-    public RestClient restClient { get; set; }
-
-    private Dictionary<String, String> defaultHeaderMap = new Dictionary<String, String>();
-
-    public Object CallApi(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, String> FileParams, String[] AuthSettings) {
-      var response = Task.Run(async () => {
-                            var resp = await CallApiAsync(Path, Method, QueryParams, PostBody, HeaderParams, FormParams, FileParams, AuthSettings);
-                            return resp;
-                            });
-        return response.Result;
-    }
-
-    public async Task<Object> CallApiAsync(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, String> FileParams, String[] AuthSettings) {
-
-      var request = new RestRequest(Path, Method);
+    public class ApiClient
+    {
+        private readonly Dictionary<String, String> _defaultHeaderMap = new Dictionary<String, String>();
+  
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiClient" /> class.
+        /// </summary>
+        /// <param name="basePath">The base path.</param>
+        public ApiClient(String basePath="{{basePath}}")
+        {
+            BasePath = basePath;
+            RestClient = new RestClient(BasePath);
+        }
+    
+        /// <summary>
+        /// Gets or sets the base path.
+        /// </summary>
+        /// <value>The base path</value>
+        public string BasePath { get; set; }
+    
+        /// <summary>
+        /// Gets or sets the RestClient.
+        /// </summary>
+        /// <value>An instance of the RestClient</value>
+        public RestClient RestClient { get; set; }
+    
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        public Dictionary<String, String> DefaultHeader
+        {
+            get { return _defaultHeaderMap; }
+        }
+    
+        /// <summary>
+        /// Makes the HTTP request (Sync).
+        /// </summary>
+        /// <param name="path">URL path.</param>
+        /// <param name="method">HTTP method.</param>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="postBody">HTTP body (POST request).</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="formParams">Form parameters.</param>
+        /// <param name="fileParams">File parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        /// <returns>Object</returns>
+        public Object CallApi(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams, 
+            Dictionary<String, FileParameter> fileParams, String[] authSettings)
+        {
 
-      UpdateParamsForAuth(QueryParams, HeaderParams, AuthSettings);
+            var request = new RestRequest(path, method);
+   
+            UpdateParamsForAuth(queryParams, headerParams, authSettings);
 
-      // add default header, if any
-      foreach(KeyValuePair<string, string> defaultHeader in this.defaultHeaderMap)
-        request.AddHeader(defaultHeader.Key, defaultHeader.Value);
+            // add default header, if any
+            foreach(var defaultHeader in _defaultHeaderMap)
+                request.AddHeader(defaultHeader.Key, defaultHeader.Value);
 
-      // add header parameter, if any
-      foreach(KeyValuePair<string, string> param in HeaderParams)
-        request.AddHeader(param.Key, param.Value);
-     
-      // add query parameter, if any
-      foreach(KeyValuePair<string, string> param in QueryParams)
-        request.AddQueryParameter(param.Key, param.Value);
+            // add header parameter, if any
+            foreach(var param in headerParams)
+                request.AddHeader(param.Key, param.Value);
 
-      // add form parameter, if any
-      foreach(KeyValuePair<string, string> param in FormParams)
-        request.AddParameter(param.Key, param.Value);
+            // add query parameter, if any
+            foreach(var param in queryParams)
+                request.AddQueryParameter(param.Key, param.Value);
 
-      // add file parameter, if any
-      foreach(KeyValuePair<string, string> param in FileParams)
-        request.AddFile(param.Key, param.Value);
+            // add form parameter, if any
+            foreach(var param in formParams)
+                request.AddParameter(param.Key, param.Value);
 
-      if (PostBody != null) {
-        request.AddParameter("application/json", PostBody, ParameterType.RequestBody); // http body (model) parameter
-      }
+            // add file parameter, if any
+            foreach(var param in fileParams)
+                request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
 
-      return (Object) await restClient.ExecuteTaskAsync(request);
+            if (postBody != null) // http body (model) parameter
+                request.AddParameter("application/json", postBody, ParameterType.RequestBody);
 
-    }
+            return (Object)RestClient.Execute(request);
 
-    /// <summary>
-    /// Add default header
-    /// </summary>
-    /// <param name="key">  Header field name
-    /// <param name="value"> Header field value
-    /// <returns></returns>
-    public void AddDefaultHeader(string key, string value) {
-       defaultHeaderMap.Add(key, value);
-    }
+        }
 
-    /// <summary>
-    /// Get default header
-    /// </summary>
-    /// <returns>Dictionary of default header</returns>
-    public Dictionary<String, String> GetDefaultHeader() {
-       return defaultHeaderMap;
-    }
+        /// <summary>
+        /// Makes the asynchronous HTTP request.
+        /// </summary>
+        /// <param name="path">URL path.</param>
+        /// <param name="method">HTTP method.</param>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="postBody">HTTP body (POST request).</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="formParams">Form parameters.</param>
+        /// <param name="fileParams">File parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        /// <returns>The Task instance.</returns>
+        public async System.Threading.Tasks.Task<Object> CallApiAsync(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings)
+        {
+    
+            var request = new RestRequest(path, method);
+    
+            UpdateParamsForAuth(queryParams, headerParams, authSettings);
+    
+            // add default header, if any
+            foreach(var defaultHeader in _defaultHeaderMap)
+                request.AddHeader(defaultHeader.Key, defaultHeader.Value);
+    
+            // add header parameter, if any
+            foreach(var param in headerParams)
+                request.AddHeader(param.Key, param.Value);
+           
+            // add query parameter, if any
+            foreach(var param in queryParams)
+                request.AddQueryParameter(param.Key, param.Value);
+    
+            // add form parameter, if any
+            foreach(var param in formParams)
+                request.AddParameter(param.Key, param.Value);
+    
+            // add file parameter, if any
+            foreach(var param in fileParams)
+                request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
 
-    /// <summary>
-    /// escape string (url-encoded)
-    /// </summary>
-    /// <param name="str"> String to be escaped
-    /// <returns>Escaped string</returns>
-    public string EscapeString(string str) {
-      return str;
-    }
+            if (postBody != null) // http body (model) parameter
+                request.AddParameter("application/json", postBody, ParameterType.RequestBody);
+    
+            return (Object) await RestClient.ExecuteTaskAsync(request);
+        }
+    
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        public void AddDefaultHeader(string key, string value)
+        {
+            _defaultHeaderMap.Add(key, value);
+        }
+    
+        /// <summary>
+        /// Escape string (url-encoded).
+        /// </summary>
+        /// <param name="str">String to be escaped.</param>
+        /// <returns>Escaped string.</returns>
+        public string EscapeString(string str)
+        {
+            return HttpUtility.UrlEncode(str);
+        }
+    
+        /// <summary>
+        /// Create FileParameter based on Stream.
+        /// </summary>
+        /// <param name="name">Parameter name.</param>
+        /// <param name="stream">Input stream.</param>
+        /// <returns>FileParameter.</returns>
+        public FileParameter ParameterToFile(string name, Stream stream)
+        {
+            if (stream is FileStream)
+                return FileParameter.Create(name, stream.ReadAsBytes(), Path.GetFileName(((FileStream)stream).Name));
+            else
+                return FileParameter.Create(name, stream.ReadAsBytes(), "no_file_name_provided");
+        }
+    
+        /// <summary>
+        /// If parameter is DateTime, output in ISO8601 format.
+        /// If parameter is a list of string, join the list with ",".
+        /// Otherwise just return the string.
+        /// </summary>
+        /// <param name="obj">The parameter (header, path, query, form).</param>
+        /// <returns>Formatted string.</returns>
+        public string ParameterToString(object obj)
+        {
+            if (obj is DateTime)
+                return ((DateTime)obj).ToString ("u");
+            else if (obj is List<string>)
+                return String.Join(",", obj as List<string>);
+            else
+                return Convert.ToString (obj);
+        }
+    
+        /// <summary>
+        /// Deserialize the JSON string into a proper object.
+        /// </summary>
+        /// <param name="content">HTTP body (e.g. string, JSON).</param>
+        /// <param name="type">Object type.</param>
+        /// <returns>Object representation of the JSON string.</returns>
+        public object Deserialize(string content, Type type, IList<Parameter> headers=null)
+        {
+            if (type == typeof(Object)) // return an object
+            {
+                return content;
+            }
 
-    /// <summary>
-    /// if parameter is DateTime, output in ISO8601 format
-    /// if parameter is a list of string, join the list with ","
-    /// otherwise just return the string
-    /// </summary>
-    /// <param name="obj"> The parameter (header, path, query, form)
-    /// <returns>Formatted string</returns>
-    public string ParameterToString(object obj)
-    {
-      if (obj is DateTime) {
-        return ((DateTime)obj).ToString ("u");
-      } else if (obj is List<string>) {
-        return String.Join(",", obj as List<string>);
-      } else {
-	return Convert.ToString (obj);
-      }
-    }
+            if (type == typeof(Stream))
+            {
+                var filePath = String.IsNullOrEmpty(Configuration.TempFolderPath)
+                    ? Path.GetTempPath()
+                    : Configuration.TempFolderPath;
 
-    /// <summary>
-    /// Deserialize the JSON string into a proper object
-    /// </summary>
-    /// <param name="json"> JSON string
-    /// <param name="type"> Object type
-    /// <returns>Object representation of the JSON string</returns>
-    public object Deserialize(string content, Type type) {
-      if (type.GetType() == typeof(Object))
-        return (Object)content;
-
-      try
-      {
-          return JsonConvert.DeserializeObject(content, type);
-      }
-      catch (IOException e) {
-        throw new ApiException(500, e.Message);
-      }
-    }
+                var fileName = filePath + Guid.NewGuid();
+                if (headers != null)
+                {
+                    var regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$");
+                    var match = regex.Match(headers.ToString());
+                    if (match.Success)
+                        fileName = filePath + match.Value.Replace("\"", "").Replace("'", "");
+                }
+                File.WriteAllText(fileName, content);
+                return new FileStream(fileName, FileMode.Open);
 
-    /// <summary>
-    /// Serialize an object into JSON string
-    /// </summary>
-    /// <param name="obj"> Object 
-    /// <returns>JSON string</returns>
-    public string Serialize(object obj) {
-      try
-      {
-          return obj != null ? JsonConvert.SerializeObject(obj) : null;
-      }
-      catch (Exception e) {
-        throw new ApiException(500, e.Message);
-      }
-    }
+            }
 
-    /// <summary>
-    /// Get the API key with prefix
-    /// </summary>
-    /// <param name="obj"> Object 
-    /// <returns>API key with prefix</returns>
-    public string GetApiKeyWithPrefix (string apiKey)
-    {
-      var apiKeyValue = "";
-      Configuration.apiKey.TryGetValue (apiKey, out apiKeyValue);
-      var apiKeyPrefix = "";
-      if (Configuration.apiKeyPrefix.TryGetValue (apiKey, out apiKeyPrefix)) {
-        return apiKeyPrefix + " " + apiKeyValue;
-      } else {
-        return apiKeyValue;
-      }
-    }
+            if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
+            {
+                return DateTime.Parse(content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+            }
 
-    /// <summary>
-    /// Update parameters based on authentication
-    /// </summary>
-    /// <param name="QueryParams">Query parameters</param>
-    /// <param name="HeaderParams">Header parameters</param>
-    /// <param name="AuthSettings">Authentication settings</param>
-    public void UpdateParamsForAuth(Dictionary<String, String> QueryParams, Dictionary<String, String> HeaderParams, string[] AuthSettings) {
-      if (AuthSettings == null || AuthSettings.Length == 0)
-        return;
-  
-      foreach (string auth in AuthSettings) {
-        // determine which one to use
-        switch(auth) {
-          {{#authMethods}}
-          case "{{name}}":
-            {{#isApiKey}}{{#isKeyInHeader}}HeaderParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}QueryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}HeaderParams["Authorization"] = "Basic " + Base64Encode(Configuration.username + ":" + Configuration.password);{{/isBasic}}
-            {{#isOAuth}}//TODO support oauth{{/isOAuth}}
-            break;
-          {{/authMethods}}
-          default:
-            //TODO show warning about security definition not found
-          break;
+            if (type == typeof(String) || type.Name.StartsWith("System.Nullable")) // return primitive type
+            {
+                return ConvertType(content, type); 
+            }
+    
+            // at this point, it must be a model (json)
+            try
+            {
+                return JsonConvert.DeserializeObject(content, type);
+            }
+            catch (IOException e)
+            {
+                throw new ApiException(500, e.Message);
+            }
         }
-      }
-
-    }
+    
+        /// <summary>
+        /// Serialize an object into JSON string.
+        /// </summary>
+        /// <param name="obj">Object.</param>
+        /// <returns>JSON string.</returns>
+        public string Serialize(object obj)
+        {
+            try
+            {
+                return obj != null ? JsonConvert.SerializeObject(obj) : null;
+            }
+            catch (Exception e)
+            {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Get the API key with prefix.
+        /// </summary>
+        /// <param name="apiKeyIdentifier">API key identifier (authentication scheme).</param>
+        /// <returns>API key with prefix.</returns>
+        public string GetApiKeyWithPrefix (string apiKeyIdentifier)
+        {
+            var apiKeyValue = "";
+            Configuration.ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
+            var apiKeyPrefix = "";
+            if (Configuration.ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix))
+                return apiKeyPrefix + " " + apiKeyValue;
+            else
+                return apiKeyValue;
+        }
+    
+        /// <summary>
+        /// Update parameters based on authentication.
+        /// </summary>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings)
+        {
+            if (authSettings == null || authSettings.Length == 0)
+                return;
 
-    /// <summary>
-    /// Encode string in base64 format 
-    /// </summary>
-    /// <param name="text">String to be encoded</param>
-    public static string Base64Encode(string text) {
-      var textByte = System.Text.Encoding.UTF8.GetBytes(text);
-      return System.Convert.ToBase64String(textByte);
+            foreach (string auth in authSettings)
+            {
+                // determine which one to use
+                switch(auth)
+                {
+                    {{#authMethods}}
+                    case "{{name}}":
+                        {{#isApiKey}}{{#isKeyInHeader}}headerParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}queryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);{{/isBasic}}
+                        {{#isOAuth}}//TODO support oauth{{/isOAuth}}
+                        break;
+                    {{/authMethods}}
+                    default:
+                        //TODO show warning about security definition not found
+                        break;
+                }
+            }
+        }
+ 
+        /// <summary>
+        /// Encode string in base64 format.
+        /// </summary>
+        /// <param name="text">String to be encoded.</param>
+        /// <returns>Encoded string.</returns>
+        public static string Base64Encode(string text)
+        {
+            var textByte = System.Text.Encoding.UTF8.GetBytes(text);
+            return System.Convert.ToBase64String(textByte);
+        }
+    
+        /// <summary>
+        /// Dynamically cast the object into target type.
+        /// Ref: http://stackoverflow.com/questions/4925718/c-dynamic-runtime-cast
+        /// </summary>
+        /// <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) {
+            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 65c6193b84f..364e2e99912 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
@@ -5,37 +5,43 @@ namespace {{packageName}}.Client {
   /// API Exception
   /// </summary>
   public class ApiException : Exception {
-    /// <summary>
-    /// Gets or sets the error code (HTTP status code)
-    /// </summary>
-    /// <value>The error code (HTTP status code).</value>
-    public int ErrorCode { get; set; }
+      /// <summary>
+      /// Gets or sets the error code (HTTP status code)
+      /// </summary>
+      /// <value>The error code (HTTP status code).</value>
+      public int ErrorCode { get; set; }
 
-    /// <summary>
-    /// Gets or sets the error content (body json object)
-    /// </summary>
-    /// <value>The error content (Http response body).</value>
-    public dynamic ErrorContent { get; private set; }
+      /// <summary>
+      /// Gets or sets the error content (body json object)
+      /// </summary>
+      /// <value>The error content (Http response body).</value>
+      public dynamic ErrorContent { get; private set; }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiException"/> class.
-    /// </summary>
-    /// <param name="basePath">The base path.</param>
-    public ApiException() {}
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="basePath">The base path.</param>
+      public ApiException() {}
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiException"/> class.
-    /// </summary>
-    /// <param name="errorCode">HTTP status code.</param>
-    /// <param name="message">Error message.</param>
-    public ApiException(int errorCode, string message) : base(message) {
-      this.ErrorCode = errorCode;
-    }
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="errorCode">HTTP status code.</param>
+      /// <param name="message">Error message.</param>
+      public ApiException(int errorCode, string message) : base(message) {
+          this.ErrorCode = errorCode;
+      }
 
-    public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) {
-       this.ErrorCode = errorCode;
-       this.ErrorContent = errorContent;
-    }
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <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) {
+          this.ErrorCode = errorCode;
+          this.ErrorContent = errorContent;
+      }
 
   }
 
diff --git a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
index 485d97058ce..67b07069e2f 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
@@ -1,51 +1,99 @@
 using System;
+using System.Reflection;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Text;
 
-namespace {{packageName}}.Client {
-  /// <summary>
-  /// Represents a set of configuration settings
-  /// </summary>
-  public class Configuration{
-
-    /// <summary>
-    /// Version of the package
-    /// </summary>
-    public const string Version = "{{packageVersion}}";
-
-    /// <summary>
-    /// Gets or sets the API client. This is the default API client for making HTTP calls.
-    /// </summary>
-    /// <value>The API client.</value>
-    public static ApiClient apiClient = new ApiClient();
-
-    /// <summary>
-    /// Gets or sets the username (HTTP basic authentication)
-    /// </summary>
-    /// <value>The username.</value>
-    public static String username { get; set; }
-
+namespace {{packageName}}.Client
+{
     /// <summary>
-    /// Gets or sets the password (HTTP basic authentication)
+    /// Represents a set of configuration settings
     /// </summary>
-    /// <value>The password.</value>
-    public static String password { get; set; }
-
-    /// <summary>
-    /// Gets or sets the API key based on the authentication name 
-    /// </summary>
-    /// <value>The API key.</value>
-    public static Dictionary<String, String> apiKey = new Dictionary<String, String>();
-
-    /// <summary>
-    /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name 
-    /// </summary>
-    /// <value>The prefix of the API key.</value>
-    public static Dictionary<String, String> apiKeyPrefix = new Dictionary<String, String>();
-
-
-  }
+    public class Configuration
+    {
+  
+        /// <summary>
+        /// Version of the package.
+        /// </summary>
+        /// <value>Version of the package.</value>
+        public const string Version = "{{packageVersion}}";
+  
+        /// <summary>
+        /// Gets or sets the default API client for making HTTP calls.
+        /// </summary>
+        /// <value>The API client.</value>
+        public static ApiClient DefaultApiClient = new ApiClient();
+  
+        /// <summary>
+        /// Gets or sets the username (HTTP basic authentication).
+        /// </summary>
+        /// <value>The username.</value>
+        public static String Username { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the password (HTTP basic authentication).
+        /// </summary>
+        /// <value>The password.</value>
+        public static String Password { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the API key based on the authentication name.
+        /// </summary>
+        /// <value>The API key.</value>
+        public static Dictionary<String, String> ApiKey = new Dictionary<String, String>();
+  
+        /// <summary>
+        /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name.
+        /// </summary>
+        /// <value>The prefix of the API key.</value>
+        public static Dictionary<String, String> ApiKeyPrefix = new Dictionary<String, String>();
+  
+        private static string _tempFolderPath = Path.GetTempPath();
+  
+        /// <summary>
+        /// Gets or sets the temporary folder path to store the files downloaded from the server.
+        /// </summary>
+        /// <value>Folder path.</value>
+        public static String TempFolderPath
+        {
+            get { return _tempFolderPath; }
+  
+            set 
+            {
+                if (String.IsNullOrEmpty(value))
+                {
+                    _tempFolderPath = value;
+                    return;
+                }
+      
+                // create the directory if it does not exist
+                if (!Directory.Exists(value)) 
+                    Directory.CreateDirectory(value);
+      
+                // check if the path contains directory separator at the end
+                if (value[value.Length - 1] == Path.DirectorySeparatorChar)
+                    _tempFolderPath = value;
+                else
+                    _tempFolderPath = value  + Path.DirectorySeparatorChar;
+            }
+        }
+  
+        /// <summary>
+        /// Returns a string with essential information for debugging.
+        /// </summary>
+        public static String ToDebugReport()
+        {
+            String report = "C# SDK ({{packageName}}) Debug Report:\n";
+            report += "    OS: " + Environment.OSVersion + "\n";
+            report += "    .NET Framework Version: " + Assembly
+                     .GetExecutingAssembly()
+                     .GetReferencedAssemblies()
+                     .Where(x => x.Name == "System.Core").First().Version.ToString()  + "\n";
+            report += "    Version of the API: {{version}}\n";
+            report += "    SDK Package Version: {{packageVersion}}\n";
+  
+            return report;
+        }
+    }
 }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/Newtonsoft.Json.dll b/modules/swagger-codegen/src/main/resources/csharp/Newtonsoft.Json.dll
index 26fdaffec14..ae725c4b598 100644
Binary files a/modules/swagger-codegen/src/main/resources/csharp/Newtonsoft.Json.dll and b/modules/swagger-codegen/src/main/resources/csharp/Newtonsoft.Json.dll differ
diff --git a/modules/swagger-codegen/src/main/resources/csharp/README.md b/modules/swagger-codegen/src/main/resources/csharp/README.md
new file mode 100644
index 00000000000..bbab203d23f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/csharp/README.md
@@ -0,0 +1,15 @@
+## Frameworks supported
+- .NET 3.5 or later
+- Windows Phone 7.1 (Mango)
+
+## Dependencies
+- [RestSharp] (https://www.nuget.org/packages/RestSharp)
+- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/)
+
+
+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:
+```
+Install-Package RestSharp
+Install-Package Newtonsoft.Json
+``` 
+
diff --git a/modules/swagger-codegen/src/main/resources/csharp/api.mustache b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
index 652d15a30b3..ceac07ddfd1 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
@@ -1,173 +1,176 @@
 using System;
+using System.IO;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using RestSharp;
 using {{packageName}}.Client;
-using {{packageName}}.Model;
-{{#imports}}
-{{/imports}}
+{{#hasImport}}using {{packageName}}.Model;
+{{/hasImport}}
 
-namespace {{packageName}}.Api {
-  {{#operations}}
-
-  public interface I{{classname}} {
-    {{#operation}}
-    /// <summary>
-    /// {{summary}} {{notes}}
-    /// </summary>
-    {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>{{/allParams}}
-    /// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
-    {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-
-    /// <summary>
-    /// {{summary}} {{notes}}
-    /// </summary>
-    {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>{{/allParams}}
-    /// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
-    {{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-    {{/operation}}
-  }
-
-  /// <summary>
-  /// Represents a collection of functions to interact with the API endpoints
-  /// </summary>
-  public class {{classname}} : I{{classname}} {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="{{classname}}"/> class.
-    /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)
-    /// <returns></returns>
-    public {{classname}}(ApiClient apiClient = null) {
-      if (apiClient == null) { // use the default one in Configuration
-        this.apiClient = Configuration.apiClient; 
-      } else {
-        this.apiClient = apiClient;
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="{{classname}}"/> class.
-    /// </summary>
-    /// <returns></returns>
-    public {{classname}}(String basePath)
+namespace {{packageName}}.Api
+{
+    {{#operations}}
+    public interface I{{classname}}
     {
-      this.apiClient = new ApiClient(basePath);
+        {{#operation}}
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
+        {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+  
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
+        {{#returnType}}System.Threading.Tasks.Task<{{{returnType}}}>{{/returnType}}{{^returnType}}System.Threading.Tasks.Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
+        {{/operation}}
     }
-
+  
     /// <summary>
-    /// Sets the base path of the API client.
+    /// Represents a collection of functions to interact with the API endpoints
     /// </summary>
-    /// <value>The base path</value>
-    public void SetBasePath(String basePath) {
-      this.apiClient.basePath = basePath;
-    }
-
-    /// <summary>
-    /// Gets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public String GetBasePath(String basePath) {
-      return this.apiClient.basePath;
-    }
-
-    /// <summary>
-    /// Gets or sets the API client.
-    /// </summary>
-    /// <value>The API client</value>
-    public ApiClient apiClient {get; set;}
-
-
-    {{#operation}}
-    /// <summary>
-    /// {{summary}} {{notes}}
-    /// </summary>
-    {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>{{/allParams}}
-    /// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
-    public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
-
-      {{#allParams}}{{#required}}
-      // verify the required parameter '{{paramName}}' is set
-      if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{nickname}}");
-      {{/required}}{{/allParams}}
-
-      var path = "{{path}}";
-      path = path.Replace("{format}", "json");
-      {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", apiClient.ParameterToString({{{paramName}}}));
-      {{/pathParams}}
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // query parameter
-      {{/queryParams}}
-      {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // header parameter
-      {{/headerParams}}
-      {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", {{paramName}});{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
-      {{/formParams}}
-      {{#bodyParam}}postBody = apiClient.Serialize({{paramName}}); // http body (model) parameter
-      {{/bodyParam}}
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
-      }
-      {{#returnType}}return ({{{returnType}}}) apiClient.Deserialize(response.Content, typeof({{{returnType}}}));{{/returnType}}{{^returnType}}
-      return;{{/returnType}}
-    }
-	
-	 /// <summary>
-    /// {{summary}} {{notes}}
-    /// </summary>
-    {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>{{/allParams}}
-    /// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
-    public async {{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
-
-      {{#allParams}}{{#required}}
-          // verify the required parameter '{{paramName}}' is set
-          if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{nickname}}");
-      {{/required}}{{/allParams}}
-
-      var path = "{{path}}";
-      path = path.Replace("{format}", "json");
-      {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", apiClient.ParameterToString({{{paramName}}}));
-      {{/pathParams}}
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // query parameter
-      {{/queryParams}}
-      {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // header parameter
-      {{/headerParams}}
-      {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", {{paramName}});{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", apiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
-      {{/formParams}}
-      {{#bodyParam}}postBody = apiClient.Serialize({{paramName}}); // http body (model) parameter
-      {{/bodyParam}}
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
-      }
-      {{#returnType}}return ({{{returnType}}}) apiClient.Deserialize(response.Content, typeof({{{returnType}}}));{{/returnType}}{{^returnType}}
-      return;{{/returnType}}
+    public class {{classname}} : I{{classname}}
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="{{classname}}"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public {{classname}}(ApiClient apiClient = null)
+        {
+            if (apiClient == null) // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            else
+                this.ApiClient = apiClient;
+        }
+    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="{{classname}}"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public {{classname}}(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
+    
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath)
+        {
+            this.ApiClient.BasePath = basePath;
+        }
+    
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath)
+        {
+            return this.ApiClient.BasePath;
+        }
+    
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>An instance of the ApiClient</param>
+        public ApiClient ApiClient {get; set;}
+    
+        {{#operation}}
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param> 
+        {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>            
+        public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+        {
+            {{#allParams}}{{#required}}
+            // verify the required parameter '{{paramName}}' is set
+            if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{nickname}}");
+            {{/required}}{{/allParams}}
+    
+            var path = "{{path}}";
+            path = path.Replace("{format}", "json");
+            {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", ApiClient.ParameterToString({{{paramName}}}));
+            {{/pathParams}}
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // query parameter
+            {{/queryParams}}
+            {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // header parameter
+            {{/headerParams}}
+            {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
+            {{/formParams}}
+            {{#bodyParam}}postBody = ApiClient.Serialize({{paramName}}); // http body (model) parameter
+            {{/bodyParam}}
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.ErrorMessage, response.ErrorMessage);
+    
+            {{#returnType}}return ({{{returnType}}}) ApiClient.Deserialize(response.Content, typeof({{{returnType}}}), response.Headers);{{/returnType}}{{^returnType}}return;{{/returnType}}
+        }
+    
+        /// <summary>
+        /// {{summary}} {{notes}}
+        /// </summary>
+        {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+        {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
+        {{#returnType}}public async System.Threading.Tasks.Task<{{{returnType}}}>{{/returnType}}{{^returnType}}public async System.Threading.Tasks.Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+        {
+            {{#allParams}}{{#required}}// verify the required parameter '{{paramName}}' is set
+            if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{nickname}}");
+            {{/required}}{{/allParams}}
+    
+            var path = "{{path}}";
+            path = path.Replace("{format}", "json");
+            {{#pathParams}}path = path.Replace("{" + "{{baseName}}" + "}", ApiClient.ParameterToString({{{paramName}}}));
+            {{/pathParams}}
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            {{#queryParams}} if ({{paramName}} != null) queryParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // query parameter
+            {{/queryParams}}
+            {{#headerParams}} if ({{paramName}} != null) headerParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // header parameter
+            {{/headerParams}}
+            {{#formParams}}if ({{paramName}} != null) {{#isFile}}fileParams.Add("{{baseName}}", ApiClient.ParameterToFile("{{baseName}}", {{paramName}}));{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", ApiClient.ParameterToString({{paramName}})); // form parameter{{/isFile}}
+            {{/formParams}}
+            {{#bodyParam}}postBody = ApiClient.Serialize({{paramName}}); // http body (model) parameter
+            {{/bodyParam}}
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.{{httpMethod}}, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling {{nickname}}: " + response.Content, response.Content);
+
+            {{#returnType}}return ({{{returnType}}}) ApiClient.Deserialize(response.Content, typeof({{{returnType}}}), response.Headers);{{/returnType}}{{^returnType}}
+            return;{{/returnType}}
+        }
+        {{/operation}}
     }
-    {{/operation}}
-  }  
-  {{/operations}}
+    {{/operations}}
 }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/model.mustache b/modules/swagger-codegen/src/main/resources/csharp/model.mustache
index c0fac63b385..99da4f8302a 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/model.mustache
@@ -15,7 +15,10 @@ namespace {{packageName}}.Model {
   [DataContract]
   public class {{classname}}{{#parent}} : {{{parent}}}{{/parent}} {
     {{#vars}}
-    {{#description}}/* {{{description}}} */{{/description}}
+    /// <summary>
+    /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
+    /// </summary>{{#description}}
+    /// <value>{{{description}}}</value>{{/description}}
     [DataMember(Name="{{baseName}}", EmitDefaultValue=false)]
     public {{{datatype}}} {{name}} { get; set; }
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md
new file mode 100644
index 00000000000..bbab203d23f
--- /dev/null
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.md
@@ -0,0 +1,15 @@
+## Frameworks supported
+- .NET 3.5 or later
+- Windows Phone 7.1 (Mango)
+
+## Dependencies
+- [RestSharp] (https://www.nuget.org/packages/RestSharp)
+- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/)
+
+
+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:
+```
+Install-Package RestSharp
+Install-Package Newtonsoft.Json
+``` 
+
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 26fdaffec14..ae725c4b598 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/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 5fdb38f2da9..166d40b5656 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
@@ -1,808 +1,839 @@
 using System;
+using System.IO;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using RestSharp;
 using IO.Swagger.Client;
 using IO.Swagger.Model;
 
-namespace IO.Swagger.Api {
-  
-
-  public interface IPetApi {
+namespace IO.Swagger.Api
+{
     
+    public interface IPetApi
+    {
+        
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        void UpdatePet (Pet body);
+  
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task UpdatePetAsync (Pet body);
+        
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        void AddPet (Pet body);
+  
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task AddPetAsync (Pet body);
+        
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma seperated strings
+        /// </summary>
+        /// <param name="status">Status values that need to be considered for filter</param>
+        /// <returns>List<Pet></returns>
+        List<Pet> FindPetsByStatus (List<string> status);
+  
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma seperated strings
+        /// </summary>
+        /// <param name="status">Status values that need to be considered for filter</param>
+        /// <returns>List<Pet></returns>
+        System.Threading.Tasks.Task<List<Pet>> FindPetsByStatusAsync (List<string> status);
+        
+        /// <summary>
+        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <param name="tags">Tags to filter by</param>
+        /// <returns>List<Pet></returns>
+        List<Pet> FindPetsByTags (List<string> tags);
+  
+        /// <summary>
+        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <param name="tags">Tags to filter by</param>
+        /// <returns>List<Pet></returns>
+        System.Threading.Tasks.Task<List<Pet>> FindPetsByTagsAsync (List<string> tags);
+        
+        /// <summary>
+        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Pet</returns>
+        Pet GetPetById (long? petId);
+  
+        /// <summary>
+        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Pet</returns>
+        System.Threading.Tasks.Task<Pet> GetPetByIdAsync (long? petId);
+        
+        /// <summary>
+        /// Updates a pet in the store with form data 
+        /// </summary>
+        /// <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, string status);
+  
+        /// <summary>
+        /// Updates a pet in the store with form data 
+        /// </summary>
+        /// <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>
+        System.Threading.Tasks.Task UpdatePetWithFormAsync (string petId, string name, string status);
+        
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="apiKey"></param>
+        /// <param name="petId">Pet id to delete</param>
+        /// <returns></returns>
+        void DeletePet (string apiKey, long? petId);
+  
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="apiKey"></param>
+        /// <param name="petId">Pet id to delete</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task DeletePetAsync (string apiKey, long? petId);
+        
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <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, Stream file);
+  
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <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>
+        System.Threading.Tasks.Task UploadFileAsync (long? petId, string additionalMetadata, Stream file);
+        
+    }
+  
     /// <summary>
-    /// Update an existing pet 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    void UpdatePet (Pet Body);
-
-    /// <summary>
-    /// Update an existing pet 
+    /// Represents a collection of functions to interact with the API endpoints
     /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    Task UpdatePetAsync (Pet Body);
+    public class PetApi : IPetApi
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PetApi"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public PetApi(ApiClient apiClient = null)
+        {
+            if (apiClient == null) // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            else
+                this.ApiClient = apiClient;
+        }
     
-    /// <summary>
-    /// Add a new pet to the store 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    void AddPet (Pet Body);
-
-    /// <summary>
-    /// Add a new pet to the store 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    Task AddPetAsync (Pet Body);
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PetApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public PetApi(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
     
-    /// <summary>
-    /// Finds Pets by status Multiple status values can be provided with comma seperated strings
-    /// </summary>
-    /// <param name="Status">Status values that need to be considered for filter</param>
-    /// <returns>List<Pet></returns>
-    List<Pet> FindPetsByStatus (List<string> Status);
-
-    /// <summary>
-    /// Finds Pets by status Multiple status values can be provided with comma seperated strings
-    /// </summary>
-    /// <param name="Status">Status values that need to be considered for filter</param>
-    /// <returns>List<Pet></returns>
-    Task<List<Pet>> FindPetsByStatusAsync (List<string> Status);
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath)
+        {
+            this.ApiClient.BasePath = basePath;
+        }
     
-    /// <summary>
-    /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-    /// </summary>
-    /// <param name="Tags">Tags to filter by</param>
-    /// <returns>List<Pet></returns>
-    List<Pet> FindPetsByTags (List<string> Tags);
-
-    /// <summary>
-    /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-    /// </summary>
-    /// <param name="Tags">Tags to filter by</param>
-    /// <returns>List<Pet></returns>
-    Task<List<Pet>> FindPetsByTagsAsync (List<string> Tags);
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath)
+        {
+            return this.ApiClient.BasePath;
+        }
     
-    /// <summary>
-    /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-    /// </summary>
-    /// <param name="PetId">ID of pet that needs to be fetched</param>
-    /// <returns>Pet</returns>
-    Pet GetPetById (long? PetId);
-
-    /// <summary>
-    /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-    /// </summary>
-    /// <param name="PetId">ID of pet that needs to be fetched</param>
-    /// <returns>Pet</returns>
-    Task<Pet> GetPetByIdAsync (long? PetId);
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>An instance of the ApiClient</param>
+        public ApiClient ApiClient {get; set;}
     
-    /// <summary>
-    /// Updates a pet in the store with form data 
-    /// </summary>
-    /// <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, string Status);
-
-    /// <summary>
-    /// Updates a pet in the store with form data 
-    /// </summary>
-    /// <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>
-    Task UpdatePetWithFormAsync (string PetId, string Name, string Status);
+        
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param> 
+        /// <returns></returns>            
+        public void UpdatePet (Pet body)
+        {
+            
     
-    /// <summary>
-    /// Deletes a pet 
-    /// </summary>
-    /// <param name="ApiKey"></param>/// <param name="PetId">Pet id to delete</param>
-    /// <returns></returns>
-    void DeletePet (string ApiKey, long? PetId);
-
-    /// <summary>
-    /// Deletes a pet 
-    /// </summary>
-    /// <param name="ApiKey"></param>/// <param name="PetId">Pet id to delete</param>
-    /// <returns></returns>
-    Task DeletePetAsync (string ApiKey, long? PetId);
+            var path = "/pet";
+            path = path.Replace("{format}", "json");
+            
     
-    /// <summary>
-    /// uploads an image 
-    /// </summary>
-    /// <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, string File);
-
-    /// <summary>
-    /// uploads an image 
-    /// </summary>
-    /// <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>
-    Task UploadFileAsync (long? PetId, string AdditionalMetadata, string File);
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
     
-  }
-
-  /// <summary>
-  /// Represents a collection of functions to interact with the API endpoints
-  /// </summary>
-  public class PetApi : IPetApi {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PetApi"/> class.
-    /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)
-    /// <returns></returns>
-    public PetApi(ApiClient apiClient = null) {
-      if (apiClient == null) { // use the default one in Configuration
-        this.apiClient = Configuration.apiClient; 
-      } else {
-        this.apiClient = apiClient;
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PetApi"/> class.
-    /// </summary>
-    /// <returns></returns>
-    public PetApi(String basePath)
-    {
-      this.apiClient = new ApiClient(basePath);
-    }
-
-    /// <summary>
-    /// Sets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public void SetBasePath(String basePath) {
-      this.apiClient.basePath = basePath;
-    }
-
-    /// <summary>
-    /// Gets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public String GetBasePath(String basePath) {
-      return this.apiClient.basePath;
-    }
-
-    /// <summary>
-    /// Gets or sets the API client.
-    /// </summary>
-    /// <value>The API client</value>
-    public ApiClient apiClient {get; set;}
-
-
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
     
-    /// <summary>
-    /// Update an existing pet 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    public void UpdatePet (Pet Body) {
-
-      
-
-      var path = "/pet";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Update an existing pet 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    public async Task UpdatePetAsync (Pet Body) {
-
-      
-
-      var path = "/pet";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
     
-    /// <summary>
-    /// Add a new pet to the store 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    public void AddPet (Pet Body) {
-
-      
-
-      var path = "/pet";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Add a new pet to the store 
-    /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
-    public async Task AddPetAsync (Pet Body) {
-
-      
-
-      var path = "/pet";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
     
-    /// <summary>
-    /// Finds Pets by status Multiple status values can be provided with comma seperated strings
-    /// </summary>
-    /// <param name="Status">Status values that need to be considered for filter</param>
-    /// <returns>List<Pet></returns>
-    public List<Pet> FindPetsByStatus (List<string> Status) {
-
-      
-
-      var path = "/pet/findByStatus";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-       if (Status != null) queryParams.Add("status", apiClient.ParameterToString(Status)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
-      }
-      return (List<Pet>) apiClient.Deserialize(response.Content, typeof(List<Pet>));
-    }
-	
-	 /// <summary>
-    /// Finds Pets by status Multiple status values can be provided with comma seperated strings
-    /// </summary>
-    /// <param name="Status">Status values that need to be considered for filter</param>
-    /// <returns>List<Pet></returns>
-    public async Task<List<Pet>> FindPetsByStatusAsync (List<string> Status) {
-
-      
-
-      var path = "/pet/findByStatus";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-       if (Status != null) queryParams.Add("status", apiClient.ParameterToString(Status)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
-      }
-      return (List<Pet>) apiClient.Deserialize(response.Content, typeof(List<Pet>));
-    }
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.ErrorMessage, response.ErrorMessage);
     
-    /// <summary>
-    /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-    /// </summary>
-    /// <param name="Tags">Tags to filter by</param>
-    /// <returns>List<Pet></returns>
-    public List<Pet> FindPetsByTags (List<string> Tags) {
-
-      
-
-      var path = "/pet/findByTags";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-       if (Tags != null) queryParams.Add("tags", apiClient.ParameterToString(Tags)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
-      }
-      return (List<Pet>) apiClient.Deserialize(response.Content, typeof(List<Pet>));
-    }
-	
-	 /// <summary>
-    /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-    /// </summary>
-    /// <param name="Tags">Tags to filter by</param>
-    /// <returns>List<Pet></returns>
-    public async Task<List<Pet>> FindPetsByTagsAsync (List<string> Tags) {
-
-      
-
-      var path = "/pet/findByTags";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-       if (Tags != null) queryParams.Add("tags", apiClient.ParameterToString(Tags)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
-      }
-      return (List<Pet>) apiClient.Deserialize(response.Content, typeof(List<Pet>));
-    }
+            return;
+        }
     
-    /// <summary>
-    /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
-    /// </summary>
-    /// <param name="PetId">ID of pet that needs to be fetched</param>
-    /// <returns>Pet</returns>
-    public Pet GetPetById (long? PetId) {
-
-      
-      // verify the required parameter 'PetId' is set
-      if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling GetPetById");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "api_key", "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content);
-      }
-      return (Pet) apiClient.Deserialize(response.Content, 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>
-    /// <param name="PetId">ID of pet that needs to be fetched</param>
-    /// <returns>Pet</returns>
-    public async Task<Pet> GetPetByIdAsync (long? PetId) {
-
-      
-          // verify the required parameter 'PetId' is set
-          if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling GetPetById");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "api_key", "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content);
-      }
-      return (Pet) apiClient.Deserialize(response.Content, typeof(Pet));
-    }
+        /// <summary>
+        /// Update an existing pet 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task UpdatePetAsync (Pet body)
+        {
+            
     
-    /// <summary>
-    /// Updates a pet in the store with form data 
-    /// </summary>
-    /// <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>
-    public void UpdatePetWithForm (string PetId, string Name, string Status) {
-
-      
-      // verify the required parameter 'PetId' is set
-      if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UpdatePetWithForm");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      if (Name != null) formParams.Add("name", apiClient.ParameterToString(Name)); // form parameter
-      if (Status != null) formParams.Add("status", apiClient.ParameterToString(Status)); // form parameter
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Updates a pet in the store with form data 
-    /// </summary>
-    /// <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>
-    public async Task UpdatePetWithFormAsync (string PetId, string Name, string Status) {
-
-      
-          // verify the required parameter 'PetId' is set
-          if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UpdatePetWithForm");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      if (Name != null) formParams.Add("name", apiClient.ParameterToString(Name)); // form parameter
-      if (Status != null) formParams.Add("status", apiClient.ParameterToString(Status)); // form parameter
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
+            var path = "/pet";
+            path = path.Replace("{format}", "json");
+            
     
-    /// <summary>
-    /// Deletes a pet 
-    /// </summary>
-    /// <param name="ApiKey"></param>/// <param name="PetId">Pet id to delete</param>
-    /// <returns></returns>
-    public void DeletePet (string ApiKey, long? PetId) {
-
-      
-      // verify the required parameter 'PetId' is set
-      if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling DeletePet");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-       if (ApiKey != null) headerParams.Add("api_key", apiClient.ParameterToString(ApiKey)); // header parameter
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Deletes a pet 
-    /// </summary>
-    /// <param name="ApiKey"></param>/// <param name="PetId">Pet id to delete</param>
-    /// <returns></returns>
-    public async Task DeletePetAsync (string ApiKey, long? PetId) {
-
-      
-          // verify the required parameter 'PetId' is set
-          if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling DeletePet");
-      
-
-      var path = "/pet/{petId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-       if (ApiKey != null) headerParams.Add("api_key", apiClient.ParameterToString(ApiKey)); // header parameter
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
     
-    /// <summary>
-    /// uploads an image 
-    /// </summary>
-    /// <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>
-    public void UploadFile (long? PetId, string AdditionalMetadata, string File) {
-
-      
-      // verify the required parameter 'PetId' is set
-      if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UploadFile");
-      
-
-      var path = "/pet/{petId}/uploadImage";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      if (AdditionalMetadata != null) formParams.Add("additionalMetadata", apiClient.ParameterToString(AdditionalMetadata)); // form parameter
-      if (File != null) fileParams.Add("file", File);
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// uploads an image 
-    /// </summary>
-    /// <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>
-    public async Task UploadFileAsync (long? PetId, string AdditionalMetadata, string File) {
-
-      
-          // verify the required parameter 'PetId' is set
-          if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UploadFile");
-      
-
-      var path = "/pet/{petId}/uploadImage";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", apiClient.ParameterToString(PetId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      if (AdditionalMetadata != null) formParams.Add("additionalMetadata", apiClient.ParameterToString(AdditionalMetadata)); // form parameter
-      if (File != null) fileParams.Add("file", File);
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "petstore_auth" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content);
-      }
-      
-      return;
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePet: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param> 
+        /// <returns></returns>            
+        public void AddPet (Pet body)
+        {
+            
+    
+            var path = "/pet";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Add a new pet to the store 
+        /// </summary>
+        /// <param name="body">Pet object that needs to be added to the store</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task AddPetAsync (Pet body)
+        {
+            
+    
+            var path = "/pet";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling AddPet: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma seperated strings
+        /// </summary>
+        /// <param name="status">Status values that need to be considered for filter</param> 
+        /// <returns>List<Pet></returns>            
+        public List<Pet> FindPetsByStatus (List<string> status)
+        {
+            
+    
+            var path = "/pet/findByStatus";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+             if (status != null) queryParams.Add("status", ApiClient.ParameterToString(status)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+    
+        /// <summary>
+        /// Finds Pets by status Multiple status values can be provided with comma seperated strings
+        /// </summary>
+        /// <param name="status">Status values that need to be considered for filter</param>
+        /// <returns>List<Pet></returns>
+        public async System.Threading.Tasks.Task<List<Pet>> FindPetsByStatusAsync (List<string> status)
+        {
+            
+    
+            var path = "/pet/findByStatus";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+             if (status != null) queryParams.Add("status", ApiClient.ParameterToString(status)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByStatus: " + response.Content, response.Content);
+
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+        
+        /// <summary>
+        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <param name="tags">Tags to filter by</param> 
+        /// <returns>List<Pet></returns>            
+        public List<Pet> FindPetsByTags (List<string> tags)
+        {
+            
+    
+            var path = "/pet/findByTags";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+             if (tags != null) queryParams.Add("tags", ApiClient.ParameterToString(tags)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+    
+        /// <summary>
+        /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+        /// </summary>
+        /// <param name="tags">Tags to filter by</param>
+        /// <returns>List<Pet></returns>
+        public async System.Threading.Tasks.Task<List<Pet>> FindPetsByTagsAsync (List<string> tags)
+        {
+            
+    
+            var path = "/pet/findByTags";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+             if (tags != null) queryParams.Add("tags", ApiClient.ParameterToString(tags)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling FindPetsByTags: " + response.Content, response.Content);
+
+            return (List<Pet>) ApiClient.Deserialize(response.Content, typeof(List<Pet>), response.Headers);
+        }
+        
+        /// <summary>
+        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <param name="petId">ID of pet that needs to be fetched</param> 
+        /// <returns>Pet</returns>            
+        public Pet GetPetById (long? petId)
+        {
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById");
+            
+    
+            var path = "/pet/{petId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key", "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (Pet) ApiClient.Deserialize(response.Content, typeof(Pet), response.Headers);
+        }
+    
+        /// <summary>
+        /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+        /// </summary>
+        /// <param name="petId">ID of pet that needs to be fetched</param>
+        /// <returns>Pet</returns>
+        public async System.Threading.Tasks.Task<Pet> GetPetByIdAsync (long? petId)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById");
+            
+    
+            var path = "/pet/{petId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key", "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetPetById: " + response.Content, response.Content);
+
+            return (Pet) ApiClient.Deserialize(response.Content, typeof(Pet), response.Headers);
+        }
+        
+        /// <summary>
+        /// Updates a pet in the store with form data 
+        /// </summary>
+        /// <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>            
+        public void UpdatePetWithForm (string petId, string name, string status)
+        {
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm");
+            
+    
+            var path = "/pet/{petId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            if (name != null) formParams.Add("name", ApiClient.ParameterToString(name)); // form parameter
+            if (status != null) formParams.Add("status", ApiClient.ParameterToString(status)); // form parameter
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Updates a pet in the store with form data 
+        /// </summary>
+        /// <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>
+        public async System.Threading.Tasks.Task UpdatePetWithFormAsync (string petId, string name, string status)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm");
+            
+    
+            var path = "/pet/{petId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            if (name != null) formParams.Add("name", ApiClient.ParameterToString(name)); // form parameter
+            if (status != null) formParams.Add("status", ApiClient.ParameterToString(status)); // form parameter
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdatePetWithForm: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="apiKey"></param> 
+        /// <param name="petId">Pet id to delete</param> 
+        /// <returns></returns>            
+        public void DeletePet (string apiKey, long? petId)
+        {
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
+            
+    
+            var path = "/pet/{petId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+             if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Deletes a pet 
+        /// </summary>
+        /// <param name="apiKey"></param>
+        /// <param name="petId">Pet id to delete</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task DeletePetAsync (string apiKey, long? petId)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
+            
+    
+            var path = "/pet/{petId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+             if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeletePet: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <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>            
+        public void UploadFile (long? petId, string additionalMetadata, Stream file)
+        {
+            
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
+            
+    
+            var path = "/pet/{petId}/uploadImage";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            if (additionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (file != null) fileParams.Add("file", ApiClient.ParameterToFile("file", file));
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// uploads an image 
+        /// </summary>
+        /// <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>
+        public async System.Threading.Tasks.Task UploadFileAsync (long? petId, string additionalMetadata, Stream file)
+        {
+            // verify the required parameter 'petId' is set
+            if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
+            
+    
+            var path = "/pet/{petId}/uploadImage";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            if (additionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(additionalMetadata)); // form parameter
+            if (file != null) fileParams.Add("file", ApiClient.ParameterToFile("file", file));
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "petstore_auth" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UploadFile: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
     }
     
-  }  
-  
 }
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 739c9d30be3..74d14e7ffe2 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
@@ -1,428 +1,433 @@
 using System;
+using System.IO;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using RestSharp;
 using IO.Swagger.Client;
 using IO.Swagger.Model;
 
-namespace IO.Swagger.Api {
-  
-
-  public interface IStoreApi {
+namespace IO.Swagger.Api
+{
     
+    public interface IStoreApi
+    {
+        
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary<String, int?></returns>
+        Dictionary<String, int?> GetInventory ();
+  
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary<String, int?></returns>
+        System.Threading.Tasks.Task<Dictionary<String, int?>> GetInventoryAsync ();
+        
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <param name="body">order placed for purchasing the pet</param>
+        /// <returns>Order</returns>
+        Order PlaceOrder (Order body);
+  
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <param name="body">order placed for purchasing the pet</param>
+        /// <returns>Order</returns>
+        System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body);
+        
+        /// <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>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>Order</returns>
+        Order GetOrderById (string orderId);
+  
+        /// <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>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>Order</returns>
+        System.Threading.Tasks.Task<Order> GetOrderByIdAsync (string orderId);
+        
+        /// <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>
+        /// <param name="orderId">ID of the order that needs to be deleted</param>
+        /// <returns></returns>
+        void DeleteOrder (string orderId);
+  
+        /// <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>
+        /// <param name="orderId">ID of the order that needs to be deleted</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task DeleteOrderAsync (string orderId);
+        
+    }
+  
     /// <summary>
-    /// Returns pet inventories by status Returns a map of status codes to quantities
+    /// Represents a collection of functions to interact with the API endpoints
     /// </summary>
+    public class StoreApi : IStoreApi
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StoreApi"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public StoreApi(ApiClient apiClient = null)
+        {
+            if (apiClient == null) // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            else
+                this.ApiClient = apiClient;
+        }
     
-    /// <returns>Dictionary<String, int?></returns>
-    Dictionary<String, int?> GetInventory ();
-
-    /// <summary>
-    /// Returns pet inventories by status Returns a map of status codes to quantities
-    /// </summary>
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StoreApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public StoreApi(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
     
-    /// <returns>Dictionary<String, int?></returns>
-    Task<Dictionary<String, int?>> GetInventoryAsync ();
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath)
+        {
+            this.ApiClient.BasePath = basePath;
+        }
     
-    /// <summary>
-    /// Place an order for a pet 
-    /// </summary>
-    /// <param name="Body">order placed for purchasing the pet</param>
-    /// <returns>Order</returns>
-    Order PlaceOrder (Order Body);
-
-    /// <summary>
-    /// Place an order for a pet 
-    /// </summary>
-    /// <param name="Body">order placed for purchasing the pet</param>
-    /// <returns>Order</returns>
-    Task<Order> PlaceOrderAsync (Order Body);
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath)
+        {
+            return this.ApiClient.BasePath;
+        }
     
-    /// <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>
-    /// <param name="OrderId">ID of pet that needs to be fetched</param>
-    /// <returns>Order</returns>
-    Order GetOrderById (string OrderId);
-
-    /// <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>
-    /// <param name="OrderId">ID of pet that needs to be fetched</param>
-    /// <returns>Order</returns>
-    Task<Order> GetOrderByIdAsync (string OrderId);
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>An instance of the ApiClient</param>
+        public ApiClient ApiClient {get; set;}
     
-    /// <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>
-    /// <param name="OrderId">ID of the order that needs to be deleted</param>
-    /// <returns></returns>
-    void DeleteOrder (string OrderId);
-
-    /// <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>
-    /// <param name="OrderId">ID of the order that needs to be deleted</param>
-    /// <returns></returns>
-    Task DeleteOrderAsync (string OrderId);
+        
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary<String, int?></returns>            
+        public Dictionary<String, int?> GetInventory ()
+        {
+            
     
-  }
-
-  /// <summary>
-  /// Represents a collection of functions to interact with the API endpoints
-  /// </summary>
-  public class StoreApi : IStoreApi {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="StoreApi"/> class.
-    /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)
-    /// <returns></returns>
-    public StoreApi(ApiClient apiClient = null) {
-      if (apiClient == null) { // use the default one in Configuration
-        this.apiClient = Configuration.apiClient; 
-      } else {
-        this.apiClient = apiClient;
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="StoreApi"/> class.
-    /// </summary>
-    /// <returns></returns>
-    public StoreApi(String basePath)
-    {
-      this.apiClient = new ApiClient(basePath);
-    }
-
-    /// <summary>
-    /// Sets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public void SetBasePath(String basePath) {
-      this.apiClient.basePath = basePath;
-    }
-
-    /// <summary>
-    /// Gets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public String GetBasePath(String basePath) {
-      return this.apiClient.basePath;
-    }
-
-    /// <summary>
-    /// Gets or sets the API client.
-    /// </summary>
-    /// <value>The API client</value>
-    public ApiClient apiClient {get; set;}
-
-
+            var path = "/store/inventory";
+            path = path.Replace("{format}", "json");
+            
     
-    /// <summary>
-    /// Returns pet inventories by status Returns a map of status codes to quantities
-    /// </summary>
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
     
-    /// <returns>Dictionary<String, int?></returns>
-    public Dictionary<String, int?> GetInventory () {
-
-      
-
-      var path = "/store/inventory";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "api_key" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content);
-      }
-      return (Dictionary<String, int?>) apiClient.Deserialize(response.Content, typeof(Dictionary<String, int?>));
-    }
-	
-	 /// <summary>
-    /// Returns pet inventories by status Returns a map of status codes to quantities
-    /// </summary>
+            
+            
+            
+            
     
-    /// <returns>Dictionary<String, int?></returns>
-    public async Task<Dictionary<String, int?>> GetInventoryAsync () {
-
-      
-
-      var path = "/store/inventory";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] { "api_key" };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content);
-      }
-      return (Dictionary<String, int?>) apiClient.Deserialize(response.Content, typeof(Dictionary<String, int?>));
-    }
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key" };
     
-    /// <summary>
-    /// Place an order for a pet 
-    /// </summary>
-    /// <param name="Body">order placed for purchasing the pet</param>
-    /// <returns>Order</returns>
-    public Order PlaceOrder (Order Body) {
-
-      
-
-      var path = "/store/order";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
-      }
-      return (Order) apiClient.Deserialize(response.Content, typeof(Order));
-    }
-	
-	 /// <summary>
-    /// Place an order for a pet 
-    /// </summary>
-    /// <param name="Body">order placed for purchasing the pet</param>
-    /// <returns>Order</returns>
-    public async Task<Order> PlaceOrderAsync (Order Body) {
-
-      
-
-      var path = "/store/order";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
-      }
-      return (Order) apiClient.Deserialize(response.Content, typeof(Order));
-    }
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
     
-    /// <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>
-    /// <param name="OrderId">ID of pet that needs to be fetched</param>
-    /// <returns>Order</returns>
-    public Order GetOrderById (string OrderId) {
-
-      
-      // verify the required parameter 'OrderId' is set
-      if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling GetOrderById");
-      
-
-      var path = "/store/order/{orderId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content);
-      }
-      return (Order) apiClient.Deserialize(response.Content, 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>
-    /// <param name="OrderId">ID of pet that needs to be fetched</param>
-    /// <returns>Order</returns>
-    public async Task<Order> GetOrderByIdAsync (string OrderId) {
-
-      
-          // verify the required parameter 'OrderId' is set
-          if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling GetOrderById");
-      
-
-      var path = "/store/order/{orderId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content);
-      }
-      return (Order) apiClient.Deserialize(response.Content, typeof(Order));
-    }
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.ErrorMessage, response.ErrorMessage);
     
-    /// <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>
-    /// <param name="OrderId">ID of the order that needs to be deleted</param>
-    /// <returns></returns>
-    public void DeleteOrder (string OrderId) {
-
-      
-      // verify the required parameter 'OrderId' is set
-      if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling DeleteOrder");
-      
-
-      var path = "/store/order/{orderId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <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>
-    /// <param name="OrderId">ID of the order that needs to be deleted</param>
-    /// <returns></returns>
-    public async Task DeleteOrderAsync (string OrderId) {
-
-      
-          // verify the required parameter 'OrderId' is set
-          if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling DeleteOrder");
-      
-
-      var path = "/store/order/{orderId}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", apiClient.ParameterToString(OrderId));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
-      }
-      
-      return;
+            return (Dictionary<String, int?>) ApiClient.Deserialize(response.Content, typeof(Dictionary<String, int?>), response.Headers);
+        }
+    
+        /// <summary>
+        /// Returns pet inventories by status Returns a map of status codes to quantities
+        /// </summary>
+        /// <returns>Dictionary<String, int?></returns>
+        public async System.Threading.Tasks.Task<Dictionary<String, int?>> GetInventoryAsync ()
+        {
+            
+    
+            var path = "/store/inventory";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] { "api_key" };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetInventory: " + response.Content, response.Content);
+
+            return (Dictionary<String, int?>) ApiClient.Deserialize(response.Content, typeof(Dictionary<String, int?>), response.Headers);
+        }
+        
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <param name="body">order placed for purchasing the pet</param> 
+        /// <returns>Order</returns>            
+        public Order PlaceOrder (Order body)
+        {
+            
+    
+            var path = "/store/order";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+    
+        /// <summary>
+        /// Place an order for a pet 
+        /// </summary>
+        /// <param name="body">order placed for purchasing the pet</param>
+        /// <returns>Order</returns>
+        public async System.Threading.Tasks.Task<Order> PlaceOrderAsync (Order body)
+        {
+            
+    
+            var path = "/store/order";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling PlaceOrder: " + response.Content, response.Content);
+
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+        
+        /// <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>
+        /// <param name="orderId">ID of pet that needs to be fetched</param> 
+        /// <returns>Order</returns>            
+        public Order GetOrderById (string orderId)
+        {
+            
+            // verify the required parameter 'orderId' is set
+            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById");
+            
+    
+            var path = "/store/order/{orderId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+    
+        /// <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>
+        /// <param name="orderId">ID of pet that needs to be fetched</param>
+        /// <returns>Order</returns>
+        public async System.Threading.Tasks.Task<Order> GetOrderByIdAsync (string orderId)
+        {
+            // verify the required parameter 'orderId' is set
+            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById");
+            
+    
+            var path = "/store/order/{orderId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetOrderById: " + response.Content, response.Content);
+
+            return (Order) ApiClient.Deserialize(response.Content, typeof(Order), response.Headers);
+        }
+        
+        /// <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>
+        /// <param name="orderId">ID of the order that needs to be deleted</param> 
+        /// <returns></returns>            
+        public void DeleteOrder (string orderId)
+        {
+            
+            // verify the required parameter 'orderId' is set
+            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
+            
+    
+            var path = "/store/order/{orderId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <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>
+        /// <param name="orderId">ID of the order that needs to be deleted</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task DeleteOrderAsync (string orderId)
+        {
+            // verify the required parameter 'orderId' is set
+            if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
+            
+    
+            var path = "/store/order/{orderId}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteOrder: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
     }
     
-  }  
-  
 }
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 ffee3f5fdd2..b69bd7be58b 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
@@ -1,796 +1,811 @@
 using System;
+using System.IO;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using RestSharp;
 using IO.Swagger.Client;
 using IO.Swagger.Model;
 
-namespace IO.Swagger.Api {
-  
-
-  public interface IUserApi {
+namespace IO.Swagger.Api
+{
     
+    public interface IUserApi
+    {
+        
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param>
+        /// <returns></returns>
+        void CreateUser (User body);
+  
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task CreateUserAsync (User body);
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        void CreateUsersWithArrayInput (List<User> body);
+  
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List<User> body);
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        void CreateUsersWithListInput (List<User> body);
+  
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task CreateUsersWithListInputAsync (List<User> body);
+        
+        /// <summary>
+        /// Logs user into the system 
+        /// </summary>
+        /// <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, string password);
+  
+        /// <summary>
+        /// Logs user into the system 
+        /// </summary>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
+        /// <returns>string</returns>
+        System.Threading.Tasks.Task<string> LoginUserAsync (string username, string password);
+        
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <returns></returns>
+        void LogoutUser ();
+  
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <returns></returns>
+        System.Threading.Tasks.Task LogoutUserAsync ();
+        
+        /// <summary>
+        /// Get user by user name 
+        /// </summary>
+        /// <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>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
+        /// <returns>User</returns>
+        System.Threading.Tasks.Task<User> GetUserByNameAsync (string username);
+        
+        /// <summary>
+        /// Updated user This can only be done by the logged in user.
+        /// </summary>
+        /// <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);
+  
+        /// <summary>
+        /// Updated user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task UpdateUserAsync (string username, User body);
+        
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param>
+        /// <returns></returns>
+        void DeleteUser (string username);
+  
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param>
+        /// <returns></returns>
+        System.Threading.Tasks.Task DeleteUserAsync (string username);
+        
+    }
+  
     /// <summary>
-    /// Create user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Body">Created user object</param>
-    /// <returns></returns>
-    void CreateUser (User Body);
-
-    /// <summary>
-    /// Create user This can only be done by the logged in user.
+    /// Represents a collection of functions to interact with the API endpoints
     /// </summary>
-    /// <param name="Body">Created user object</param>
-    /// <returns></returns>
-    Task CreateUserAsync (User Body);
+    public class UserApi : IUserApi
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserApi"/> class.
+        /// </summary>
+        /// <param name="apiClient"> an instance of ApiClient (optional)</param>
+        /// <returns></returns>
+        public UserApi(ApiClient apiClient = null)
+        {
+            if (apiClient == null) // use the default one in Configuration
+                this.ApiClient = Configuration.DefaultApiClient; 
+            else
+                this.ApiClient = apiClient;
+        }
     
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    void CreateUsersWithArrayInput (List<User> Body);
-
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    Task CreateUsersWithArrayInputAsync (List<User> Body);
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public UserApi(String basePath)
+        {
+            this.ApiClient = new ApiClient(basePath);
+        }
     
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    void CreateUsersWithListInput (List<User> Body);
-
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    Task CreateUsersWithListInputAsync (List<User> Body);
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public void SetBasePath(String basePath)
+        {
+            this.ApiClient.BasePath = basePath;
+        }
     
-    /// <summary>
-    /// Logs user into the system 
-    /// </summary>
-    /// <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, string Password);
-
-    /// <summary>
-    /// Logs user into the system 
-    /// </summary>
-    /// <param name="Username">The user name for login</param>/// <param name="Password">The password for login in clear text</param>
-    /// <returns>string</returns>
-    Task<string> LoginUserAsync (string Username, string Password);
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <param name="basePath">The base path</param>
+        /// <value>The base path</value>
+        public String GetBasePath(String basePath)
+        {
+            return this.ApiClient.BasePath;
+        }
     
-    /// <summary>
-    /// Logs out current logged in user session 
-    /// </summary>
+        /// <summary>
+        /// Gets or sets the API client.
+        /// </summary>
+        /// <value>An instance of the ApiClient</param>
+        public ApiClient ApiClient {get; set;}
     
-    /// <returns></returns>
-    void LogoutUser ();
-
-    /// <summary>
-    /// Logs out current logged in user session 
-    /// </summary>
+        
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param> 
+        /// <returns></returns>            
+        public void CreateUser (User body)
+        {
+            
     
-    /// <returns></returns>
-    Task LogoutUserAsync ();
+            var path = "/user";
+            path = path.Replace("{format}", "json");
+            
     
-    /// <summary>
-    /// Get user by user name 
-    /// </summary>
-    /// <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>
-    /// <param name="Username">The name that needs to be fetched. Use user1 for testing. </param>
-    /// <returns>User</returns>
-    Task<User> GetUserByNameAsync (string Username);
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
     
-    /// <summary>
-    /// Updated user This can only be done by the logged in user.
-    /// </summary>
-    /// <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);
-
-    /// <summary>
-    /// Updated user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Username">name that need to be deleted</param>/// <param name="Body">Updated user object</param>
-    /// <returns></returns>
-    Task UpdateUserAsync (string Username, User Body);
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
     
-    /// <summary>
-    /// Delete user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Username">The name that needs to be deleted</param>
-    /// <returns></returns>
-    void DeleteUser (string Username);
-
-    /// <summary>
-    /// Delete user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Username">The name that needs to be deleted</param>
-    /// <returns></returns>
-    Task DeleteUserAsync (string Username);
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
     
-  }
-
-  /// <summary>
-  /// Represents a collection of functions to interact with the API endpoints
-  /// </summary>
-  public class UserApi : IUserApi {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="UserApi"/> class.
-    /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)
-    /// <returns></returns>
-    public UserApi(ApiClient apiClient = null) {
-      if (apiClient == null) { // use the default one in Configuration
-        this.apiClient = Configuration.apiClient; 
-      } else {
-        this.apiClient = apiClient;
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="UserApi"/> class.
-    /// </summary>
-    /// <returns></returns>
-    public UserApi(String basePath)
-    {
-      this.apiClient = new ApiClient(basePath);
-    }
-
-    /// <summary>
-    /// Sets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public void SetBasePath(String basePath) {
-      this.apiClient.basePath = basePath;
-    }
-
-    /// <summary>
-    /// Gets the base path of the API client.
-    /// </summary>
-    /// <value>The base path</value>
-    public String GetBasePath(String basePath) {
-      return this.apiClient.basePath;
-    }
-
-    /// <summary>
-    /// Gets or sets the API client.
-    /// </summary>
-    /// <value>The API client</value>
-    public ApiClient apiClient {get; set;}
-
-
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
     
-    /// <summary>
-    /// Create user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Body">Created user object</param>
-    /// <returns></returns>
-    public void CreateUser (User Body) {
-
-      
-
-      var path = "/user";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Create user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Body">Created user object</param>
-    /// <returns></returns>
-    public async Task CreateUserAsync (User Body) {
-
-      
-
-      var path = "/user";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.ErrorMessage, response.ErrorMessage);
     
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    public void CreateUsersWithArrayInput (List<User> Body) {
-
-      
-
-      var path = "/user/createWithArray";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    public async Task CreateUsersWithArrayInputAsync (List<User> Body) {
-
-      
-
-      var path = "/user/createWithArray";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
+            return;
+        }
     
-    /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    public void CreateUsersWithListInput (List<User> Body) {
-
-      
-
-      var path = "/user/createWithList";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Creates list of users with given input array 
-    /// </summary>
-    /// <param name="Body">List of user object</param>
-    /// <returns></returns>
-    public async Task CreateUsersWithListInputAsync (List<User> Body) {
-
-      
-
-      var path = "/user/createWithList";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
+        /// <summary>
+        /// Create user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="body">Created user object</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task CreateUserAsync (User body)
+        {
+            
     
-    /// <summary>
-    /// Logs user into the system 
-    /// </summary>
-    /// <param name="Username">The user name for login</param>/// <param name="Password">The password for login in clear text</param>
-    /// <returns>string</returns>
-    public string LoginUser (string Username, string Password) {
-
-      
-
-      var path = "/user/login";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-       if (Username != null) queryParams.Add("username", apiClient.ParameterToString(Username)); // query parameter
-       if (Password != null) queryParams.Add("password", apiClient.ParameterToString(Password)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content);
-      }
-      return (string) apiClient.Deserialize(response.Content, typeof(string));
-    }
-	
-	 /// <summary>
-    /// Logs user into the system 
-    /// </summary>
-    /// <param name="Username">The user name for login</param>/// <param name="Password">The password for login in clear text</param>
-    /// <returns>string</returns>
-    public async Task<string> LoginUserAsync (string Username, string Password) {
-
-      
-
-      var path = "/user/login";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-       if (Username != null) queryParams.Add("username", apiClient.ParameterToString(Username)); // query parameter
-       if (Password != null) queryParams.Add("password", apiClient.ParameterToString(Password)); // query parameter
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content);
-      }
-      return (string) apiClient.Deserialize(response.Content, typeof(string));
-    }
+            var path = "/user";
+            path = path.Replace("{format}", "json");
+            
     
-    /// <summary>
-    /// Logs out current logged in user session 
-    /// </summary>
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
     
-    /// <returns></returns>
-    public void LogoutUser () {
-
-      
-
-      var path = "/user/logout";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Logs out current logged in user session 
-    /// </summary>
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
     
-    /// <returns></returns>
-    public async Task LogoutUserAsync () {
-
-      
-
-      var path = "/user/logout";
-      path = path.Replace("{format}", "json");
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
     
-    /// <summary>
-    /// Get user by user name 
-    /// </summary>
-    /// <param name="Username">The name that needs to be fetched. Use user1 for testing. </param>
-    /// <returns>User</returns>
-    public User GetUserByName (string Username) {
-
-      
-      // verify the required parameter 'Username' is set
-      if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling GetUserByName");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content);
-      }
-      return (User) apiClient.Deserialize(response.Content, typeof(User));
-    }
-	
-	 /// <summary>
-    /// Get user by user name 
-    /// </summary>
-    /// <param name="Username">The name that needs to be fetched. Use user1 for testing. </param>
-    /// <returns>User</returns>
-    public async Task<User> GetUserByNameAsync (string Username) {
-
-      
-          // verify the required parameter 'Username' is set
-          if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling GetUserByName");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content);
-      }
-      return (User) apiClient.Deserialize(response.Content, typeof(User));
-    }
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUser: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param> 
+        /// <returns></returns>            
+        public void CreateUsersWithArrayInput (List<User> body)
+        {
+            
     
-    /// <summary>
-    /// Updated user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Username">name that need to be deleted</param>/// <param name="Body">Updated user object</param>
-    /// <returns></returns>
-    public void UpdateUser (string Username, User Body) {
-
-      
-      // verify the required parameter 'Username' is set
-      if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling UpdateUser");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Updated user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Username">name that need to be deleted</param>/// <param name="Body">Updated user object</param>
-    /// <returns></returns>
-    public async Task UpdateUserAsync (string Username, User Body) {
-
-      
-          // verify the required parameter 'Username' is set
-          if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling UpdateUser");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      postBody = apiClient.Serialize(Body); // http body (model) parameter
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
+            var path = "/user/createWithArray";
+            path = path.Replace("{format}", "json");
+            
     
-    /// <summary>
-    /// Delete user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Username">The name that needs to be deleted</param>
-    /// <returns></returns>
-    public void DeleteUser (string Username) {
-
-      
-      // verify the required parameter 'Username' is set
-      if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling DeleteUser");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) apiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content);
-      }
-      
-      return;
-    }
-	
-	 /// <summary>
-    /// Delete user This can only be done by the logged in user.
-    /// </summary>
-    /// <param name="Username">The name that needs to be deleted</param>
-    /// <returns></returns>
-    public async Task DeleteUserAsync (string Username) {
-
-      
-          // verify the required parameter 'Username' is set
-          if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling DeleteUser");
-      
-
-      var path = "/user/{username}";
-      path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", apiClient.ParameterToString(Username));
-      
-
-      var queryParams = new Dictionary<String, String>();
-      var headerParams = new Dictionary<String, String>();
-      var formParams = new Dictionary<String, String>();
-      var fileParams = new Dictionary<String, String>();
-      String postBody = null;
-
-      
-      
-      
-      
-
-      // authentication setting, if any
-      String[] authSettings = new String[] {  };
-
-      // make the HTTP request
-      IRestResponse response = (IRestResponse) await apiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
-      if (((int)response.StatusCode) >= 400) {
-        throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content);
-      }
-      
-      return;
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task CreateUsersWithArrayInputAsync (List<User> body)
+        {
+            
+    
+            var path = "/user/createWithArray";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithArrayInput: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param> 
+        /// <returns></returns>            
+        public void CreateUsersWithListInput (List<User> body)
+        {
+            
+    
+            var path = "/user/createWithList";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Creates list of users with given input array 
+        /// </summary>
+        /// <param name="body">List of user object</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task CreateUsersWithListInputAsync (List<User> body)
+        {
+            
+    
+            var path = "/user/createWithList";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.POST, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling CreateUsersWithListInput: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Logs user into the system 
+        /// </summary>
+        /// <param name="username">The user name for login</param> 
+        /// <param name="password">The password for login in clear text</param> 
+        /// <returns>string</returns>            
+        public string LoginUser (string username, string password)
+        {
+            
+    
+            var path = "/user/login";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+             if (username != null) queryParams.Add("username", ApiClient.ParameterToString(username)); // query parameter
+             if (password != null) queryParams.Add("password", ApiClient.ParameterToString(password)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (string) ApiClient.Deserialize(response.Content, typeof(string), response.Headers);
+        }
+    
+        /// <summary>
+        /// Logs user into the system 
+        /// </summary>
+        /// <param name="username">The user name for login</param>
+        /// <param name="password">The password for login in clear text</param>
+        /// <returns>string</returns>
+        public async System.Threading.Tasks.Task<string> LoginUserAsync (string username, string password)
+        {
+            
+    
+            var path = "/user/login";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+             if (username != null) queryParams.Add("username", ApiClient.ParameterToString(username)); // query parameter
+             if (password != null) queryParams.Add("password", ApiClient.ParameterToString(password)); // query parameter
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling LoginUser: " + response.Content, response.Content);
+
+            return (string) ApiClient.Deserialize(response.Content, typeof(string), response.Headers);
+        }
+        
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <returns></returns>            
+        public void LogoutUser ()
+        {
+            
+    
+            var path = "/user/logout";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Logs out current logged in user session 
+        /// </summary>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task LogoutUserAsync ()
+        {
+            
+    
+            var path = "/user/logout";
+            path = path.Replace("{format}", "json");
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling LogoutUser: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Get user by user name 
+        /// </summary>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param> 
+        /// <returns>User</returns>            
+        public User GetUserByName (string username)
+        {
+            
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName");
+            
+    
+            var path = "/user/{username}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return (User) ApiClient.Deserialize(response.Content, typeof(User), response.Headers);
+        }
+    
+        /// <summary>
+        /// Get user by user name 
+        /// </summary>
+        /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
+        /// <returns>User</returns>
+        public async System.Threading.Tasks.Task<User> GetUserByNameAsync (string username)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName");
+            
+    
+            var path = "/user/{username}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.GET, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling GetUserByName: " + response.Content, response.Content);
+
+            return (User) ApiClient.Deserialize(response.Content, typeof(User), response.Headers);
+        }
+        
+        /// <summary>
+        /// Updated user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">name that need to be deleted</param> 
+        /// <param name="body">Updated user object</param> 
+        /// <returns></returns>            
+        public void UpdateUser (string username, User body)
+        {
+            
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser");
+            
+    
+            var path = "/user/{username}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Updated user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">name that need to be deleted</param>
+        /// <param name="body">Updated user object</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task UpdateUserAsync (string username, User body)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser");
+            
+    
+            var path = "/user/{username}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            postBody = ApiClient.Serialize(body); // http body (model) parameter
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.PUT, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling UpdateUser: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param> 
+        /// <returns></returns>            
+        public void DeleteUser (string username)
+        {
+            
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
+            
+    
+            var path = "/user/{username}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) ApiClient.CallApi(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+    
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content);
+            else if (((int)response.StatusCode) == 0)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.ErrorMessage, response.ErrorMessage);
+    
+            return;
+        }
+    
+        /// <summary>
+        /// Delete user This can only be done by the logged in user.
+        /// </summary>
+        /// <param name="username">The name that needs to be deleted</param>
+        /// <returns></returns>
+        public async System.Threading.Tasks.Task DeleteUserAsync (string username)
+        {
+            // verify the required parameter 'username' is set
+            if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
+            
+    
+            var path = "/user/{username}";
+            path = path.Replace("{format}", "json");
+            path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
+            
+    
+            var queryParams = new Dictionary<String, String>();
+            var headerParams = new Dictionary<String, String>();
+            var formParams = new Dictionary<String, String>();
+            var fileParams = new Dictionary<String, FileParameter>();
+            String postBody = null;
+    
+            
+            
+            
+            
+    
+            // authentication setting, if any
+            String[] authSettings = new String[] {  };
+    
+            // make the HTTP request
+            IRestResponse response = (IRestResponse) await ApiClient.CallApiAsync(path, Method.DELETE, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
+            if (((int)response.StatusCode) >= 400)
+                throw new ApiException ((int)response.StatusCode, "Error calling DeleteUser: " + response.Content, response.Content);
+
+            
+            return;
+        }
+        
     }
     
-  }  
-  
 }
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 b001a38845c..117cd598008 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
@@ -1,222 +1,342 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Text.RegularExpressions;
 using System.IO;
+using System.Web;
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 using RestSharp;
+using RestSharp.Extensions;
 
-namespace IO.Swagger.Client {
-  /// <summary>
-  /// API client is mainly responible for making the HTTP call to the API backend
-  /// </summary>
-  public class ApiClient {
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiClient"/> class.
-    /// </summary>
-    /// <param name="basePath">The base path.</param>
-    public ApiClient(String basePath="http://petstore.swagger.io/v2") {
-      this.basePath = basePath;
-      this.restClient = new RestClient(this.basePath);
-    }
-
-    /// <summary>
-    /// Gets or sets the base path.
-    /// </summary>
-    /// <value>The base path.</value> 
-    public string basePath { get; set; }
-
+namespace IO.Swagger.Client
+{
     /// <summary>
-    /// Gets or sets the RestClient
+    /// API client is mainly responible for making the HTTP call to the API backend.
     /// </summary>
-    /// <value>The RestClient.</value> 
-    public RestClient restClient { get; set; }
-
-    private Dictionary<String, String> defaultHeaderMap = new Dictionary<String, String>();
-
-    public Object CallApi(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, String> FileParams, String[] AuthSettings) {
-      var response = Task.Run(async () => {
-                            var resp = await CallApiAsync(Path, Method, QueryParams, PostBody, HeaderParams, FormParams, FileParams, AuthSettings);
-                            return resp;
-                            });
-        return response.Result;
-    }
-
-    public async Task<Object> CallApiAsync(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, String> FileParams, String[] AuthSettings) {
-
-      var request = new RestRequest(Path, Method);
+    public class ApiClient
+    {
+        private readonly Dictionary<String, String> _defaultHeaderMap = new Dictionary<String, String>();
+  
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiClient" /> class.
+        /// </summary>
+        /// <param name="basePath">The base path.</param>
+        public ApiClient(String basePath="http://petstore.swagger.io/v2")
+        {
+            BasePath = basePath;
+            RestClient = new RestClient(BasePath);
+        }
+    
+        /// <summary>
+        /// Gets or sets the base path.
+        /// </summary>
+        /// <value>The base path</value>
+        public string BasePath { get; set; }
+    
+        /// <summary>
+        /// Gets or sets the RestClient.
+        /// </summary>
+        /// <value>An instance of the RestClient</value>
+        public RestClient RestClient { get; set; }
+    
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        public Dictionary<String, String> DefaultHeader
+        {
+            get { return _defaultHeaderMap; }
+        }
+    
+        /// <summary>
+        /// Makes the HTTP request (Sync).
+        /// </summary>
+        /// <param name="path">URL path.</param>
+        /// <param name="method">HTTP method.</param>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="postBody">HTTP body (POST request).</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="formParams">Form parameters.</param>
+        /// <param name="fileParams">File parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        /// <returns>Object</returns>
+        public Object CallApi(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams, 
+            Dictionary<String, FileParameter> fileParams, String[] authSettings)
+        {
 
-      UpdateParamsForAuth(QueryParams, HeaderParams, AuthSettings);
+            var request = new RestRequest(path, method);
+   
+            UpdateParamsForAuth(queryParams, headerParams, authSettings);
 
-      // add default header, if any
-      foreach(KeyValuePair<string, string> defaultHeader in this.defaultHeaderMap)
-        request.AddHeader(defaultHeader.Key, defaultHeader.Value);
+            // add default header, if any
+            foreach(var defaultHeader in _defaultHeaderMap)
+                request.AddHeader(defaultHeader.Key, defaultHeader.Value);
 
-      // add header parameter, if any
-      foreach(KeyValuePair<string, string> param in HeaderParams)
-        request.AddHeader(param.Key, param.Value);
-     
-      // add query parameter, if any
-      foreach(KeyValuePair<string, string> param in QueryParams)
-        request.AddQueryParameter(param.Key, param.Value);
+            // add header parameter, if any
+            foreach(var param in headerParams)
+                request.AddHeader(param.Key, param.Value);
 
-      // add form parameter, if any
-      foreach(KeyValuePair<string, string> param in FormParams)
-        request.AddParameter(param.Key, param.Value);
+            // add query parameter, if any
+            foreach(var param in queryParams)
+                request.AddQueryParameter(param.Key, param.Value);
 
-      // add file parameter, if any
-      foreach(KeyValuePair<string, string> param in FileParams)
-        request.AddFile(param.Key, param.Value);
+            // add form parameter, if any
+            foreach(var param in formParams)
+                request.AddParameter(param.Key, param.Value);
 
-      if (PostBody != null) {
-        request.AddParameter("application/json", PostBody, ParameterType.RequestBody); // http body (model) parameter
-      }
+            // add file parameter, if any
+            foreach(var param in fileParams)
+                request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
 
-      return (Object) await restClient.ExecuteTaskAsync(request);
+            if (postBody != null) // http body (model) parameter
+                request.AddParameter("application/json", postBody, ParameterType.RequestBody);
 
-    }
+            return (Object)RestClient.Execute(request);
 
-    /// <summary>
-    /// Add default header
-    /// </summary>
-    /// <param name="key">  Header field name
-    /// <param name="value"> Header field value
-    /// <returns></returns>
-    public void AddDefaultHeader(string key, string value) {
-       defaultHeaderMap.Add(key, value);
-    }
+        }
 
-    /// <summary>
-    /// Get default header
-    /// </summary>
-    /// <returns>Dictionary of default header</returns>
-    public Dictionary<String, String> GetDefaultHeader() {
-       return defaultHeaderMap;
-    }
+        /// <summary>
+        /// Makes the asynchronous HTTP request.
+        /// </summary>
+        /// <param name="path">URL path.</param>
+        /// <param name="method">HTTP method.</param>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="postBody">HTTP body (POST request).</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="formParams">Form parameters.</param>
+        /// <param name="fileParams">File parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        /// <returns>The Task instance.</returns>
+        public async System.Threading.Tasks.Task<Object> CallApiAsync(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+            Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings)
+        {
+    
+            var request = new RestRequest(path, method);
+    
+            UpdateParamsForAuth(queryParams, headerParams, authSettings);
+    
+            // add default header, if any
+            foreach(var defaultHeader in _defaultHeaderMap)
+                request.AddHeader(defaultHeader.Key, defaultHeader.Value);
+    
+            // add header parameter, if any
+            foreach(var param in headerParams)
+                request.AddHeader(param.Key, param.Value);
+           
+            // add query parameter, if any
+            foreach(var param in queryParams)
+                request.AddQueryParameter(param.Key, param.Value);
+    
+            // add form parameter, if any
+            foreach(var param in formParams)
+                request.AddParameter(param.Key, param.Value);
+    
+            // add file parameter, if any
+            foreach(var param in fileParams)
+                request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
 
-    /// <summary>
-    /// escape string (url-encoded)
-    /// </summary>
-    /// <param name="str"> String to be escaped
-    /// <returns>Escaped string</returns>
-    public string EscapeString(string str) {
-      return str;
-    }
+            if (postBody != null) // http body (model) parameter
+                request.AddParameter("application/json", postBody, ParameterType.RequestBody);
+    
+            return (Object) await RestClient.ExecuteTaskAsync(request);
+        }
+    
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        public void AddDefaultHeader(string key, string value)
+        {
+            _defaultHeaderMap.Add(key, value);
+        }
+    
+        /// <summary>
+        /// Escape string (url-encoded).
+        /// </summary>
+        /// <param name="str">String to be escaped.</param>
+        /// <returns>Escaped string.</returns>
+        public string EscapeString(string str)
+        {
+            return HttpUtility.UrlEncode(str);
+        }
+    
+        /// <summary>
+        /// Create FileParameter based on Stream.
+        /// </summary>
+        /// <param name="name">Parameter name.</param>
+        /// <param name="stream">Input stream.</param>
+        /// <returns>FileParameter.</returns>
+        public FileParameter ParameterToFile(string name, Stream stream)
+        {
+            if (stream is FileStream)
+                return FileParameter.Create(name, stream.ReadAsBytes(), Path.GetFileName(((FileStream)stream).Name));
+            else
+                return FileParameter.Create(name, stream.ReadAsBytes(), "no_file_name_provided");
+        }
+    
+        /// <summary>
+        /// If parameter is DateTime, output in ISO8601 format.
+        /// If parameter is a list of string, join the list with ",".
+        /// Otherwise just return the string.
+        /// </summary>
+        /// <param name="obj">The parameter (header, path, query, form).</param>
+        /// <returns>Formatted string.</returns>
+        public string ParameterToString(object obj)
+        {
+            if (obj is DateTime)
+                return ((DateTime)obj).ToString ("u");
+            else if (obj is List<string>)
+                return String.Join(",", obj as List<string>);
+            else
+                return Convert.ToString (obj);
+        }
+    
+        /// <summary>
+        /// Deserialize the JSON string into a proper object.
+        /// </summary>
+        /// <param name="content">HTTP body (e.g. string, JSON).</param>
+        /// <param name="type">Object type.</param>
+        /// <returns>Object representation of the JSON string.</returns>
+        public object Deserialize(string content, Type type, IList<Parameter> headers=null)
+        {
+            if (type == typeof(Object)) // return an object
+            {
+                return content;
+            }
 
-    /// <summary>
-    /// if parameter is DateTime, output in ISO8601 format
-    /// if parameter is a list of string, join the list with ","
-    /// otherwise just return the string
-    /// </summary>
-    /// <param name="obj"> The parameter (header, path, query, form)
-    /// <returns>Formatted string</returns>
-    public string ParameterToString(object obj)
-    {
-      if (obj is DateTime) {
-        return ((DateTime)obj).ToString ("u");
-      } else if (obj is List<string>) {
-        return String.Join(",", obj as List<string>);
-      } else {
-	return Convert.ToString (obj);
-      }
-    }
+            if (type == typeof(Stream))
+            {
+                var filePath = String.IsNullOrEmpty(Configuration.TempFolderPath)
+                    ? Path.GetTempPath()
+                    : Configuration.TempFolderPath;
 
-    /// <summary>
-    /// Deserialize the JSON string into a proper object
-    /// </summary>
-    /// <param name="json"> JSON string
-    /// <param name="type"> Object type
-    /// <returns>Object representation of the JSON string</returns>
-    public object Deserialize(string content, Type type) {
-      if (type.GetType() == typeof(Object))
-        return (Object)content;
-
-      try
-      {
-          return JsonConvert.DeserializeObject(content, type);
-      }
-      catch (IOException e) {
-        throw new ApiException(500, e.Message);
-      }
-    }
+                var fileName = filePath + Guid.NewGuid();
+                if (headers != null)
+                {
+                    var regex = new Regex(@"Content-Disposition:.*filename=['""]?([^'""\s]+)['""]?$");
+                    var match = regex.Match(headers.ToString());
+                    if (match.Success)
+                        fileName = filePath + match.Value.Replace("\"", "").Replace("'", "");
+                }
+                File.WriteAllText(fileName, content);
+                return new FileStream(fileName, FileMode.Open);
 
-    /// <summary>
-    /// Serialize an object into JSON string
-    /// </summary>
-    /// <param name="obj"> Object 
-    /// <returns>JSON string</returns>
-    public string Serialize(object obj) {
-      try
-      {
-          return obj != null ? JsonConvert.SerializeObject(obj) : null;
-      }
-      catch (Exception e) {
-        throw new ApiException(500, e.Message);
-      }
-    }
+            }
 
-    /// <summary>
-    /// Get the API key with prefix
-    /// </summary>
-    /// <param name="obj"> Object 
-    /// <returns>API key with prefix</returns>
-    public string GetApiKeyWithPrefix (string apiKey)
-    {
-      var apiKeyValue = "";
-      Configuration.apiKey.TryGetValue (apiKey, out apiKeyValue);
-      var apiKeyPrefix = "";
-      if (Configuration.apiKeyPrefix.TryGetValue (apiKey, out apiKeyPrefix)) {
-        return apiKeyPrefix + " " + apiKeyValue;
-      } else {
-        return apiKeyValue;
-      }
-    }
+            if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
+            {
+                return DateTime.Parse(content,  null, System.Globalization.DateTimeStyles.RoundtripKind);
+            }
 
-    /// <summary>
-    /// Update parameters based on authentication
-    /// </summary>
-    /// <param name="QueryParams">Query parameters</param>
-    /// <param name="HeaderParams">Header parameters</param>
-    /// <param name="AuthSettings">Authentication settings</param>
-    public void UpdateParamsForAuth(Dictionary<String, String> QueryParams, Dictionary<String, String> HeaderParams, string[] AuthSettings) {
-      if (AuthSettings == null || AuthSettings.Length == 0)
-        return;
-  
-      foreach (string auth in AuthSettings) {
-        // determine which one to use
-        switch(auth) {
-          
-          case "api_key":
-            HeaderParams["api_key"] = GetApiKeyWithPrefix("api_key");
-            
-            break;
-          
-          case "petstore_auth":
-            
-            //TODO support oauth
-            break;
-          
-          default:
-            //TODO show warning about security definition not found
-          break;
+            if (type == typeof(String) || type.Name.StartsWith("System.Nullable")) // return primitive type
+            {
+                return ConvertType(content, type); 
+            }
+    
+            // at this point, it must be a model (json)
+            try
+            {
+                return JsonConvert.DeserializeObject(content, type);
+            }
+            catch (IOException e)
+            {
+                throw new ApiException(500, e.Message);
+            }
         }
-      }
-
-    }
+    
+        /// <summary>
+        /// Serialize an object into JSON string.
+        /// </summary>
+        /// <param name="obj">Object.</param>
+        /// <returns>JSON string.</returns>
+        public string Serialize(object obj)
+        {
+            try
+            {
+                return obj != null ? JsonConvert.SerializeObject(obj) : null;
+            }
+            catch (Exception e)
+            {
+                throw new ApiException(500, e.Message);
+            }
+        }
+    
+        /// <summary>
+        /// Get the API key with prefix.
+        /// </summary>
+        /// <param name="apiKeyIdentifier">API key identifier (authentication scheme).</param>
+        /// <returns>API key with prefix.</returns>
+        public string GetApiKeyWithPrefix (string apiKeyIdentifier)
+        {
+            var apiKeyValue = "";
+            Configuration.ApiKey.TryGetValue (apiKeyIdentifier, out apiKeyValue);
+            var apiKeyPrefix = "";
+            if (Configuration.ApiKeyPrefix.TryGetValue (apiKeyIdentifier, out apiKeyPrefix))
+                return apiKeyPrefix + " " + apiKeyValue;
+            else
+                return apiKeyValue;
+        }
+    
+        /// <summary>
+        /// Update parameters based on authentication.
+        /// </summary>
+        /// <param name="queryParams">Query parameters.</param>
+        /// <param name="headerParams">Header parameters.</param>
+        /// <param name="authSettings">Authentication settings.</param>
+        public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings)
+        {
+            if (authSettings == null || authSettings.Length == 0)
+                return;
 
-    /// <summary>
-    /// Encode string in base64 format 
-    /// </summary>
-    /// <param name="text">String to be encoded</param>
-    public static string Base64Encode(string text) {
-      var textByte = System.Text.Encoding.UTF8.GetBytes(text);
-      return System.Convert.ToBase64String(textByte);
+            foreach (string auth in authSettings)
+            {
+                // determine which one to use
+                switch(auth)
+                {
+                    
+                    case "api_key":
+                        headerParams["api_key"] = GetApiKeyWithPrefix("api_key");
+                        
+                        break;
+                    
+                    case "petstore_auth":
+                        
+                        //TODO support oauth
+                        break;
+                    
+                    default:
+                        //TODO show warning about security definition not found
+                        break;
+                }
+            }
+        }
+ 
+        /// <summary>
+        /// Encode string in base64 format.
+        /// </summary>
+        /// <param name="text">String to be encoded.</param>
+        /// <returns>Encoded string.</returns>
+        public static string Base64Encode(string text)
+        {
+            var textByte = System.Text.Encoding.UTF8.GetBytes(text);
+            return System.Convert.ToBase64String(textByte);
+        }
+    
+        /// <summary>
+        /// Dynamically cast the object into target type.
+        /// Ref: http://stackoverflow.com/questions/4925718/c-dynamic-runtime-cast
+        /// </summary>
+        /// <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) {
+            return Convert.ChangeType(source, dest);
+        }
+  
     }
-
-  }
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiException.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiException.cs
index f9cf380e683..20df8115c79 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiException.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiException.cs
@@ -5,37 +5,43 @@ namespace IO.Swagger.Client {
   /// API Exception
   /// </summary>
   public class ApiException : Exception {
-    /// <summary>
-    /// Gets or sets the error code (HTTP status code)
-    /// </summary>
-    /// <value>The error code (HTTP status code).</value>
-    public int ErrorCode { get; set; }
+      /// <summary>
+      /// Gets or sets the error code (HTTP status code)
+      /// </summary>
+      /// <value>The error code (HTTP status code).</value>
+      public int ErrorCode { get; set; }
 
-    /// <summary>
-    /// Gets or sets the error content (body json object)
-    /// </summary>
-    /// <value>The error content (Http response body).</value>
-    public dynamic ErrorContent { get; private set; }
+      /// <summary>
+      /// Gets or sets the error content (body json object)
+      /// </summary>
+      /// <value>The error content (Http response body).</value>
+      public dynamic ErrorContent { get; private set; }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiException"/> class.
-    /// </summary>
-    /// <param name="basePath">The base path.</param>
-    public ApiException() {}
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="basePath">The base path.</param>
+      public ApiException() {}
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiException"/> class.
-    /// </summary>
-    /// <param name="errorCode">HTTP status code.</param>
-    /// <param name="message">Error message.</param>
-    public ApiException(int errorCode, string message) : base(message) {
-      this.ErrorCode = errorCode;
-    }
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="errorCode">HTTP status code.</param>
+      /// <param name="message">Error message.</param>
+      public ApiException(int errorCode, string message) : base(message) {
+          this.ErrorCode = errorCode;
+      }
 
-    public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) {
-       this.ErrorCode = errorCode;
-       this.ErrorContent = errorContent;
-    }
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <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) {
+          this.ErrorCode = errorCode;
+          this.ErrorContent = errorContent;
+      }
 
   }
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs
index ab24fc1252c..80df0f4ec72 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs
@@ -1,51 +1,99 @@
 using System;
+using System.Reflection;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Text;
 
-namespace IO.Swagger.Client {
-  /// <summary>
-  /// Represents a set of configuration settings
-  /// </summary>
-  public class Configuration{
-
-    /// <summary>
-    /// Version of the package
-    /// </summary>
-    public const string Version = "1.0.0";
-
-    /// <summary>
-    /// Gets or sets the API client. This is the default API client for making HTTP calls.
-    /// </summary>
-    /// <value>The API client.</value>
-    public static ApiClient apiClient = new ApiClient();
-
-    /// <summary>
-    /// Gets or sets the username (HTTP basic authentication)
-    /// </summary>
-    /// <value>The username.</value>
-    public static String username { get; set; }
-
+namespace IO.Swagger.Client
+{
     /// <summary>
-    /// Gets or sets the password (HTTP basic authentication)
+    /// Represents a set of configuration settings
     /// </summary>
-    /// <value>The password.</value>
-    public static String password { get; set; }
-
-    /// <summary>
-    /// Gets or sets the API key based on the authentication name 
-    /// </summary>
-    /// <value>The API key.</value>
-    public static Dictionary<String, String> apiKey = new Dictionary<String, String>();
-
-    /// <summary>
-    /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name 
-    /// </summary>
-    /// <value>The prefix of the API key.</value>
-    public static Dictionary<String, String> apiKeyPrefix = new Dictionary<String, String>();
-
-
-  }
+    public class Configuration
+    {
+  
+        /// <summary>
+        /// Version of the package.
+        /// </summary>
+        /// <value>Version of the package.</value>
+        public const string Version = "1.0.0";
+  
+        /// <summary>
+        /// Gets or sets the default API client for making HTTP calls.
+        /// </summary>
+        /// <value>The API client.</value>
+        public static ApiClient DefaultApiClient = new ApiClient();
+  
+        /// <summary>
+        /// Gets or sets the username (HTTP basic authentication).
+        /// </summary>
+        /// <value>The username.</value>
+        public static String Username { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the password (HTTP basic authentication).
+        /// </summary>
+        /// <value>The password.</value>
+        public static String Password { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the API key based on the authentication name.
+        /// </summary>
+        /// <value>The API key.</value>
+        public static Dictionary<String, String> ApiKey = new Dictionary<String, String>();
+  
+        /// <summary>
+        /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name.
+        /// </summary>
+        /// <value>The prefix of the API key.</value>
+        public static Dictionary<String, String> ApiKeyPrefix = new Dictionary<String, String>();
+  
+        private static string _tempFolderPath = Path.GetTempPath();
+  
+        /// <summary>
+        /// Gets or sets the temporary folder path to store the files downloaded from the server.
+        /// </summary>
+        /// <value>Folder path.</value>
+        public static String TempFolderPath
+        {
+            get { return _tempFolderPath; }
+  
+            set 
+            {
+                if (String.IsNullOrEmpty(value))
+                {
+                    _tempFolderPath = value;
+                    return;
+                }
+      
+                // create the directory if it does not exist
+                if (!Directory.Exists(value)) 
+                    Directory.CreateDirectory(value);
+      
+                // check if the path contains directory separator at the end
+                if (value[value.Length - 1] == Path.DirectorySeparatorChar)
+                    _tempFolderPath = value;
+                else
+                    _tempFolderPath = value  + Path.DirectorySeparatorChar;
+            }
+        }
+  
+        /// <summary>
+        /// Returns a string with essential information for debugging.
+        /// </summary>
+        public static String ToDebugReport()
+        {
+            String report = "C# SDK (IO.Swagger) Debug Report:\n";
+            report += "    OS: " + Environment.OSVersion + "\n";
+            report += "    .NET Framework Version: " + Assembly
+                     .GetExecutingAssembly()
+                     .GetReferencedAssemblies()
+                     .Where(x => x.Name == "System.Core").First().Version.ToString()  + "\n";
+            report += "    Version of the API: 1.0.0\n";
+            report += "    SDK Package Version: 1.0.0\n";
+  
+            return report;
+        }
+    }
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs
index 4a410e8220d..c402188b9fc 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs
@@ -13,12 +13,16 @@ namespace IO.Swagger.Model {
   [DataContract]
   public class Category {
     
-    
+    /// <summary>
+    /// Gets or Sets Id
+    /// </summary>
     [DataMember(Name="id", EmitDefaultValue=false)]
     public long? Id { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets Name
+    /// </summary>
     [DataMember(Name="name", EmitDefaultValue=false)]
     public string Name { get; set; }
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
index 9e7e706f77e..07b3d14e598 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
@@ -13,32 +13,45 @@ namespace IO.Swagger.Model {
   [DataContract]
   public class Order {
     
-    
+    /// <summary>
+    /// Gets or Sets Id
+    /// </summary>
     [DataMember(Name="id", EmitDefaultValue=false)]
     public long? Id { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets PetId
+    /// </summary>
     [DataMember(Name="petId", EmitDefaultValue=false)]
     public long? PetId { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets Quantity
+    /// </summary>
     [DataMember(Name="quantity", EmitDefaultValue=false)]
     public int? Quantity { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets ShipDate
+    /// </summary>
     [DataMember(Name="shipDate", EmitDefaultValue=false)]
     public DateTime? ShipDate { get; set; }
 
     
-    /* Order Status */
+    /// <summary>
+    /// Order Status
+    /// </summary>
+    /// <value>Order Status</value>
     [DataMember(Name="status", EmitDefaultValue=false)]
     public string Status { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets Complete
+    /// </summary>
     [DataMember(Name="complete", EmitDefaultValue=false)]
     public bool? Complete { get; set; }
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
index 49e6d582f5e..41216b52802 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
@@ -13,32 +13,45 @@ namespace IO.Swagger.Model {
   [DataContract]
   public class Pet {
     
-    
+    /// <summary>
+    /// Gets or Sets Id
+    /// </summary>
     [DataMember(Name="id", EmitDefaultValue=false)]
     public long? Id { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets Category
+    /// </summary>
     [DataMember(Name="category", EmitDefaultValue=false)]
     public Category Category { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets Name
+    /// </summary>
     [DataMember(Name="name", EmitDefaultValue=false)]
     public string Name { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets PhotoUrls
+    /// </summary>
     [DataMember(Name="photoUrls", EmitDefaultValue=false)]
     public List<string> PhotoUrls { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets Tags
+    /// </summary>
     [DataMember(Name="tags", EmitDefaultValue=false)]
     public List<Tag> Tags { get; set; }
 
     
-    /* pet status in the store */
+    /// <summary>
+    /// pet status in the store
+    /// </summary>
+    /// <value>pet status in the store</value>
     [DataMember(Name="status", EmitDefaultValue=false)]
     public string Status { get; set; }
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs
index 47c87ae9ef1..10ace1ad185 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Tag.cs
@@ -13,12 +13,16 @@ namespace IO.Swagger.Model {
   [DataContract]
   public class Tag {
     
-    
+    /// <summary>
+    /// Gets or Sets Id
+    /// </summary>
     [DataMember(Name="id", EmitDefaultValue=false)]
     public long? Id { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets Name
+    /// </summary>
     [DataMember(Name="name", EmitDefaultValue=false)]
     public string Name { get; set; }
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs
index f2c3db54608..d22ac54c094 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/User.cs
@@ -13,42 +13,59 @@ namespace IO.Swagger.Model {
   [DataContract]
   public class User {
     
-    
+    /// <summary>
+    /// Gets or Sets Id
+    /// </summary>
     [DataMember(Name="id", EmitDefaultValue=false)]
     public long? Id { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets Username
+    /// </summary>
     [DataMember(Name="username", EmitDefaultValue=false)]
     public string Username { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets FirstName
+    /// </summary>
     [DataMember(Name="firstName", EmitDefaultValue=false)]
     public string FirstName { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets LastName
+    /// </summary>
     [DataMember(Name="lastName", EmitDefaultValue=false)]
     public string LastName { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets Email
+    /// </summary>
     [DataMember(Name="email", EmitDefaultValue=false)]
     public string Email { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets Password
+    /// </summary>
     [DataMember(Name="password", EmitDefaultValue=false)]
     public string Password { get; set; }
 
     
-    
+    /// <summary>
+    /// Gets or Sets Phone
+    /// </summary>
     [DataMember(Name="phone", EmitDefaultValue=false)]
     public string Phone { get; set; }
 
     
-    /* User Status */
+    /// <summary>
+    /// User Status
+    /// </summary>
+    /// <value>User Status</value>
     [DataMember(Name="userStatus", EmitDefaultValue=false)]
     public int? UserStatus { get; set; }
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj
index 7a0b8f7674b..670402c0cd2 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj
+++ b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj
@@ -29,9 +29,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="nunit.framework">
-      <HintPath>packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>Lib\SwaggerClient\bin\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -39,6 +36,11 @@
       <HintPath>Lib\SwaggerClient\bin\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="nunit.framework">
+      <HintPath>packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Lib\SwaggerClient\src\main\csharp\IO\Swagger\Api\PetApi.cs" />
@@ -56,10 +58,10 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="Lib\SwaggerClient\compile.bat" />
     <None Include="Lib\SwaggerClient\bin\Newtonsoft.Json.dll" />
     <None Include="Lib\SwaggerClient\bin\RestSharp.dll" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Lib\" />
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
index 4fa44c936ae..509243bbdfc 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
@@ -1,9 +1,8 @@
 <Properties StartupItem="SwaggerClientTest.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="TestPet.cs">
     <Files>
-      <File FileName="TestPet.cs" Line="110" Column="1" />
-      <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Category.cs" Line="11" Column="7" />
+      <File FileName="TestPet.cs" Line="28" Column="64" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs b/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs
index 8e6ea0f99d2..33530cb0b99 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/TestPet.cs
@@ -1,5 +1,6 @@
 using NUnit.Framework;
 using System;
+using System.IO;
 using System.Collections.Generic;
 using IO.Swagger.Api;
 using IO.Swagger.Model;
@@ -48,6 +49,30 @@ [TearDown] public void Cleanup()
 		}
 
 
+		[Test ()]
+		public void TestGetPetByIdAsync ()
+		{
+			PetApi petApi = new PetApi ();
+			var task = petApi.GetPetByIdAsync (petId);
+			Pet response = task.Result;
+			Assert.IsInstanceOf<Pet> (response, "Response is a Pet");
+
+			Assert.AreEqual ("Csharp test", response.Name);
+			Assert.AreEqual ("available", response.Status);
+
+			Assert.IsInstanceOf<List<Tag>> (response.Tags, "Response.Tags is a Array");
+			Assert.AreEqual (petId, response.Tags [0].Id);
+			Assert.AreEqual ("sample tag name1", response.Tags [0].Name);
+
+			Assert.IsInstanceOf<List<String>> (response.PhotoUrls, "Response.PhotoUrls is a Array");
+			Assert.AreEqual ("sample photoUrls", response.PhotoUrls [0]);
+
+			Assert.IsInstanceOf<Category> (response.Category, "Response.Category is a Category");
+			Assert.AreEqual (56, response.Category.Id);
+			Assert.AreEqual ("sample category name2", response.Category.Name);
+
+		}
+
 		[Test ()]
 		public void TestGetPetById ()
 		{
@@ -89,6 +114,16 @@ public void TestUpdatePetWithForm ()
 			Assert.AreEqual (56, response.Category.Id);
 		}
 
+		[Test ()]
+		public void TestUploadFile ()
+		{
+			PetApi petApi = new PetApi ();
+			//NOTE: please provide a valid file (full path)
+			FileStream fileStream = new FileStream("/var/tmp/small.gif", FileMode.Open);
+			petApi.UploadFile(petId, "new form name", fileStream);
+		}
+
+
 		[Test ()]
 		public void TestFindPetByStatus ()
 		{
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll
index 26fdaffec14..ae725c4b598 100644
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll and b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll
index bac89714b9c..9fd1a6e805a 100755
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll and b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb
index a7a6c4d4364..0e1d0d209c3 100644
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb and b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll
index 780727f219d..ed6550bb055 100644
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll and b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt
index 9afb7990f57..dded8c015ee 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt
+++ b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt
@@ -1,8 +1,8 @@
 /Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs
-/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll
-/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll
-/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll
 /Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb
 /Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll
 /Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll
 /Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/Newtonsoft.Json.dll
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/RestSharp.dll
+/Users/williamcheng/Code/swagger-codegen/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/nunit.framework.dll
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll
index bac89714b9c..9fd1a6e805a 100755
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll and b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb
index a7a6c4d4364..0e1d0d209c3 100644
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb and b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/packages.config b/samples/client/petstore/csharp/SwaggerClientTest/packages.config
index d4e241a20a0..09300da2fcd 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/packages.config
+++ b/samples/client/petstore/csharp/SwaggerClientTest/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.3" targetFramework="net45" />
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.3/NUnit.2.6.3.nupkg b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.3/NUnit.2.6.3.nupkg
deleted file mode 100644
index 61e3a5ecfc1..00000000000
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.3/NUnit.2.6.3.nupkg and /dev/null differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.3/lib/nunit.framework.dll b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.3/lib/nunit.framework.dll
deleted file mode 100644
index 780727f219d..00000000000
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.3/lib/nunit.framework.dll and /dev/null differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/NUnit.2.6.4.nupkg b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/NUnit.2.6.4.nupkg
new file mode 100644
index 00000000000..379b15bf5cd
Binary files /dev/null and b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/NUnit.2.6.4.nupkg differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/lib/nunit.framework.dll b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/lib/nunit.framework.dll
new file mode 100644
index 00000000000..ed6550bb055
Binary files /dev/null and b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/lib/nunit.framework.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.3/lib/nunit.framework.xml b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/lib/nunit.framework.xml
similarity index 97%
rename from samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.3/lib/nunit.framework.xml
rename to samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/lib/nunit.framework.xml
index 4c8c26e8829..532d8286707 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.3/lib/nunit.framework.xml
+++ b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/lib/nunit.framework.xml
@@ -3581,49 +3581,49 @@
         </member>
         <member name="M:NUnit.Framework.CollectionAssert.IsNotSubsetOf(System.Collections.IEnumerable,System.Collections.IEnumerable)">
             <summary>
-            Asserts that superset is not a subject of subset.
+            Asserts that the superset does not contain the subset
             </summary>
-            <param name="subset">The IEnumerable superset to be considered</param>
-            <param name="superset">The IEnumerable subset to be considered</param>
+            <param name="subset">The IEnumerable subset to be considered</param>
+            <param name="superset">The IEnumerable superset to be considered</param>
         </member>
         <member name="M:NUnit.Framework.CollectionAssert.IsNotSubsetOf(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String)">
             <summary>
-            Asserts that superset is not a subject of subset.
+            Asserts that the superset does not contain the subset
             </summary>
-            <param name="subset">The IEnumerable superset to be considered</param>
-            <param name="superset">The IEnumerable subset to be considered</param>
+            <param name="subset">The IEnumerable subset to be considered</param>
+            <param name="superset">The IEnumerable superset to be considered</param>
             <param name="message">The message that will be displayed on failure</param>
         </member>
         <member name="M:NUnit.Framework.CollectionAssert.IsNotSubsetOf(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String,System.Object[])">
             <summary>
-            Asserts that superset is not a subject of subset.
+            Asserts that the superset does not contain the subset
             </summary>
-            <param name="subset">The IEnumerable superset to be considered</param>
-            <param name="superset">The IEnumerable subset to be considered</param>
+            <param name="subset">The IEnumerable subset to be considered</param>
+            <param name="superset">The IEnumerable superset to be considered</param>
             <param name="message">The message that will be displayed on failure</param>
             <param name="args">Arguments to be used in formatting the message</param>
         </member>
         <member name="M:NUnit.Framework.CollectionAssert.IsSubsetOf(System.Collections.IEnumerable,System.Collections.IEnumerable)">
             <summary>
-            Asserts that superset is a subset of subset.
+            Asserts that the superset contains the subset.
             </summary>
-            <param name="subset">The IEnumerable superset to be considered</param>
-            <param name="superset">The IEnumerable subset to be considered</param>
+            <param name="subset">The IEnumerable subset to be considered</param>
+            <param name="superset">The IEnumerable superset to be considered</param>
         </member>
         <member name="M:NUnit.Framework.CollectionAssert.IsSubsetOf(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String)">
             <summary>
-            Asserts that superset is a subset of subset.
+            Asserts that the superset contains the subset.
             </summary>
-            <param name="subset">The IEnumerable superset to be considered</param>
-            <param name="superset">The IEnumerable subset to be considered</param>
+            <param name="subset">The IEnumerable subset to be considered</param>
+            <param name="superset">The IEnumerable superset to be considered</param>
             <param name="message">The message that will be displayed on failure</param>
         </member>
         <member name="M:NUnit.Framework.CollectionAssert.IsSubsetOf(System.Collections.IEnumerable,System.Collections.IEnumerable,System.String,System.Object[])">
             <summary>
-            Asserts that superset is a subset of subset.
+            Asserts that the superset contains the subset.
             </summary>
-            <param name="subset">The IEnumerable superset to be considered</param>
-            <param name="superset">The IEnumerable subset to be considered</param>
+            <param name="subset">The IEnumerable subset to be considered</param>
+            <param name="superset">The IEnumerable superset to be considered</param>
             <param name="message">The message that will be displayed on failure</param>
             <param name="args">Arguments to be used in formatting the message</param>
         </member>
@@ -6551,6 +6551,23 @@
             </summary>
             <returns>The target for the action attribute</returns>
         </member>
+        <member name="M:NUnit.Framework.TestActionAttribute.BeforeTest(NUnit.Framework.TestDetails)">
+            <summary>
+            Method called before each test
+            </summary>
+            <param name="testDetails">Info about the test to be run</param>
+        </member>
+        <member name="M:NUnit.Framework.TestActionAttribute.AfterTest(NUnit.Framework.TestDetails)">
+            <summary>
+            Method called after each test
+            </summary>
+            <param name="testDetails">Info about the test that was just run</param>
+        </member>
+        <member name="P:NUnit.Framework.TestActionAttribute.Targets">
+            <summary>
+            Gets or sets the ActionTargets for this attribute
+            </summary>
+        </member>
         <member name="T:NUnit.Framework.TestAttribute">
             <summary>
             Adding this attribute to a method within a <seealso cref="T:NUnit.Framework.TestFixtureAttribute"/> 
@@ -8066,7 +8083,7 @@
             presence of a particular attribute on an object.
             </summary>
         </member>
-        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.Matches(NUnit.Framework.Constraints.Constraint)">
+        <member name="M:NUnit.Framework.Constraints.ConstraintExpression.Matches(NUnit.Framework.Constraints.IResolveConstraint)">
             <summary>
             Returns the constraint provided as an argument - used to allow custom
             custom constraints to easily participate in the syntax.
@@ -10352,6 +10369,13 @@
             <param name="actual">The value to be tested</param>
             <returns>True if no exception is thrown, otherwise false</returns>
         </member>
+        <member name="M:NUnit.Framework.Constraints.ThrowsNothingConstraint.Matches``1(NUnit.Framework.Constraints.ActualValueDelegate{``0})">
+            <summary>
+            Test whether the constraint is satisfied by a given delegate
+            </summary>
+            <param name="del">Delegate returning the value to be tested</param>
+            <returns>True if no exception is thrown, otherwise false</returns>
+        </member>
         <member name="M:NUnit.Framework.Constraints.ThrowsNothingConstraint.WriteDescriptionTo(NUnit.Framework.Constraints.MessageWriter)">
             <summary>
             Write the constraint description to a MessageWriter
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.3/license.txt b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/license.txt
similarity index 89%
rename from samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.3/license.txt
rename to samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/license.txt
index b12903afb5e..3b2ad7401fd 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.3/license.txt
+++ b/samples/client/petstore/csharp/SwaggerClientTest/packages/NUnit.2.6.4/license.txt
@@ -1,15 +1,15 @@
-Copyright © 2002-2013 Charlie Poole
-Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
-Copyright © 2000-2002 Philip A. Craig
-
-This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment (see the following) in the product documentation is required.
-
-Portions Copyright © 2002-2013 Charlie Poole or Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig
-
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source distribution.
+Copyright © 2002-2014 Charlie Poole
+Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
+Copyright © 2000-2002 Philip A. Craig
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment (see the following) in the product documentation is required.
+
+Portions Copyright © 2002-2014 Charlie Poole or Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig
+
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.