Merge pull request #91 from NSwag/master

Release v2.17
RicoSuter · May 6, 2016 · 007edea · 007edea
2 parents 69f746c + 348d1c0
commit 007edea
Show file tree

Hide file tree

Showing 34 changed files with 776 additions and 783 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, 2015")]
-[assembly: AssemblyVersion("2.16.*")]
+[assembly: AssemblyVersion("2.17.*")]
diff --git a/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj b/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj
@@ -43,12 +43,12 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=2.14.5967.31319, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.2.14.5967.31319\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=2.15.5970.28125, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.2.15.5970.28125\lib\portable45-net45+win8+wp8+wpa81\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration, Version=2.14.5967.31320, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.CodeGeneration.2.14.5967.31320\lib\net45\NJsonSchema.CodeGeneration.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration, Version=2.15.5970.28126, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.CodeGeneration.2.15.5970.28126\lib\net45\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("2.16.*")]
+// [assembly: AssemblyVersion("2.17.*")]
 [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
@@ -4,6 +4,6 @@
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
-  <package id="NJsonSchema" version="2.14.5967.31319" targetFramework="net45" />
-  <package id="NJsonSchema.CodeGeneration" version="2.14.5967.31320" targetFramework="net45" />
+  <package id="NJsonSchema" version="2.15.5970.28125" targetFramework="net45" />
+  <package id="NJsonSchema.CodeGeneration" version="2.15.5970.28126" targetFramework="net45" />
 </packages>
diff --git a/src/NSwag.CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpClientGenerator.cs b/src/NSwag.CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpClientGenerator.cs
@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NJsonSchema.CodeGeneration;
 using NSwag.CodeGeneration.CodeGenerators.Models;
 
 namespace NSwag.CodeGeneration.CodeGenerators.CSharp
@@ -66,7 +67,7 @@ internal override string RenderFile(string clientCode)
         internal override string RenderClientCode(string controllerName, IEnumerable<OperationModel> operations)
         {
             var template = LoadTemplate("Client");
-            template.Add("class", Settings.ClassName.Replace("{controller}", ConvertToUpperCamelCase(controllerName)));
+            template.Add("class", Settings.ClassName.Replace("{controller}", ConversionUtilities.ConvertToUpperCamelCase(controllerName)));
 
             var hasClientBaseClass = !string.IsNullOrEmpty(Settings.ClientBaseClass); 
             template.Add("baseClass", Settings.ClientBaseClass);

diff --git a/src/NSwag.CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpWebApiControllerGenerator.cs b/src/NSwag.CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpWebApiControllerGenerator.cs
@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NJsonSchema.CodeGeneration;
 using NSwag.CodeGeneration.CodeGenerators.Models;
 
 namespace NSwag.CodeGeneration.CodeGenerators.CSharp
@@ -65,7 +66,7 @@ internal override string RenderFile(string clientCode)
         internal override string RenderClientCode(string controllerName, IEnumerable<OperationModel> operations)
         {
             var template = LoadTemplate("WebApiController");
-            template.Add("class", Settings.ClassName.Replace("{controller}", ConvertToUpperCamelCase(controllerName)));
+            template.Add("class", Settings.ClassName.Replace("{controller}", ConversionUtilities.ConvertToUpperCamelCase(controllerName)));
 
             var hasClientBaseClass = !string.IsNullOrEmpty(Settings.ControllerBaseClass); 
             template.Add("baseClass", Settings.ControllerBaseClass);

diff --git a/src/NSwag.CodeGeneration/CodeGenerators/ClientGeneratorBase.cs b/src/NSwag.CodeGeneration/CodeGenerators/ClientGeneratorBase.cs
@@ -40,7 +40,7 @@ internal string GetResultDescription(SwaggerOperation operation)
         {
             var response = GetSuccessResponse(operation);
             if (response != null)
-                return RemoveLineBreaks(response.Description);
+                return ConversionUtilities.RemoveWhiteSpaces(response.Description);
             return null;
         }
 
@@ -105,12 +105,12 @@ internal List<OperationModel> GetOperations<TGenerator>(SwaggerService service,
                             {
                                 Schema = p.ActualSchema, 
                                 Name = p.Name,
-                                VariableNameLower = ConvertToLowerCamelCase(p.Name.Replace("-", "_")), 
+                                VariableNameLower = ConversionUtilities.ConvertToLowerCamelCase(p.Name.Replace("-", "_")), 
                                 Kind = p.Kind,
                                 IsRequired = p.IsRequired, 
                                 Type = resolver.Resolve(p.ActualSchema, p.Type.HasFlag(JsonObjectType.Null), p.Name),
                                 IsLast = operation.Parameters.LastOrDefault() == p,
-                                Description = RemoveLineBreaks(p.Description)
+                                Description = ConversionUtilities.RemoveWhiteSpaces(p.Description)
                             };
                         }).ToList(),                           
                     };

diff --git a/src/NSwag.CodeGeneration/CodeGenerators/Models/OperationModel.cs b/src/NSwag.CodeGeneration/CodeGenerators/Models/OperationModel.cs
@@ -24,15 +24,15 @@ internal class OperationModel
 
         public string OperationName { get; set; }
 
-        public string HttpMethodUpper => GeneratorBase.ConvertToUpperCamelCase(HttpMethod.ToString());
+        public string HttpMethodUpper => ConversionUtilities.ConvertToUpperCamelCase(HttpMethod.ToString());
 
-        public string HttpMethodLower => GeneratorBase.ConvertToLowerCamelCase(HttpMethod.ToString());
+        public string HttpMethodLower => ConversionUtilities.ConvertToLowerCamelCase(HttpMethod.ToString());
 
         public bool IsGetOrDelete => HttpMethod == SwaggerOperationMethod.Get || HttpMethod == SwaggerOperationMethod.Delete;
 
-        public string OperationNameLower => GeneratorBase.ConvertToLowerCamelCase(OperationName);
+        public string OperationNameLower => ConversionUtilities.ConvertToLowerCamelCase(OperationName);
 
-        public string OperationNameUpper => GeneratorBase.ConvertToUpperCamelCase(OperationName);
+        public string OperationNameUpper => ConversionUtilities.ConvertToUpperCamelCase(OperationName);
 
         public string ResultType { get; set; }
 
@@ -64,7 +64,7 @@ internal class OperationModel
 
         public IEnumerable<ParameterModel> HeaderParameters => Parameters.Where(p => p.Kind == SwaggerParameterKind.Header);
 
-        public string Summary => GeneratorBase.RemoveLineBreaks(Operation.Summary);
+        public string Summary => ConversionUtilities.RemoveWhiteSpaces(Operation.Summary);
 
         public bool HasSummary => !string.IsNullOrEmpty(Summary);
 

diff --git a/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/SwaggerToTypeScriptClientGenerator.cs b/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/SwaggerToTypeScriptClientGenerator.cs
@@ -10,6 +10,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NJsonSchema;
+using NJsonSchema.CodeGeneration;
 using NJsonSchema.CodeGeneration.TypeScript;
 using NSwag.CodeGeneration.CodeGenerators.Models;
 
@@ -73,7 +74,7 @@ internal override string RenderClientCode(string controllerName, IEnumerable<Ope
 
             GenerateDataConversionCodes(operations);
 
-            template.Add("class", Settings.ClassName.Replace("{controller}", ConvertToUpperCamelCase(controllerName)));
+            template.Add("class", Settings.ClassName.Replace("{controller}", ConversionUtilities.ConvertToUpperCamelCase(controllerName)));
             template.Add("operations", operations);
             template.Add("generateClientInterfaces", Settings.GenerateClientInterfaces);
             template.Add("hasOperations", operations.Any());

diff --git a/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/Templates/Angular2.txt b/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/Templates/Angular2.txt
@@ -102,10 +102,10 @@ export class <class> <if(generateClientInterfaces)>implements I<class> <endif>{
             result<response.StatusCode> = new Date(data);
     <else>
         <if(useDtoClasses)>
-            var resultData<response.StatusCode> = data === "" ? null : jQuery.parseJSON(data, this.jsonParseReviver);
+            var resultData<response.StatusCode> = data === "" ? null : JSON.parse(data, this.jsonParseReviver);
             <response.DataConversionCode>
         <else>
-            result<response.StatusCode> = data === "" ? null : \<<response.Type>>jQuery.parseJSON(data, this.jsonParseReviver);
+            result<response.StatusCode> = data === "" ? null : \<<response.Type>>JSON.parse(data, this.jsonParseReviver);
         <endif>
     <endif>
     <if(response.IsSuccess)>
@@ -123,10 +123,10 @@ export class <class> <if(generateClientInterfaces)>implements I<class> <endif>{
             result = new Date(data);
     <else>
         <if(useDtoClasses)>
-            var resultData = data === "" ? null : jQuery.parseJSON(data, this.jsonParseReviver);
+            var resultData = data === "" ? null : JSON.parse(data, this.jsonParseReviver);
             <response.DataConversionCode>
         <else>
-            result = data === "" ? null : \<<response.Type>>jQuery.parseJSON(data, this.jsonParseReviver);
+            result = data === "" ? null : \<<response.Type>>JSON.parse(data, this.jsonParseReviver);
         <endif>
     <endif>
     <if(operation.DefaultResponse.IsSuccess)>

diff --git a/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/Templates/AngularJS.txt b/src/NSwag.CodeGeneration/CodeGenerators/TypeScript/Templates/AngularJS.txt
@@ -101,10 +101,10 @@ export class <class> <if(generateClientInterfaces)>implements I<class> <endif>{
             result<response.StatusCode> = new Date(data);
     <else>
         <if(useDtoClasses)>
-            var resultData<response.StatusCode> = data === "" ? null : jQuery.parseJSON(data, this.jsonParseReviver);
+            var resultData<response.StatusCode> = data === "" ? null : JSON.parse(data, this.jsonParseReviver);
             <response.DataConversionCode>
         <else>
-            result<response.StatusCode> = data === "" ? null : \<<response.Type>>jQuery.parseJSON(data, this.jsonParseReviver);
+            result<response.StatusCode> = data === "" ? null : \<<response.Type>>JSON.parse(data, this.jsonParseReviver);
         <endif>
     <endif>
     <if(response.IsSuccess)>
@@ -122,10 +122,10 @@ export class <class> <if(generateClientInterfaces)>implements I<class> <endif>{
             result = new Date(data);
     <else>
         <if(useDtoClasses)>
-            var resultData = data === "" ? null : jQuery.parseJSON(data, this.jsonParseReviver);
+            var resultData = data === "" ? null : JSON.parse(data, this.jsonParseReviver);
             <response.DataConversionCode>
         <else>
-            result = data === "" ? null : \<<response.Type>>jQuery.parseJSON(data, this.jsonParseReviver);
+            result = data === "" ? null : \<<response.Type>>JSON.parse(data, this.jsonParseReviver);
         <endif>
     <endif>
     <if(operation.DefaultResponse.IsSuccess)>

diff --git a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj
@@ -41,12 +41,12 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=2.14.5967.31319, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.2.14.5967.31319\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=2.15.5970.28125, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.2.15.5970.28125\lib\portable45-net45+win8+wp8+wpa81\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration, Version=2.14.5967.31320, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.CodeGeneration.2.14.5967.31320\lib\net45\NJsonSchema.CodeGeneration.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration, Version=2.15.5970.28126, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.CodeGeneration.2.15.5970.28126\lib\net45\NJsonSchema.CodeGeneration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/src/NSwag.CodeGeneration/Properties/AssemblyInfo.cs b/src/NSwag.CodeGeneration/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.CodeGeneration")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("2.16.*")]
+[assembly: AssemblyVersion("2.17.*")]
diff --git a/src/NSwag.CodeGeneration/packages.config b/src/NSwag.CodeGeneration/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Antlr4.StringTemplate" version="4.0.6.9004" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
-  <package id="NJsonSchema" version="2.14.5967.31319" targetFramework="net45" />
-  <package id="NJsonSchema.CodeGeneration" version="2.14.5967.31320" targetFramework="net45" />
+  <package id="NJsonSchema" version="2.15.5970.28125" targetFramework="net45" />
+  <package id="NJsonSchema.CodeGeneration" version="2.15.5970.28126" targetFramework="net45" />
 </packages>
diff --git a/src/NSwag.Core/NSwag.Core.csproj b/src/NSwag.Core/NSwag.Core.csproj
@@ -46,8 +46,8 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=2.14.5967.31319, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.2.14.5967.31319\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=2.15.5970.28125, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.2.15.5970.28125\lib\portable45-net45+win8+wp8+wpa81\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/src/NSwag.Core/Properties/AssemblyInfo.cs b/src/NSwag.Core/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("2.16.*")]
+[assembly: AssemblyVersion("2.17.*")]
diff --git a/src/NSwag.Core/SwaggerService.cs b/src/NSwag.Core/SwaggerService.cs
@@ -120,9 +120,9 @@ public string BaseUrl
                     return "";
 
                 if (Schemes.Any())
-                    return (Schemes.First().ToString().ToLowerInvariant() + "://" + Host + (string.IsNullOrEmpty(BasePath) ? "/" + BasePath : string.Empty)).Trim('/');
+                    return (Schemes.First().ToString().ToLowerInvariant() + "://" + Host + (!string.IsNullOrEmpty(BasePath) ? "/" + BasePath.Trim('/') : string.Empty)).Trim('/');
 
-                return (Host + (string.IsNullOrEmpty(BasePath) ? "/" + BasePath : string.Empty)).Trim('/');
+                return (Host + (!string.IsNullOrEmpty(BasePath) ? "/" + BasePath.Trim('/') : string.Empty)).Trim('/');
             }
         }
 

diff --git a/src/NSwag.Core/packages.config b/src/NSwag.Core/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
-  <package id="NJsonSchema" version="2.14.5967.31319" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="NJsonSchema" version="2.15.5970.28125" targetFramework="portable45-net45+win8+wp8+wpa81" />
 </packages>
diff --git a/src/NSwag.Demo.Client/Properties/AssemblyInfo.cs b/src/NSwag.Demo.Client/Properties/AssemblyInfo.cs
@@ -50,6 +50,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.16.*")]
+// [assembly: AssemblyVersion("2.17.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj b/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj
@@ -47,8 +47,8 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=2.14.5967.31319, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.2.14.5967.31319\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=2.15.5970.28125, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.2.15.5970.28125\lib\portable45-net45+win8+wp8+wpa81\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http" />

diff --git a/src/NSwag.Demo.Web/Web.config b/src/NSwag.Demo.Web/Web.config
@@ -58,7 +58,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NJsonSchema" publicKeyToken="c2f9c3bdfae56102" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.14.5967.31319" newVersion="2.14.5967.31319" />
+        <bindingRedirect oldVersion="0.0.0.0-2.15.5970.28125" newVersion="2.15.5970.28125" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/src/NSwag.Demo.Web/packages.config b/src/NSwag.Demo.Web/packages.config
@@ -7,5 +7,5 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
-  <package id="NJsonSchema" version="2.14.5967.31319" targetFramework="net45" />
+  <package id="NJsonSchema" version="2.15.5970.28125" targetFramework="net45" />
 </packages>
diff --git a/src/NSwag.Tests/NSwag.Tests.csproj b/src/NSwag.Tests/NSwag.Tests.csproj
@@ -39,8 +39,8 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=2.14.5967.31319, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.2.14.5967.31319\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=2.15.5970.28125, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.2.15.5970.28125\lib\portable45-net45+win8+wp8+wpa81\NJsonSchema.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/src/NSwag.Tests/Properties/AssemblyInfo.cs b/src/NSwag.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("2.16.*")]
+// [assembly: AssemblyVersion("2.17.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag.Tests/app.config b/src/NSwag.Tests/app.config
@@ -8,7 +8,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NJsonSchema" publicKeyToken="c2f9c3bdfae56102" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.14.5967.31319" newVersion="2.14.5967.31319" />
+        <bindingRedirect oldVersion="0.0.0.0-2.15.5970.28125" newVersion="2.15.5970.28125" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/src/NSwag.Tests/packages.config b/src/NSwag.Tests/packages.config
@@ -3,5 +3,5 @@
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
-  <package id="NJsonSchema" version="2.14.5967.31319" targetFramework="net452" />
+  <package id="NJsonSchema" version="2.15.5970.28125" targetFramework="net452" />
 </packages>