Merge pull request RicoSuter#1264 from RSuter/master

Release v11.17.0
R-W-C · Apr 7, 2018 · 360172a · 360172a
2 parents 96309c6 + 287635d
commit 360172a
Show file tree

Hide file tree

Showing 112 changed files with 2,282 additions and 1,290 deletions.
diff --git a/build/02_RunUnitTests.bat b/build/02_RunUnitTests.bat
@@ -0,0 +1,13 @@
+vstest.console /logger:Appveyor "%~dp0../src/NSwag.CodeGeneration.CSharp.Tests/bin/Release/NSwag.CodeGeneration.CSharp.Tests.dll" || goto :error
+vstest.console /logger:Appveyor "%~dp0../src\NSwag.CodeGeneration.Tests\bin/Release\NSwag.CodeGeneration.Tests.dll" || goto :error
+vstest.console /logger:Appveyor "%~dp0../src\NSwag.CodeGeneration.TypeScript.Tests\bin/Release\NSwag.CodeGeneration.TypeScript.Tests.dll" || goto :error
+vstest.console /logger:Appveyor "%~dp0../src\NSwag.SwaggerGeneration.WebApi.Tests\bin/Release/NSwag.SwaggerGeneration.WebApi.Tests.dll" || goto :error
+vstest.console /logger:Appveyor "%~dp0../src\NSwag.Tests\bin/Release/NSwag.Tests.dll" || goto :error
+
+dotnet test "%~dp0/../src/NSwag.SwaggerGeneration.AspNetCore.Tests/NSwag.SwaggerGeneration.AspNetCore.Tests.csproj" -c Release || goto :error
+dotnet test "%~dp0/../src/NSwag.Core.Tests/NSwag.Core.Tests.csproj" -c Release || goto :error
+
+goto :EOF
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%
diff --git a/build/03_Test.bat → build/03_RunIntegrationTests.bat b/build/03_Test.bat → build/03_RunIntegrationTests.bat
@@ -26,4 +26,4 @@ popd
 goto :EOF
 :error
 echo Failed with error #%errorlevel%.
-exit /b %errorlevel%
+exit /b %errorlevel%
diff --git a/build/02_Publish.bat → build/04_Publish.bat b/build/02_Publish.bat → build/04_Publish.bat
diff --git a/src/NSwag.Annotations/NSwag.Annotations.csproj b/src/NSwag.Annotations/NSwag.Annotations.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;net45</TargetFrameworks>
     <Description>NSwag: The Swagger API toolchain for .NET and TypeScript</Description>
-    <Version>11.16.1</Version>
+    <Version>11.17.0</Version>
     <PackageTags>Swagger Documentation WebApi AspNet TypeScript CodeGen</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/NSwag/NSwag/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj b/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
     <Description>NSwag: The Swagger API toolchain for .NET and TypeScript</Description>
-    <Version>11.16.1</Version>
+    <Version>11.17.0</Version>
     <PackageTags>Swagger Documentation WebApi AspNet TypeScript CodeGen</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/NSwag/NSwag/blob/master/LICENSE.md</PackageLicenseUrl>
@@ -39,7 +39,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Owin" Version="3.0.1" />
     <PackageReference Include="Microsoft.Owin.StaticFiles" Version="3.0.1" />
-    <PackageReference Include="NJsonSchema" Version="9.10.41" />
+    <PackageReference Include="NJsonSchema" Version="9.10.42" />
     <PackageReference Include="Owin" Version="1.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
     <Description>NSwag: The Swagger API toolchain for .NET and TypeScript</Description>
-    <Version>11.16.1</Version>
+    <Version>11.17.0</Version>
     <PackageTags>Swagger Documentation WebApi AspNet TypeScript CodeGen</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/NSwag/NSwag/blob/master/LICENSE.md</PackageLicenseUrl>
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE;DEBUG;NET45</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NJsonSchema" Version="9.10.41" />
+    <PackageReference Include="NJsonSchema" Version="9.10.42" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
   </ItemGroup>

diff --git a/src/NSwag.AspNetCore.Launcher.x86/NSwag.AspNetCore.Launcher.x86.csproj b/src/NSwag.AspNetCore.Launcher.x86/NSwag.AspNetCore.Launcher.x86.csproj
@@ -4,7 +4,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
-    <Version>11.16.1</Version>
+    <Version>11.17.0</Version>
     <Authors>Rico Suter</Authors>
     <Company>Rico Suter</Company>
     <Description>NSwag: The Swagger API toolchain for .NET and TypeScript</Description>

diff --git a/src/NSwag.AspNetCore.Launcher/NSwag.AspNetCore.Launcher.csproj b/src/NSwag.AspNetCore.Launcher/NSwag.AspNetCore.Launcher.csproj
@@ -4,7 +4,7 @@
     <PlatformTarget Condition="'$(TargetFramework)'=='net461'">x64</PlatformTarget>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
-    <Version>11.16.1</Version>
+    <Version>11.17.0</Version>
     <Authors>Rico Suter</Authors>
     <Company>Rico Suter</Company>
     <Description>NSwag: The Swagger API toolchain for .NET and TypeScript</Description>

diff --git a/src/NSwag.AspNetCore.Launcher/Program.cs b/src/NSwag.AspNetCore.Launcher/Program.cs
@@ -7,9 +7,12 @@ namespace NSwag.AspNetCore.Launcher
 {
     internal class Program
     {
-        private const string EntryPointType = "NSwag.SwaggerGeneration.AspNetCore.AspNetCoreToSwaggerGeneratorCommandEntryPoint";
-        private static readonly AssemblyName AspNetCoreSwaggerGenerationAssembly = new AssemblyName("NSwag.SwaggerGeneration.AspNetCore");
+        // Used to load NSwag.Commands into a process running with the app's dependency context
+        private const string EntryPointType = "NSwag.Commands.SwaggerGeneration.AspNetCore.AspNetCoreToSwaggerGeneratorCommandEntryPoint";
+        private static readonly AssemblyName CommandsAssemblyName = new AssemblyName("NSwag.Commands");
+
         private static readonly Version NSwagVersion = typeof(Program).GetTypeInfo().Assembly.GetName().Version;
+
         // List of assemblies and versions referenced by NSwag.SwaggerGeneration.AspNetCore. This represents the minimum versions
         // required to successfully run the tool.
         private static readonly Dictionary<string, AssemblyLoadInfo> NSwagReferencedAssemblies = new Dictionary<string, AssemblyLoadInfo>(StringComparer.OrdinalIgnoreCase)
@@ -41,8 +44,10 @@ internal class Program
             ["Microsoft.Extensions.Primitives"] = new AssemblyLoadInfo(new Version(1, 0, 1)),
             ["Microsoft.Net.Http.Headers"] = new AssemblyLoadInfo(new Version(1, 0, 2)),
             ["Newtonsoft.Json"] = new AssemblyLoadInfo(new Version(9, 0, 0)),
+            ["NConsole"] = new AssemblyLoadInfo(new Version(3, 9, 0, 0)),
             ["NJsonSchema"] = new AssemblyLoadInfo(new Version(9, 7, 7)),
             ["NSwag.AssemblyLoader"] = new AssemblyLoadInfo(NSwagVersion),
+            ["NSwag.Commands"] = new AssemblyLoadInfo(NSwagVersion),
             ["NSwag.Core"] = new AssemblyLoadInfo(NSwagVersion),
             ["NSwag.SwaggerGeneration.AspNetCore"] = new AssemblyLoadInfo(NSwagVersion),
             ["NSwag.SwaggerGeneration"] = new AssemblyLoadInfo(NSwagVersion),
@@ -59,15 +64,17 @@ static int Main(string[] args)
                 return (int)ExitCode.InsufficientArguments;
             }
 
-            var settingsFilePath = args[0];
-            var toolsDirectory = args[1];
+            var commandFile = args[0];
+            var outputFile = args[1];
+            var applicationName = args[2];
+            var toolsDirectory = args[3];
 
-            if (!File.Exists(settingsFilePath))
+            if (!File.Exists(commandFile))
             {
                 return (int)ExitCode.SettingsFileNotFound;
             }
 
-            var settingsContent = File.ReadAllText(settingsFilePath);
+            var commandContent = File.ReadAllText(commandFile);
 
             if (!TryLoadReferencedAssemblies())
             {
@@ -85,9 +92,10 @@ static int Main(string[] args)
 
                 if (!File.Exists(assemblyLocation))
                     throw new InvalidOperationException($"Referenced assembly '{assemblyName}' was not found in {toolsDirectory}.");
+
                 return context.LoadFromAssemblyPath(assemblyLocation);
             };
-            var assembly = loadContext.LoadFromAssemblyName(AspNetCoreSwaggerGenerationAssembly);
+            var assembly = loadContext.LoadFromAssemblyName(CommandsAssemblyName);
 #else
             AppDomain.CurrentDomain.AssemblyResolve += (source, eventArgs) =>
             {
@@ -106,15 +114,15 @@ static int Main(string[] args)
                 return Assembly.LoadFile(assemblyLocation);
             };
 
-            var assembly = Assembly.Load(AspNetCoreSwaggerGenerationAssembly);
+            var assembly = Assembly.Load(CommandsAssemblyName);
 #endif
 
             var type = assembly.GetType(EntryPointType, throwOnError: true);
             var method = type.GetMethod("Process", BindingFlags.Public | BindingFlags.Static);
 
             try
             {
-                method.Invoke(null, new[] { settingsContent });
+                method.Invoke(null, new[] { commandContent, outputFile, applicationName });
             }
             catch (Exception ex)
             {

diff --git a/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj b/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
     <Description>NSwag: The Swagger API toolchain for .NET and TypeScript</Description>
-    <Version>11.16.1</Version>
+    <Version>11.17.0</Version>
     <PackageTags>Swagger Documentation WebApi AspNet TypeScript CodeGen</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/NSwag/NSwag/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj b/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
     <Description>NSwag: The Swagger API toolchain for .NET and TypeScript</Description>
-    <Version>11.16.1</Version>
+    <Version>11.17.0</Version>
     <PackageTags>Swagger Documentation WebApi AspNet TypeScript CodeGen</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/NSwag/NSwag/blob/master/LICENSE.md</PackageLicenseUrl>
@@ -24,7 +24,7 @@
     <DefineConstants>TRACE;RELEASE;FullNet;NET451</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NJsonSchema" Version="9.10.41" />
+    <PackageReference Include="NJsonSchema" Version="9.10.42" />
     <PackageReference Include="System.Net.Http" Version="4.3.2" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">

diff --git a/src/NSwag.CodeGeneration.CSharp.Tests/NSwag.CodeGeneration.CSharp.Tests.csproj b/src/NSwag.CodeGeneration.CSharp.Tests/NSwag.CodeGeneration.CSharp.Tests.csproj
@@ -40,8 +40,8 @@
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=9.10.41.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.9.10.41\lib\net45\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=9.10.42.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.9.10.42\lib\net45\NJsonSchema.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/NSwag.CodeGeneration.CSharp.Tests/packages.config b/src/NSwag.CodeGeneration.CSharp.Tests/packages.config
@@ -4,5 +4,5 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net451" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
-  <package id="NJsonSchema" version="9.10.41" targetFramework="net462" />
+  <package id="NJsonSchema" version="9.10.42" targetFramework="net462" />
 </packages>
diff --git a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;net451</TargetFrameworks>
     <Description>NSwag: The Swagger API toolchain for .NET and TypeScript</Description>
-    <Version>11.16.1</Version>
+    <Version>11.17.0</Version>
     <PackageTags>Swagger Documentation WebApi AspNet TypeScript CodeGen</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/NSwag/NSwag/blob/master/LICENSE.md</PackageLicenseUrl>
@@ -35,7 +35,7 @@
     <EmbeddedResource Include="Templates\JsonExceptionConverter.liquid" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="9.10.41" />
+    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="9.10.42" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net451'">
     <Reference Include="Microsoft.CSharp" />

diff --git a/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj b/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj
@@ -75,17 +75,17 @@
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=9.10.41.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.9.10.41\lib\net45\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=9.10.42.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.9.10.42\lib\net45\NJsonSchema.dll</HintPath>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration, Version=9.10.41.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.CodeGeneration.9.10.41\lib\net451\NJsonSchema.CodeGeneration.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration, Version=9.10.42.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.CodeGeneration.9.10.42\lib\net451\NJsonSchema.CodeGeneration.dll</HintPath>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration.CSharp, Version=9.10.41.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.CodeGeneration.CSharp.9.10.41\lib\net451\NJsonSchema.CodeGeneration.CSharp.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration.CSharp, Version=9.10.42.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.CodeGeneration.CSharp.9.10.42\lib\net451\NJsonSchema.CodeGeneration.CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration.TypeScript, Version=9.10.41.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.CodeGeneration.TypeScript.9.10.41\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration.TypeScript, Version=9.10.42.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.CodeGeneration.TypeScript.9.10.42\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll</HintPath>
     </Reference>
     <Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
       <HintPath>..\packages\Swashbuckle.Core.5.5.3\lib\net40\Swashbuckle.Core.dll</HintPath>

diff --git a/src/NSwag.CodeGeneration.Tests/packages.config b/src/NSwag.CodeGeneration.Tests/packages.config
@@ -13,10 +13,10 @@
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net46" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="NJsonSchema" version="9.10.41" targetFramework="net462" />
-  <package id="NJsonSchema.CodeGeneration" version="9.10.41" targetFramework="net462" />
-  <package id="NJsonSchema.CodeGeneration.CSharp" version="9.10.41" targetFramework="net462" />
-  <package id="NJsonSchema.CodeGeneration.TypeScript" version="9.10.41" targetFramework="net462" />
+  <package id="NJsonSchema" version="9.10.42" targetFramework="net462" />
+  <package id="NJsonSchema.CodeGeneration" version="9.10.42" targetFramework="net462" />
+  <package id="NJsonSchema.CodeGeneration.CSharp" version="9.10.42" targetFramework="net462" />
+  <package id="NJsonSchema.CodeGeneration.TypeScript" version="9.10.42" targetFramework="net462" />
   <package id="Swashbuckle.Core" version="5.5.3" targetFramework="net45" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net46" />
   <package id="System.Collections" version="4.3.0" targetFramework="net46" />

diff --git a/src/NSwag.CodeGeneration.TypeScript.Tests/NSwag.CodeGeneration.TypeScript.Tests.csproj b/src/NSwag.CodeGeneration.TypeScript.Tests/NSwag.CodeGeneration.TypeScript.Tests.csproj
@@ -46,14 +46,14 @@
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NJsonSchema, Version=9.10.41.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.9.10.41\lib\net45\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=9.10.42.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.9.10.42\lib\net45\NJsonSchema.dll</HintPath>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration, Version=9.10.41.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.CodeGeneration.9.10.41\lib\net451\NJsonSchema.CodeGeneration.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration, Version=9.10.42.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.CodeGeneration.9.10.42\lib\net451\NJsonSchema.CodeGeneration.dll</HintPath>
     </Reference>
-    <Reference Include="NJsonSchema.CodeGeneration.TypeScript, Version=9.10.41.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\packages\NJsonSchema.CodeGeneration.TypeScript.9.10.41\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll</HintPath>
+    <Reference Include="NJsonSchema.CodeGeneration.TypeScript, Version=9.10.42.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\packages\NJsonSchema.CodeGeneration.TypeScript.9.10.42\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

diff --git a/src/NSwag.CodeGeneration.TypeScript.Tests/packages.config b/src/NSwag.CodeGeneration.TypeScript.Tests/packages.config
@@ -9,9 +9,9 @@
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net46" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
-  <package id="NJsonSchema" version="9.10.41" targetFramework="net462" />
-  <package id="NJsonSchema.CodeGeneration" version="9.10.41" targetFramework="net462" />
-  <package id="NJsonSchema.CodeGeneration.TypeScript" version="9.10.41" targetFramework="net462" />
+  <package id="NJsonSchema" version="9.10.42" targetFramework="net462" />
+  <package id="NJsonSchema.CodeGeneration" version="9.10.42" targetFramework="net462" />
+  <package id="NJsonSchema.CodeGeneration.TypeScript" version="9.10.42" targetFramework="net462" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net46" />
   <package id="System.Collections" version="4.3.0" targetFramework="net46" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net46" />

diff --git a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;net451</TargetFrameworks>
     <Description>NSwag: The Swagger API toolchain for .NET and TypeScript</Description>
-    <Version>11.16.1</Version>
+    <Version>11.17.0</Version>
     <PackageTags>Swagger Documentation WebApi AspNet TypeScript CodeGen</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/NSwag/NSwag/blob/master/LICENSE.md</PackageLicenseUrl>
@@ -36,7 +36,7 @@
     <EmbeddedResource Include="Templates\JQueryPromisesClient.liquid" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="9.10.41" />
+    <PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="9.10.42" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net451'">
     <Reference Include="Microsoft.CSharp" />

diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadHeaders.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/Client.ProcessResponse.ReadHeaders.liquid
@@ -5,7 +5,7 @@ let _headers: any = {}; if (response.headers) { for (let key of response.headers
 let _headers: any = response.headers ? response.headers.toJSON() : {};
 {%      endif -%}
 {% elseif IsFetchOrAurelia -%}
-let _headers: any = {}; if (response.headers && response.headers.forEach) { response.headers.forEach((v, k) => _headers[k] = v); };
+let _headers: any = {}; if (response.headers && response.headers.forEach) { response.headers.forEach((v: any, k: any) => _headers[k] = v); };
 {% else -%}
 let _headers: any = {};
 {% endif -%}