Merge pull request #144 from NSwag/master

Release v2.40

README.md

@@ -5,9 +5,9 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/aajfgxqf5dic7tkk?svg=true)](https://ci.appveyor.com/project/rsuter/nswag)
 CI: [![Build status](https://ci.appveyor.com/api/projects/status/sfoha01b3i841iky?svg=true)](https://ci.appveyor.com/project/rsuter/nswag-25x6o)
 
-NSwag is a Swagger 2.0 API toolchain for .NET, TypeScript and other platforms, written in C#. The [Swagger specification](http://swagger.io) uses JSON and JSON Schema to describe a RESTful web API. The project provides tools to generate Swagger specifications from existing Web API controllers and client code from these Swagger specifications and integrate this generation into existing processes. 
+NSwag is a Swagger 2.0 API toolchain for .NET, TypeScript and other platforms, written in C#. The [Swagger specification](http://swagger.io) uses JSON and JSON Schema to describe a RESTful web API. The project provides tools to generate Swagger specifications from existing Web API controllers and client code from these Swagger specifications. 
 
-The NSwag project heavily uses [NJsonSchema for .NET](http://njsonschema.org) for JSON Schema handling and C#/TypeScript class/interface generation. 
+The NSwag project heavily uses [NJsonSchema for .NET](http://njsonschema.org) for JSON Schema handling and C#/TypeScript class/interface generation. The project is maintained and developed by [Rico Suter](http://rsuter.com) and other contributors. 
 
 **Ways to use the toolchain:** 
 

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.39.*")]
+[assembly: AssemblyVersion("2.40.*")]

src/NSwag.AssemblyLoader/Properties/AssemblyInfo.cs

@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.AssemblyLoader")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("2.39.*")]
+[assembly: AssemblyVersion("2.40.*")]

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.39.*")]
+// [assembly: AssemblyVersion("2.40.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

src/NSwag.CodeGeneration/CodeGenerators/TypeScript/Templates/AngularJSTemplate.tt

@@ -102,7 +102,7 @@ export class <#=Model.Class#> <#if(Model.GenerateClientInterfaces){#>implements
         });
     }
 
-    private process<#=operation.OperationNameUpper#>(url: string, response: any) {
+    private process<#=operation.OperationNameUpper#>(response: any) {
         var data = response.data;
         var status = response.status; 
 

src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj

@@ -94,7 +94,7 @@
     <Compile Include="CodeGenerators\TypeScript\PromiseType.cs" />
     <Compile Include="CodeGenerators\TypeScript\SwaggerToTypeScriptClientGeneratorSettings.cs" />
     <Compile Include="CodeGenerators\TypeScript\Templates\Angular2Template.Extensions.cs" />
-    <Compile Include="CodeGenerators\TypeScript\Templates\Angular2Template.cs">
+    <Compile Include="CodeGenerators\TypeScript\Templates\Angular2Template1.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Angular2Template.tt</DependentUpon>
@@ -111,12 +111,12 @@
       <DependentUpon>FileTemplate.tt</DependentUpon>
     </Compile>
     <Compile Include="CodeGenerators\TypeScript\Templates\FileTemplate.Extensions.cs" />
-    <Compile Include="CodeGenerators\TypeScript\Templates\JQueryCallbacksTemplate.cs">
+    <Compile Include="CodeGenerators\TypeScript\Templates\JQueryCallbacksTemplate.Extensions.cs" />
+    <Compile Include="CodeGenerators\TypeScript\Templates\JQueryCallbacksTemplate1.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>JQueryCallbacksTemplate.tt</DependentUpon>
     </Compile>
-    <Compile Include="CodeGenerators\TypeScript\Templates\JQueryCallbacksTemplate.Extensions.cs" />
     <Compile Include="CodeGenerators\TypeScript\Templates\JQueryPromisesTemplate.Extensions.cs" />
     <Compile Include="CodeGenerators\TypeScript\Templates\JQueryPromisesTemplate.cs">
       <AutoGen>True</AutoGen>
@@ -165,7 +165,7 @@
     </None>
     <None Include="CodeGenerators\TypeScript\Templates\Angular2Template.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Angular2Template.cs</LastGenOutput>
+      <LastGenOutput>Angular2Template1.cs</LastGenOutput>
     </None>
     <None Include="CodeGenerators\TypeScript\Templates\AngularJSTemplate.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
@@ -177,7 +177,7 @@
     </None>
     <None Include="CodeGenerators\TypeScript\Templates\JQueryCallbacksTemplate.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>JQueryCallbacksTemplate.cs</LastGenOutput>
+      <LastGenOutput>JQueryCallbacksTemplate1.cs</LastGenOutput>
     </None>
     <None Include="CodeGenerators\TypeScript\Templates\JQueryPromisesTemplate.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>

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.39.*")]
+[assembly: AssemblyVersion("2.40.*")]

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.39.*")]
+[assembly: AssemblyVersion("2.40.*")]

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.39.*")]
+// [assembly: AssemblyVersion("2.40.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

src/NSwag.MSBuild/NSwag.MSBuild.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>NSwag.MSBuild</id>
-        <version>2.39</version>
+        <version>2.40</version>
         <authors>Rico Suter</authors>
         <owners>Rico Suter</owners>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>

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.39.*")]
+// [assembly: AssemblyVersion("2.40.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

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("2.39.*")]
+[assembly: AssemblyVersion("2.40.*")]