add uwp support

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java

@@ -34,6 +34,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
     private static final Logger LOGGER = LoggerFactory.getLogger(CSharpClientCodegen.class);
     private static final String NET45 = "v4.5";
     private static final String NET35 = "v3.5";
+    private static final String UWP = "uwp";
     private static final String DATA_TYPE_WITH_ENUM_EXTENSION = "plainDatatypeWithEnum";
 
     protected String packageGuid = "{" + java.util.UUID.randomUUID().toString().toUpperCase() + "}";
@@ -48,6 +49,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
     protected String targetFramework = NET45;
     protected String targetFrameworkNuget = "net45";
     protected boolean supportsAsync = Boolean.TRUE;
+    protected boolean supportsUWP = Boolean.FALSE;
 
 
     protected final Map<String, String> frameworks;
@@ -89,6 +91,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         frameworks = new ImmutableMap.Builder<String, String>()
                 .put(NET35, ".NET Framework 3.5 compatible")
                 .put(NET45, ".NET Framework 4.5+ compatible")
+                .put(UWP, "Universal Windows Platform (beta support)")
                 .build();
         framework.defaultValue(this.targetFramework);
         framework.setEnum(frameworks);
@@ -156,6 +159,13 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
             if(additionalProperties.containsKey("supportsAsync")){
                 additionalProperties.remove("supportsAsync");
             }
+        } else if (UWP.equals(this.targetFramework)){
+            setTargetFrameworkNuget("uwp");
+            setSupportsAsync(Boolean.TRUE);
+            setSupportsUWP(Boolean.TRUE);
+            additionalProperties.put("supportsAsync", this.supportsUWP);
+            additionalProperties.put("supportsUWP", this.supportsAsync);
+
         } else {
             setTargetFrameworkNuget("net45");
             setSupportsAsync(Boolean.TRUE);
@@ -453,4 +463,8 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
     public void setSupportsAsync(Boolean supportsAsync){
         this.supportsAsync = supportsAsync;
     }
+
+    public void setSupportsUWP(Boolean supportsUWP){
+        this.supportsUWP = supportsUWP;
+    }
 }

modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache

@@ -103,7 +103,16 @@ namespace {{packageName}}.Client
 
             // add file parameter, if any
             foreach(var param in fileParams)
+            {
+                {{^supportsUWP}}
                 request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
+                {{/supportsUWP}}
+                {{#supportsUWP}}
+                byte[] paramWriter = null;
+                param.Value.Writer = delegate (Stream stream) { paramWriter = ToByteArray(stream); };
+                request.AddFile(param.Value.Name, paramWriter, param.Value.FileName, param.Value.ContentType);
+                {{/supportsUWP}}
+            }
 
             if (postBody != null) // http body (model or byte[]) parameter
             {
@@ -148,7 +157,15 @@ namespace {{packageName}}.Client
             // set user agent
             RestClient.UserAgent = Configuration.UserAgent;
 
+            {{^supportsUWP}}
             var response = RestClient.Execute(request);
+            {{/supportsUWP}}
+            {{#supportsUWP}}
+            // TODO: This is obviously not a valid response, but it prevents compiling-errors
+            // 'RestClient.CallApiAsync(..)' is used instead, because 'RestClient.ExecuteAsync(...)' 
+            // is available for Windows UWP, while 'RestClient.CallApi(...)' is not
+            var response = new object(); 
+            {{/supportsUWP}}
             return (Object) response;
         }
         {{#supportsAsync}}
@@ -444,5 +461,20 @@ namespace {{packageName}}.Client
                 return filename;
             }
         }
+        {{#supportsUWP}}
+        /// <summary>
+        /// Convert stream to byte array
+        /// </summary>
+        /// <param name="stream">IO stream</param>
+        /// <returns>Byte array</returns>
+        public static byte[] ToByteArray(Stream stream)
+        {
+            stream.Position = 0;
+            byte[] buffer = new byte[stream.Length];
+            for (int totalBytesCopied = 0; totalBytesCopied < stream.Length;)
+                totalBytesCopied += stream.Read(buffer, totalBytesCopied, Convert.ToInt32(stream.Length) - totalBytesCopied);
+            return buffer;
+        }
+        {{/supportsUWP}}
     }
 }

modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache

@@ -270,11 +270,13 @@ namespace {{packageName}}.Client
         public static String ToDebugReport()
         {
             String report = "C# SDK ({{packageName}}) Debug Report:\n";
+            {{^supportsUWP}}
             report += "    OS: " + Environment.OSVersion + "\n";
             report += "    .NET Framework Version: " + Assembly
                      .GetExecutingAssembly()
                      .GetReferencedAssemblies()
                      .Where(x => x.Name == "System.Core").First().Version.ToString()  + "\n";
+            {{/supportsUWP}}
             report += "    Version of the API: {{version}}\n";
             report += "    SDK Package Version: {{packageVersion}}\n";
 

modules/swagger-codegen/src/main/resources/csharp/Project.mustache

@@ -8,7 +8,15 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>{{packageTitle}}</RootNamespace>
     <AssemblyName>{{packageTitle}}</AssemblyName>
+    {{^supportsUWP}}
     <TargetFrameworkVersion>{{targetFramework}}</TargetFrameworkVersion>
+    {{/supportsUWP}}
+    {{#supportsUWP}}
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    {{/supportsUWP}}
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/NameTests.cs

@@ -50,6 +50,7 @@ namespace IO.Swagger.Test
             Assert.IsInstanceOf<Name> (instance, "instance is a Name");
         }
 
+        
         /// <summary>
         /// Test the property '_Name' 
         /// </summary>
@@ -58,6 +59,7 @@ namespace IO.Swagger.Test
         {
             // TODO: unit test for the property '_Name' 
         }
+        
         /// <summary>
         /// Test the property 'SnakeCase' 
         /// </summary>
@@ -67,6 +69,7 @@ namespace IO.Swagger.Test
             // TODO: unit test for the property 'SnakeCase' 
         }
         
+
     }
 
 }

samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs

@@ -103,8 +103,13 @@ namespace IO.Swagger.Client
 
             // add file parameter, if any
             foreach(var param in fileParams)
+            {
+                
                 request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
                 
+                
+            }
+
             if (postBody != null) // http body (model or byte[]) parameter
             {
                 if (postBody.GetType() == typeof(String))
@@ -148,7 +153,10 @@ namespace IO.Swagger.Client
             // set user agent
             RestClient.UserAgent = Configuration.UserAgent;
 
+            
             var response = RestClient.Execute(request);
+            
+            
             return (Object) response;
         }
         /// <summary>
@@ -443,5 +451,6 @@ namespace IO.Swagger.Client
                 return filename;
             }
         }
+        
     }
 }

samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs

@@ -270,11 +270,13 @@ namespace IO.Swagger.Client
         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";
 

samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs

@@ -12,7 +12,7 @@ using Newtonsoft.Json.Converters;
 namespace IO.Swagger.Model
 {
     /// <summary>
-    /// Model for testing model name same as property name
+    /// 
     /// </summary>
     [DataContract]
     public partial class Name :  IEquatable<Name>
@@ -22,19 +22,13 @@ namespace IO.Swagger.Model
         /// Initializes a new instance of the <see cref="Name" /> class.
         /// Initializes a new instance of the <see cref="Name" />class.
         /// </summary>
-        /// <param name="_Name">_Name (required).</param>
+        /// <param name="_Name">_Name.</param>
+        /// <param name="SnakeCase">SnakeCase.</param>
 
-        public Name(int? _Name = null)
+        public Name(int? _Name = null, int? SnakeCase = null)
-        {
-            // to ensure "_Name" is required (not null)
-            if (_Name == null)
-            {
-                throw new InvalidDataException("_Name is a required property for Name and cannot be null");
-            }
-            else
         {
             this._Name = _Name;
-            }
+            this.SnakeCase = SnakeCase;
             
         }
         
@@ -49,7 +43,7 @@ namespace IO.Swagger.Model
         /// Gets or Sets SnakeCase
         /// </summary>
         [DataMember(Name="snake_case", EmitDefaultValue=false)]
-        public int? SnakeCase { get; private set; }
+        public int? SnakeCase { get; set; }
     
         /// <summary>
         /// Returns the string presentation of the object
@@ -61,6 +55,7 @@ namespace IO.Swagger.Model
             sb.Append("class Name {\n");
             sb.Append("  _Name: ").Append(_Name).Append("\n");
             sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
+            
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -120,10 +115,13 @@ sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
             {
                 int hash = 41;
                 // Suitable nullity checks etc, of course :)
+                
                 if (this._Name != null)
                     hash = hash * 59 + this._Name.GetHashCode();
+                
                 if (this.SnakeCase != null)
                     hash = hash * 59 + this.SnakeCase.GetHashCode();
+                
                 return hash;
             }
         }

samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs

@@ -1,11 +1,9 @@
 <Properties StartupItem="SwaggerClientTest.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="TestPet.cs">
     <Files>
-      <File FileName="TestPet.cs" Line="1" Column="1" />
+      <File FileName="TestPet.cs" Line="222" Column="29" />
       <File FileName="TestOrder.cs" Line="1" Column="1" />
-      <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Cat.cs" Line="1" Column="1" />
-      <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs" Line="18" Column="50" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>