Merge pull request RicoSuter#478 from NSwag/master

Release v8.1
jameschch · Dec 14, 2016 · 26bac49 · 26bac49
2 parents 49defc1 + 58e5420
commit 26bac49
Show file tree

Hide file tree

Showing 102 changed files with 2,413 additions and 2,412 deletions.
diff --git a/src/NSwag.Annotations/Properties/AssemblyInfo.cs b/src/NSwag.Annotations/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.Annotations")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2016")]
-[assembly: AssemblyVersion("8.0.*")]
+[assembly: AssemblyVersion("8.1.*")]
diff --git a/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj b/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj
@@ -83,8 +83,8 @@
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=6.3.6185.19861, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.6.3.6185.19861\lib\net45\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=6.6.6192.39835, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.6.6.6192.39835\lib\net45\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">

diff --git a/src/NSwag.AspNet.Owin/Properties/AssemblyInfo.cs b/src/NSwag.AspNet.Owin/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.AspNet.Owin")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2016")]
-[assembly: AssemblyVersion("8.0.*")]
+[assembly: AssemblyVersion("8.1.*")]
diff --git a/src/NSwag.AspNet.Owin/app.config b/src/NSwag.AspNet.Owin/app.config
@@ -4,7 +4,7 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="NJsonSchema" publicKeyToken="c2f9c3bdfae56102" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-6.3.6185.19861" newVersion="6.3.6185.19861" />
+                <bindingRedirect oldVersion="0.0.0.0-6.6.6192.39835" newVersion="6.6.6192.39835" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

diff --git a/src/NSwag.AspNet.Owin/packages.config b/src/NSwag.AspNet.Owin/packages.config
@@ -5,6 +5,6 @@
   <package id="Microsoft.Owin.FileSystems" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="NJsonSchema" version="6.3.6185.19861" targetFramework="net45" />
+  <package id="NJsonSchema" version="6.6.6192.39835" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
 </packages>
diff --git a/src/NSwag.AspNet.WebApi/Properties/AssemblyInfo.cs b/src/NSwag.AspNet.WebApi/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.AspNet.WebApi")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2016")]
-[assembly: AssemblyVersion("8.0.*")]
+[assembly: AssemblyVersion("8.1.*")]
diff --git a/src/NSwag.AspNetCore/Properties/AssemblyInfo.cs b/src/NSwag.AspNetCore/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.AspNetCore")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("8.0.*")]
+[assembly: AssemblyVersion("8.1.*")]
diff --git a/src/NSwag.AspNetCore/project.json b/src/NSwag.AspNetCore/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "8.0.0-*",
+  "version": "8.1.0-*",
   "authors": [ "Rico Suter" ],
   "description": "NSwag: The Swagger API toolchain for .NET and TypeScript",
   "packOptions": {

diff --git a/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj b/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj
@@ -69,12 +69,12 @@
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=6.3.6185.19861, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.6.3.6185.19861\lib\net45\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=6.6.6192.39835, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.6.6.6192.39835\lib\net45\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration, Version=6.3.6185.19861, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.CodeGeneration.6.3.6185.19861\lib\portable45-net45+win8+wp8+wpa81\NJsonSchema.CodeGeneration.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration, Version=6.6.6192.39836, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.CodeGeneration.6.6.6192.39836\lib\portable45-net45+win8+wp8+wpa81\NJsonSchema.CodeGeneration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/src/NSwag.AssemblyLoader/Properties/AssemblyInfo.cs b/src/NSwag.AssemblyLoader/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.AssemblyLoader")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2016")]
-[assembly: AssemblyVersion("8.0.*")]
+[assembly: AssemblyVersion("8.1.*")]
diff --git a/src/NSwag.AssemblyLoader/packages.config b/src/NSwag.AssemblyLoader/packages.config
@@ -3,6 +3,6 @@
   <package id="Microsoft.NETCore.Portable.Compatibility" version="1.0.0" targetFramework="net45" />
   <package id="NConsole" version="3.3.6170.27019" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="NJsonSchema" version="6.3.6185.19861" targetFramework="net45" />
-  <package id="NJsonSchema.CodeGeneration" version="6.3.6185.19861" targetFramework="net45" />
+  <package id="NJsonSchema" version="6.6.6192.39835" targetFramework="net45" />
+  <package id="NJsonSchema.CodeGeneration" version="6.6.6192.39836" targetFramework="net45" />
 </packages>
diff --git a/src/NSwag.AssemblyLoaderCore/Properties/AssemblyInfo.cs b/src/NSwag.AssemblyLoaderCore/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.AssemblyLoaderCore")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("8.0.*")]
+[assembly: AssemblyVersion("8.1.*")]
diff --git a/src/NSwag.AssemblyLoaderCore/project.json b/src/NSwag.AssemblyLoaderCore/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "8.0.0-*",
+  "version": "8.1.0-*",
   "authors": [ "Rico Suter" ],
   "description": "NSwag: The Swagger API toolchain for .NET and TypeScript",
   "packOptions": {

diff --git a/src/NSwag.CodeGeneration.Tests/ClientGeneration/ArrayParameterTests.cs b/src/NSwag.CodeGeneration.Tests/ClientGeneration/ArrayParameterTests.cs
@@ -136,7 +136,7 @@ public void When_parameter_is_array_then_CSharp_is_correct()
             //// Assert
             Assert.IsTrue(
                 code.Contains(
-                    @"foreach(var item_ in elementId) { url_ += string.Format(""elementId={0}&"", Uri.EscapeDataString(item_.ToString())); }"));
+                    @"foreach(var item_ in elementId) { url_ += string.Format(""elementId={0}&"", System.Uri.EscapeDataString(item_.ToString())); }"));
         }
 
     }

diff --git a/src/NSwag.CodeGeneration.Tests/ClientGeneration/FormParameterTests.cs b/src/NSwag.CodeGeneration.Tests/ClientGeneration/FormParameterTests.cs
@@ -50,9 +50,9 @@ public void When_form_parameters_are_defined_then_MultipartFormDataContent_is_ge
             var code = generator.GenerateFile();
 
             //// Assert
-            Assert.IsTrue(code.Contains("new MultipartFormDataContent"));
+            Assert.IsTrue(code.Contains("new System.Net.Http.MultipartFormDataContent"));
             Assert.IsTrue(code.Contains("if (foo != null)"));
-            Assert.IsTrue(code.Contains("throw new ArgumentNullException(\"bar\");"));
+            Assert.IsTrue(code.Contains("throw new System.ArgumentNullException(\"bar\");"));
         }
 
         public class FileUploadController : ApiController
@@ -75,8 +75,8 @@ public void When_action_has_file_parameter_then_Stream_is_generated_in_CSharp_co
 
             //// Assert
             Assert.IsTrue(code.Contains("FileParameter file"));
-            Assert.IsTrue(code.Contains("var content_ = new MultipartFormDataContent();"));
-            Assert.IsTrue(code.Contains("content_.Add(new StreamContent(file.Data), \"file\""));
+            Assert.IsTrue(code.Contains("var content_ = new System.Net.Http.MultipartFormDataContent();"));
+            Assert.IsTrue(code.Contains("content_.Add(new System.Net.Http.StreamContent(file.Data), \"file\""));
         }
 
         // TODO: Implement for JQuery, AngularJS and Angular 2

diff --git a/src/NSwag.CodeGeneration.Tests/CommandLine/WebApiCommandLineTests.cs b/src/NSwag.CodeGeneration.Tests/CommandLine/WebApiCommandLineTests.cs
@@ -31,7 +31,7 @@ public void When_swagger2typescript_is_called_then_file_is_created()
         {
             //// Arrange
             var command = "swagger2tsclient " +
-                          @"/input:""{ \""swagger\"": \""2.0\"", \""paths\"": {}, \""definitions\"": { \""Test\"": { typeName: \""Test\"", type: \""Object\"" } } }"" " +
+                          @"/input:""{ \""swagger\"": \""2.0\"", \""paths\"": {}, \""definitions\"": { \""Test\"": { type: \""object\"", properties: { \""Foo\"": { type: \""string\"" } } } } }"" " +
                           "/output:" + OutputFile;
 
             //// Act

diff --git a/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj b/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj
@@ -65,12 +65,12 @@
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=6.3.6185.19861, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.6.3.6185.19861\lib\net45\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=6.6.6192.39835, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.6.6.6192.39835\lib\net45\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration, Version=6.3.6185.19861, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.CodeGeneration.6.3.6185.19861\lib\portable45-net45+win8+wp8+wpa81\NJsonSchema.CodeGeneration.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration, Version=6.6.6192.39836, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.CodeGeneration.6.6.6192.39836\lib\portable45-net45+win8+wp8+wpa81\NJsonSchema.CodeGeneration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/src/NSwag.CodeGeneration.Tests/Properties/AssemblyInfo.cs b/src/NSwag.CodeGeneration.Tests/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("8.0.*")]
+// [assembly: AssemblyVersion("8.1.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag.CodeGeneration.Tests/packages.config b/src/NSwag.CodeGeneration.Tests/packages.config
@@ -7,6 +7,6 @@
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="NJsonSchema" version="6.3.6185.19861" targetFramework="net45" />
-  <package id="NJsonSchema.CodeGeneration" version="6.3.6185.19861" targetFramework="net45" />
+  <package id="NJsonSchema" version="6.6.6192.39835" targetFramework="net45" />
+  <package id="NJsonSchema.CodeGeneration" version="6.6.6192.39836" targetFramework="net45" />
 </packages>
diff --git a/src/NSwag.CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpClientGenerator.cs b/src/NSwag.CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpClientGenerator.cs
@@ -81,14 +81,14 @@ protected override string ResolveParameterType(SwaggerParameter parameter)
             if (schema.Type == JsonObjectType.File)
             {
                 if (parameter.CollectionFormat == SwaggerParameterCollectionFormat.Multi && !schema.Type.HasFlag(JsonObjectType.Array))
-                    return "IEnumerable<FileParameter>";
+                    return "System.Collections.Generic.IEnumerable<FileParameter>";
 
                 return "FileParameter";
             }
 
             return base.ResolveParameterType(parameter)
-                .Replace(Settings.CSharpGeneratorSettings.ArrayType + "<", "IEnumerable<")
-                .Replace(Settings.CSharpGeneratorSettings.DictionaryType + "<", "IDictionary<");
+                .Replace(Settings.CSharpGeneratorSettings.ArrayType + "<", "System.Collections.Generic.IEnumerable<")
+                .Replace(Settings.CSharpGeneratorSettings.DictionaryType + "<", "System.Collections.Generic.IDictionary<");
         }
 
         internal override string GetParameterVariableName(SwaggerParameter parameter)

diff --git a/src/NSwag.CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpGeneratorBase.cs b/src/NSwag.CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpGeneratorBase.cs
@@ -37,7 +37,7 @@ internal override string GenerateFile(string clientCode, IEnumerable<string> cli
         internal override string GetExceptionType(SwaggerOperation operation)
         {
             if (operation.Responses.Count(r => !HttpUtilities.IsSuccessStatusCode(r.Key)) != 1)
-                return "Exception";
+                return "System.Exception";
 
             var response = operation.Responses.Single(r => !HttpUtilities.IsSuccessStatusCode(r.Key)).Value;
             return GetType(response.ActualResponseSchema, response.IsNullable(BaseSettings.CodeGeneratorSettings.NullHandling), "Exception");
@@ -47,9 +47,9 @@ internal override string GetResultType(SwaggerOperation operation)
         {
             var response = GetSuccessResponse(operation);
             if (response?.Schema == null)
-                return "Task";
+                return "System.Threading.Tasks.Task";
 
-            return "Task<" + GetType(response.ActualResponseSchema, response.IsNullable(BaseSettings.CodeGeneratorSettings.NullHandling), "Response") + ">";
+            return "System.Threading.Tasks.Task<" + GetType(response.ActualResponseSchema, response.IsNullable(BaseSettings.CodeGeneratorSettings.NullHandling), "Response") + ">";
         }
 
         internal override string GetType(JsonSchema4 schema, bool isNullable, string typeNameHint)

diff --git a/src/NSwag.CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpTypeResolver.cs b/src/NSwag.CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpTypeResolver.cs
@@ -51,7 +51,7 @@ public static SwaggerToCSharpTypeResolver CreateWithDefinitions(CSharpGeneratorS
         public override string Resolve(JsonSchema4 schema, bool isNullable, string typeNameHint)
         {
             if (schema.ActualSchema == ExceptionSchema)
-                return "Exception";
+                return "System.Exception";
 
             return base.Resolve(schema, isNullable, typeNameHint);
         }

diff --git a/....CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpWebApiControllerGeneratorSettings.cs b/....CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpWebApiControllerGeneratorSettings.cs
@@ -15,7 +15,7 @@ public class SwaggerToCSharpWebApiControllerGeneratorSettings : SwaggerToCSharpG
         public SwaggerToCSharpWebApiControllerGeneratorSettings()
         {
             ClassName = "{controller}";
-            CSharpGeneratorSettings.ArrayType = "IEnumerable";
+            CSharpGeneratorSettings.ArrayType = "System.Collections.Generic.IEnumerable";
             AdditionalNamespaceUsages = new [] { "System.Web.Http" };
         }