Merge pull request #106 from NSwag/master

Release v2.23

Author: RicoSuter

README.md

@@ -17,7 +17,7 @@ The NSwag project heavily uses [NJsonSchema for .NET](http://njsonschema.org) fo
 
 **Swagger Generators:**
 
-- ASP.NET Web API to Swagger
+- ASP.NET Web API assembly to Swagger (supports .NET Core)
     - [WebApiToSwaggerGenerator](https://github.com/NSwag/NSwag/wiki/WebApiToSwaggerGenerator)
     - [WebApiAssemblyToSwaggerGenerator](https://github.com/NSwag/NSwag/wiki/WebApiAssemblyToSwaggerGenerator)
 - Types from .NET assemblies
@@ -30,7 +30,7 @@ The NSwag project heavily uses [NJsonSchema for .NET](http://njsonschema.org) fo
 	- Available templates/supported libraries: 
 		- JQuery with Callbacks, `JQueryCallbacks`
 		- JQuery with promises `JQueryPromises`
-		- AngularJS using $http, `Angular`
+		- AngularJS using $http, `AngularJS`
 		- Angular 2 using the http service, `Angular2`
 - **CSharp Client**
 	- [SwaggerToCSharpClientGenerator](https://github.com/NSwag/NSwag/wiki/SwaggerToCSharpClientGenerator)
@@ -57,7 +57,7 @@ The NSwag project heavily uses [NJsonSchema for .NET](http://njsonschema.org) fo
 The following code shows how to read a Swagger specification and generate C# client classes to call the described web services: 
 
 ```cs
-var service = SwaggerService.FromJson("...");
+var service = SwaggerService.FromJson("{}");
 
 var settings = new SwaggerToCSharpClientGeneratorSettings 
 {

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

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

src/NSwag.AssemblyLoader/SwaggerGenerators/AssemblyLoader.cs

@@ -47,7 +47,7 @@ protected void RegisterReferencePaths(IEnumerable<string> referencePaths)
             };
         }
 
-        private static string[] GetAllDirectories(string rootDirectory)
+        private string[] GetAllDirectories(string rootDirectory)
         {
             return Directory.GetDirectories(rootDirectory, "*", SearchOption.AllDirectories);
         }

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

src/NSwag.CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpClientGenerator.cs

@@ -45,7 +45,7 @@ public SwaggerToCSharpClientGenerator(SwaggerService service, SwaggerToCSharpCli
         /// <summary>Gets the language.</summary>
         protected override string Language => "CSharp";
 
-        internal override CodeGeneratorBaseSettings BaseSettings => Settings;
+        internal override ClientGeneratorBaseSettings BaseSettings => Settings;
 
         /// <summary>Generates the file.</summary>
         /// <returns>The file contents.</returns>

src/NSwag.CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpGeneratorSettings.cs

@@ -11,7 +11,7 @@
 namespace NSwag.CodeGeneration.CodeGenerators.CSharp
 {
     /// <summary>Settings for the <see cref="SwaggerToCSharpGeneratorBase"/>.</summary>
-    public abstract class SwaggerToCSharpGeneratorSettings : CodeGeneratorBaseSettings
+    public abstract class SwaggerToCSharpGeneratorSettings : ClientGeneratorBaseSettings
     {
         /// <summary>Initializes a new instance of the <see cref="SwaggerToCSharpClientGeneratorSettings"/> class.</summary>
         protected SwaggerToCSharpGeneratorSettings()

src/NSwag.CodeGeneration/CodeGenerators/CSharp/SwaggerToCSharpWebApiControllerGenerator.cs

@@ -44,7 +44,7 @@ public SwaggerToCSharpWebApiControllerGenerator(SwaggerService service, SwaggerT
         /// <summary>Gets the language.</summary>
         protected override string Language => "CSharp";
 
-        internal override CodeGeneratorBaseSettings BaseSettings => Settings;
+        internal override ClientGeneratorBaseSettings BaseSettings => Settings;
 
         /// <summary>Generates the file.</summary>
         /// <returns>The file contents.</returns>

src/NSwag.CodeGeneration/CodeGenerators/ClientGeneratorBase.cs

@@ -18,7 +18,7 @@ namespace NSwag.CodeGeneration.CodeGenerators
     /// <summary>The client generator base.</summary>
     public abstract class ClientGeneratorBase : GeneratorBase
     {
-        internal abstract CodeGeneratorBaseSettings BaseSettings { get; }
+        internal abstract ClientGeneratorBaseSettings BaseSettings { get; }
 
         internal abstract string RenderFile(string clientCode);
 

src/NSwag.CodeGeneration/CodeGenerators/CodeGeneratorBaseSettings.cs renamed to src/NSwag.CodeGeneration/CodeGenerators/ClientGeneratorBaseSettings.cs

@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="CodeGeneratorBaseSettings.cs" company="NSwag">
+// <copyright file="ClientGeneratorBaseSettings.cs" company="NSwag">
 //     Copyright (c) Rico Suter. All rights reserved.
 // </copyright>
 // <license>https://github.com/NSwag/NSwag/blob/master/LICENSE.md</license>
@@ -12,10 +12,10 @@
 namespace NSwag.CodeGeneration.CodeGenerators
 {
     /// <summary>Settings for the <see cref="ClientGeneratorBase"/>.</summary>
-    public class CodeGeneratorBaseSettings
+    public class ClientGeneratorBaseSettings
     {
-        /// <summary>Initializes a new instance of the <see cref="CodeGeneratorBaseSettings"/> class.</summary>
-        public CodeGeneratorBaseSettings()
+        /// <summary>Initializes a new instance of the <see cref="ClientGeneratorBaseSettings"/> class.</summary>
+        public ClientGeneratorBaseSettings()
         {
             GenerateClientClasses = true; 
             GenerateDtoTypes = true;