diff --git a/src/NSwag.Annotations/Properties/AssemblyInfo.cs b/src/NSwag.Annotations/Properties/AssemblyInfo.cs
index 287892213b..c5319d3977 100644
--- 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("1.39.*")]
+[assembly: AssemblyVersion("1.40.*")]
diff --git a/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj b/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj
index 078595086e..e35408aecd 100644
--- a/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj
+++ b/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj
@@ -43,12 +43,12 @@
..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll
True
-
- ..\packages\NJsonSchema.1.35.5908.509\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
+
+ ..\packages\NJsonSchema.1.36.5908.3838\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
True
-
- ..\packages\NJsonSchema.CodeGeneration.1.35.5908.510\lib\net45\NJsonSchema.CodeGeneration.dll
+
+ ..\packages\NJsonSchema.CodeGeneration.1.36.5908.3839\lib\net45\NJsonSchema.CodeGeneration.dll
True
diff --git a/src/NSwag.CodeGeneration.Tests/Properties/AssemblyInfo.cs b/src/NSwag.CodeGeneration.Tests/Properties/AssemblyInfo.cs
index 614ba58dfa..0a6d18e9a0 100644
--- 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("1.39.*")]
+// [assembly: AssemblyVersion("1.40.*")]
[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
index 7e66687cc8..1b25321de2 100644
--- a/src/NSwag.CodeGeneration.Tests/packages.config
+++ b/src/NSwag.CodeGeneration.Tests/packages.config
@@ -4,6 +4,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/NSwag.CodeGeneration/CodeGenerators/CSharp/Templates/File.txt b/src/NSwag.CodeGeneration/CodeGenerators/CSharp/Templates/File.txt
index 6a52d568a0..c233e59950 100644
--- a/src/NSwag.CodeGeneration/CodeGenerators/CSharp/Templates/File.txt
+++ b/src/NSwag.CodeGeneration/CodeGenerators/CSharp/Templates/File.txt
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Globalization;
@@ -7,7 +8,7 @@ using System.Net.Http;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
-using System.Text;
+using System.Text;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll
True
-
- ..\packages\NJsonSchema.1.35.5908.509\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
+
+ ..\packages\NJsonSchema.1.36.5908.3838\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
True
-
- ..\packages\NJsonSchema.CodeGeneration.1.35.5908.510\lib\net45\NJsonSchema.CodeGeneration.dll
+
+ ..\packages\NJsonSchema.CodeGeneration.1.36.5908.3839\lib\net45\NJsonSchema.CodeGeneration.dll
True
diff --git a/src/NSwag.CodeGeneration/Properties/AssemblyInfo.cs b/src/NSwag.CodeGeneration/Properties/AssemblyInfo.cs
index 61624eb8ca..bac0302673 100644
--- 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("1.39.*")]
+[assembly: AssemblyVersion("1.40.*")]
diff --git a/src/NSwag.CodeGeneration/packages.config b/src/NSwag.CodeGeneration/packages.config
index 981b7d3d50..b0e5c980ea 100644
--- a/src/NSwag.CodeGeneration/packages.config
+++ b/src/NSwag.CodeGeneration/packages.config
@@ -2,6 +2,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/NSwag.Core/NSwag.Core.csproj b/src/NSwag.Core/NSwag.Core.csproj
index 6d9e2c6e25..1386e2447a 100644
--- a/src/NSwag.Core/NSwag.Core.csproj
+++ b/src/NSwag.Core/NSwag.Core.csproj
@@ -38,8 +38,8 @@
..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll
True
-
- ..\packages\NJsonSchema.1.35.5908.509\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
+
+ ..\packages\NJsonSchema.1.36.5908.3838\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
True
diff --git a/src/NSwag.Core/Properties/AssemblyInfo.cs b/src/NSwag.Core/Properties/AssemblyInfo.cs
index 7955b846a4..3a00e48593 100644
--- 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("1.39.*")]
+[assembly: AssemblyVersion("1.40.*")]
diff --git a/src/NSwag.Core/packages.config b/src/NSwag.Core/packages.config
index 3e1dfb8800..c4c0c2bbc0 100644
--- a/src/NSwag.Core/packages.config
+++ b/src/NSwag.Core/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/NSwag.Demo.Client/Properties/AssemblyInfo.cs b/src/NSwag.Demo.Client/Properties/AssemblyInfo.cs
index 9d66352955..1d0c0dab35 100644
--- 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("1.39.*")]
+// [assembly: AssemblyVersion("1.40.*")]
[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
index 1747c74277..5f6e25ef23 100644
--- a/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj
+++ b/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj
@@ -47,8 +47,8 @@
..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll
True
-
- ..\packages\NJsonSchema.1.35.5908.509\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
+
+ ..\packages\NJsonSchema.1.36.5908.3838\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
True
diff --git a/src/NSwag.Demo.Web/Swagger.nswag b/src/NSwag.Demo.Web/Swagger.nswag
index 3a5fde97eb..d72b3fab5c 100644
--- a/src/NSwag.Demo.Web/Swagger.nswag
+++ b/src/NSwag.Demo.Web/Swagger.nswag
@@ -23,7 +23,7 @@
"SwaggerToTypeScriptCommand": {
"ClassName": "{controller}Client",
"ModuleName": "",
- "Template": 0,
+ "Template": 1,
"PromiseType": 0,
"GenerateClientClasses": true,
"GenerateClientInterfaces": true,
diff --git a/src/NSwag.Demo.Web/packages.config b/src/NSwag.Demo.Web/packages.config
index 9668dfc07f..2b3a302a82 100644
--- a/src/NSwag.Demo.Web/packages.config
+++ b/src/NSwag.Demo.Web/packages.config
@@ -7,5 +7,5 @@
-
+
\ No newline at end of file
diff --git a/src/NSwag.Tests/NSwag.Tests.csproj b/src/NSwag.Tests/NSwag.Tests.csproj
index a7d449bf11..6df02c9227 100644
--- a/src/NSwag.Tests/NSwag.Tests.csproj
+++ b/src/NSwag.Tests/NSwag.Tests.csproj
@@ -39,8 +39,8 @@
..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll
True
-
- ..\packages\NJsonSchema.1.35.5908.509\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
+
+ ..\packages\NJsonSchema.1.36.5908.3838\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
True
diff --git a/src/NSwag.Tests/Properties/AssemblyInfo.cs b/src/NSwag.Tests/Properties/AssemblyInfo.cs
index a014b9fd00..6b0261afc2 100644
--- 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("1.39.*")]
+// [assembly: AssemblyVersion("1.40.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag.Tests/packages.config b/src/NSwag.Tests/packages.config
index 3927439a43..d2453a4f51 100644
--- a/src/NSwag.Tests/packages.config
+++ b/src/NSwag.Tests/packages.config
@@ -3,5 +3,5 @@
-
+
\ No newline at end of file
diff --git a/src/NSwag/NSwag.csproj b/src/NSwag/NSwag.csproj
index 805ac5558d..039a090e27 100644
--- a/src/NSwag/NSwag.csproj
+++ b/src/NSwag/NSwag.csproj
@@ -46,12 +46,12 @@
..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll
True
-
- ..\packages\NJsonSchema.1.35.5908.509\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
+
+ ..\packages\NJsonSchema.1.36.5908.3838\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
True
-
- ..\packages\NJsonSchema.CodeGeneration.1.35.5908.510\lib\net45\NJsonSchema.CodeGeneration.dll
+
+ ..\packages\NJsonSchema.CodeGeneration.1.36.5908.3839\lib\net45\NJsonSchema.CodeGeneration.dll
True
diff --git a/src/NSwag/Properties/AssemblyInfo.cs b/src/NSwag/Properties/AssemblyInfo.cs
index 2dbb41338d..8faaef5675 100644
--- a/src/NSwag/Properties/AssemblyInfo.cs
+++ b/src/NSwag/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
[assembly: AssemblyCompany("Rico Suter")]
[assembly: AssemblyProduct("NSwag.Console")]
[assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("1.39.*")]
+[assembly: AssemblyVersion("1.40.*")]
diff --git a/src/NSwag/packages.config b/src/NSwag/packages.config
index e5ddd2a4fb..e3677f71ae 100644
--- a/src/NSwag/packages.config
+++ b/src/NSwag/packages.config
@@ -3,6 +3,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/NSwagStudio.Installer/Generated.wxs b/src/NSwagStudio.Installer/Generated.wxs
index 0b6fa80c58..9e58a12194 100644
--- a/src/NSwagStudio.Installer/Generated.wxs
+++ b/src/NSwagStudio.Installer/Generated.wxs
@@ -651,116 +651,116 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -769,504 +769,504 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/NSwagStudio/NSwagStudio.csproj b/src/NSwagStudio/NSwagStudio.csproj
index eb4b110bea..9a54ccd8e0 100644
--- a/src/NSwagStudio/NSwagStudio.csproj
+++ b/src/NSwagStudio/NSwagStudio.csproj
@@ -74,12 +74,12 @@
..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll
True
-
- ..\packages\NJsonSchema.1.35.5908.509\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
+
+ ..\packages\NJsonSchema.1.36.5908.3838\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\NJsonSchema.dll
True
-
- ..\packages\NJsonSchema.CodeGeneration.1.35.5908.510\lib\net45\NJsonSchema.CodeGeneration.dll
+
+ ..\packages\NJsonSchema.CodeGeneration.1.36.5908.3839\lib\net45\NJsonSchema.CodeGeneration.dll
True
diff --git a/src/NSwagStudio/Properties/AssemblyInfo.cs b/src/NSwagStudio/Properties/AssemblyInfo.cs
index 7910c968c4..01f45b9772 100644
--- a/src/NSwagStudio/Properties/AssemblyInfo.cs
+++ b/src/NSwagStudio/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
[assembly: AssemblyCompany("Rico Suter")]
[assembly: AssemblyProduct("NSwagStudio")]
[assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("1.39.*")]
+[assembly: AssemblyVersion("1.40.*")]
diff --git a/src/NSwagStudio/packages.config b/src/NSwagStudio/packages.config
index 453d19ffaa..49350316b9 100644
--- a/src/NSwagStudio/packages.config
+++ b/src/NSwagStudio/packages.config
@@ -8,6 +8,6 @@
-
-
+
+
\ No newline at end of file