diff --git a/build/03_RunIntegrationTests.bat b/build/03_RunIntegrationTests.bat index 7224739905..833b32c8f5 100644 --- a/build/03_RunIntegrationTests.bat +++ b/build/03_RunIntegrationTests.bat @@ -7,17 +7,17 @@ pushd "%~dp0\..\samples" cmd /c call powershell .\run.ps1 Release || goto :error popd -pushd "%~dp0\..\src\NSwag.Sample.NETCore11" -dotnet restore || goto :error -dotnet publish || goto :error -cmd /c call "..\NSwagStudio\bin\Release\nswag.cmd" run /runtime:NetCore21 || goto :error -popd +REM pushd "%~dp0\..\src\NSwag.Sample.NETCore11" +REM dotnet restore || goto :error +REM dotnet publish || goto :error +REM cmd /c call "..\NSwagStudio\bin\Release\nswag.cmd" run /runtime:NetCore21 || goto :error +REM popd -pushd "%~dp0\..\src\NSwag.Sample.NETCore20" -dotnet restore || goto :error -dotnet publish || goto :error -cmd /c call "..\NSwagStudio\bin\Release\nswag.cmd" run /runtime:NetCore21 || goto :error -popd +REM pushd "%~dp0\..\src\NSwag.Sample.NETCore20" +REM dotnet restore || goto :error +REM dotnet publish || goto :error +REM cmd /c call "..\NSwagStudio\bin\Release\nswag.cmd" run /runtime:NetCore21 || goto :error +REM popd pushd "%~dp0\..\src\NSwag.Sample.NETCore21" dotnet restore || goto :error @@ -25,16 +25,16 @@ dotnet build /p:CopyLocalLockFileAssemblies=true || goto :error cmd /c call "..\NSwagStudio\bin\Release\nswag.cmd" run /runtime:NetCore21 || goto :error popd -pushd "%~dp0\..\src\NSwag.Sample.NETCore22" -dotnet restore || goto :error -dotnet build /p:CopyLocalLockFileAssemblies=true || goto :error -cmd /c call "..\NSwagStudio\bin\Release\nswag.cmd" run /runtime:NetCore22 || goto :error -popd +REM pushd "%~dp0\..\src\NSwag.Sample.NETCore22" +REM dotnet restore || goto :error +REM dotnet build /p:CopyLocalLockFileAssemblies=true || goto :error +REM cmd /c call "..\NSwagStudio\bin\Release\nswag.cmd" run /runtime:NetCore22 || goto :error +REM popd -pushd "%~dp0\..\src\NSwag.Sample.NETCore30" +pushd "%~dp0\..\src\NSwag.Sample.NETCore31" dotnet restore || goto :error dotnet build /p:CopyLocalLockFileAssemblies=true || goto :error -cmd /c call "..\NSwagStudio\bin\Release\nswag.cmd" run /runtime:NetCore30 || goto :error +cmd /c call "..\NSwagStudio\bin\Release\nswag.cmd" run /runtime:NetCore31 || goto :error popd pushd "%~dp0\..\src\NSwag.Sample.NetGlobalAsax" diff --git a/samples/run.ps1 b/samples/run.ps1 index ebeef4da40..1626fc8057 100644 --- a/samples/run.ps1 +++ b/samples/run.ps1 @@ -30,10 +30,10 @@ function NSwagRun([string]$projectDirectory, [string]$configurationFile, [string } # WithoutMiddleware/Sample.AspNetCore20 -NSwagRun "$samplesPath/WithoutMiddleware/Sample.AspNetCore20" "nswag_project" "NetCore21" "Release" false +# NSwagRun "$samplesPath/WithoutMiddleware/Sample.AspNetCore20" "nswag_project" "NetCore21" "Release" false # NSwagRun "$samplesPath/WithoutMiddleware/Sample.AspNetCore20" "nswag_assembly" "NetCore21" "Release" true -NSwagRun "$samplesPath/WithoutMiddleware/Sample.AspNetCore20" "nswag_project" "NetCore21" "Debug" false +# NSwagRun "$samplesPath/WithoutMiddleware/Sample.AspNetCore20" "nswag_project" "NetCore21" "Debug" false # NSwagRun "$samplesPath/WithoutMiddleware/Sample.AspNetCore20" "nswag_assembly" "NetCore21" "Debug" true # WithoutMiddleware/Sample.AspNetCore21 diff --git a/src/NSwag.Commands/Commands/Generation/AspNetCore/AspNetCoreToOpenApiCommand.cs b/src/NSwag.Commands/Commands/Generation/AspNetCore/AspNetCoreToOpenApiCommand.cs index 31acdf6965..60ed400fb9 100644 --- a/src/NSwag.Commands/Commands/Generation/AspNetCore/AspNetCoreToOpenApiCommand.cs +++ b/src/NSwag.Commands/Commands/Generation/AspNetCore/AspNetCoreToOpenApiCommand.cs @@ -192,10 +192,18 @@ public override async Task RunAsync(CommandLineProcessor processor, ICon var binaryName = LauncherBinaryName + ".dll"; var executorBinary = Path.Combine(toolDirectory, binaryName); + + if (!File.Exists(executorBinary)) + { + binaryName = LauncherBinaryName + ".exe"; + executorBinary = Path.Combine(toolDirectory, binaryName); + } + if (!File.Exists(executorBinary)) { throw new InvalidOperationException($"Unable to locate {binaryName} in {toolDirectory}."); } + args.Add(executorBinary); } #endif diff --git a/src/NSwag.Console.x86/NSwag.Console.x86.csproj b/src/NSwag.Console.x86/NSwag.Console.x86.csproj index d5f368b902..39cb3e0c93 100644 --- a/src/NSwag.Console.x86/NSwag.Console.x86.csproj +++ b/src/NSwag.Console.x86/NSwag.Console.x86.csproj @@ -38,7 +38,7 @@ - + diff --git a/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj b/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj index b519ac2489..d3c04dc616 100644 --- a/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj +++ b/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj @@ -15,6 +15,7 @@ NSwag.Demo.Web NSwag.Demo.Web v4.6 + win true diff --git a/src/NSwag.Generation.WebApi.Tests/NSwag.Generation.WebApi.Tests.csproj b/src/NSwag.Generation.WebApi.Tests/NSwag.Generation.WebApi.Tests.csproj index 9fad01eb8c..65c62729ef 100644 --- a/src/NSwag.Generation.WebApi.Tests/NSwag.Generation.WebApi.Tests.csproj +++ b/src/NSwag.Generation.WebApi.Tests/NSwag.Generation.WebApi.Tests.csproj @@ -11,6 +11,7 @@ NSwag.Generation.WebApi.Tests v4.6.2 512 + win diff --git a/src/NSwag.Integration.ClientPCL/PetStoreClient.cs b/src/NSwag.Integration.ClientPCL/PetStoreClient.cs index b03da98b86..f623ddefd3 100644 --- a/src/NSwag.Integration.ClientPCL/PetStoreClient.cs +++ b/src/NSwag.Integration.ClientPCL/PetStoreClient.cs @@ -14,7 +14,7 @@ namespace PetStore { using System = global::System; - + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.10.9.0 (NJsonSchema v10.4.1.0 (Newtonsoft.Json v11.0.0.0))")] public partial interface IPetStoreClient { @@ -2703,7 +2703,7 @@ public SwaggerException(string message, int statusCode, string response, System. : base(message + "\n\nStatus: " + statusCode + "\nResponse: \n" + ((response == null) ? "(null)" : response.Substring(0, response.Length >= 512 ? 512 : response.Length)), innerException) { StatusCode = statusCode; - Response = response; + Response = response; Headers = headers; } diff --git a/src/NSwag.Integration.ClientPCL/ServiceClients.cs b/src/NSwag.Integration.ClientPCL/ServiceClients.cs index 6cb1c15614..6e66f5b19c 100644 --- a/src/NSwag.Integration.ClientPCL/ServiceClients.cs +++ b/src/NSwag.Integration.ClientPCL/ServiceClients.cs @@ -16,7 +16,7 @@ namespace NSwag.Integration.ClientPCL { using System = global::System; - + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.10.9.0 (NJsonSchema v10.4.1.0 (Newtonsoft.Json v11.0.0.0))")] public partial class GeoClient : ClientBase { diff --git a/src/NSwag.Integration.ClientPCL/ServiceClientsContracts.cs b/src/NSwag.Integration.ClientPCL/ServiceClientsContracts.cs index 0b5aec946d..c4fe73028c 100644 --- a/src/NSwag.Integration.ClientPCL/ServiceClientsContracts.cs +++ b/src/NSwag.Integration.ClientPCL/ServiceClientsContracts.cs @@ -14,7 +14,7 @@ namespace NSwag.Integration.ClientPCL.Contracts { using System = global::System; - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.4.1.0 (Newtonsoft.Json v11.0.0.0)")] @@ -336,14 +336,14 @@ public bool IsPartial public FileResponse(int statusCode, System.Collections.Generic.IReadOnlyDictionary> headers, System.IO.Stream stream, System.IDisposable client, System.IDisposable response) { - StatusCode = statusCode; - Headers = headers; - Stream = stream; - _client = client; + StatusCode = statusCode; + Headers = headers; + Stream = stream; + _client = client; _response = response; } - public void Dispose() + public void Dispose() { Stream.Dispose(); if (_response != null) @@ -359,10 +359,10 @@ public partial class SwaggerResponse public int StatusCode { get; private set; } public System.Collections.Generic.IReadOnlyDictionary> Headers { get; private set; } - - public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDictionary> headers) + + public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDictionary> headers) { - StatusCode = statusCode; + StatusCode = statusCode; Headers = headers; } } @@ -371,8 +371,8 @@ public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDicti public partial class SwaggerResponse : SwaggerResponse { public TResult Result { get; private set; } - - public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDictionary> headers, TResult result) + + public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDictionary> headers, TResult result) : base(statusCode, headers) { Result = result; @@ -392,7 +392,7 @@ public GeoClientException(string message, int statusCode, string response, Syste : base(message + "\n\nStatus: " + statusCode + "\nResponse: \n" + ((response == null) ? "(null)" : response.Substring(0, response.Length >= 512 ? 512 : response.Length)), innerException) { StatusCode = statusCode; - Response = response; + Response = response; Headers = headers; } @@ -427,7 +427,7 @@ public PersonsClientException(string message, int statusCode, string response, S : base(message + "\n\nStatus: " + statusCode + "\nResponse: \n" + ((response == null) ? "(null)" : response.Substring(0, response.Length >= 512 ? 512 : response.Length)), innerException) { StatusCode = statusCode; - Response = response; + Response = response; Headers = headers; } diff --git a/src/NSwag.Integration.ClientPCL/UberClient.cs b/src/NSwag.Integration.ClientPCL/UberClient.cs index 249894e3e2..6ad677ec7d 100644 --- a/src/NSwag.Integration.ClientPCL/UberClient.cs +++ b/src/NSwag.Integration.ClientPCL/UberClient.cs @@ -14,7 +14,7 @@ namespace Uber { using System = global::System; - + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.10.9.0 (NJsonSchema v10.4.1.0 (Newtonsoft.Json v11.0.0.0))")] public partial class Client { @@ -1133,7 +1133,7 @@ public SwaggerException(string message, int statusCode, string response, System. : base(message + "\n\nStatus: " + statusCode + "\nResponse: \n" + ((response == null) ? "(null)" : response.Substring(0, response.Length >= 512 ? 512 : response.Length)), innerException) { StatusCode = statusCode; - Response = response; + Response = response; Headers = headers; } diff --git a/src/NSwag.Integration.Console/Controllers.cs b/src/NSwag.Integration.Console/Controllers.cs index eedfc29adf..6d80f53c42 100644 --- a/src/NSwag.Integration.Console/Controllers.cs +++ b/src/NSwag.Integration.Console/Controllers.cs @@ -16,7 +16,7 @@ namespace MyNamespace { using System = global::System; - + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.10.9.0 (NJsonSchema v10.4.1.0 (Newtonsoft.Json v11.0.0.0))")] public interface IGeoController { @@ -552,14 +552,14 @@ public bool IsPartial public FileResponse(int statusCode, System.Collections.Generic.IReadOnlyDictionary> headers, System.IO.Stream stream, System.IDisposable client, System.IDisposable response) { - StatusCode = statusCode; - Headers = headers; - Stream = stream; - _client = client; + StatusCode = statusCode; + Headers = headers; + Stream = stream; + _client = client; _response = response; } - public void Dispose() + public void Dispose() { Stream.Dispose(); if (_response != null) diff --git a/src/NSwag.Integration.Console/NSwag.Integration.Console.csproj b/src/NSwag.Integration.Console/NSwag.Integration.Console.csproj index 3937cf104a..b663b3faa2 100644 --- a/src/NSwag.Integration.Console/NSwag.Integration.Console.csproj +++ b/src/NSwag.Integration.Console/NSwag.Integration.Console.csproj @@ -13,6 +13,7 @@ 512 true + win AnyCPU diff --git a/src/NSwag.Integration.Console/ServiceClients.cs b/src/NSwag.Integration.Console/ServiceClients.cs index 1c02a841b8..ed423c85a2 100644 --- a/src/NSwag.Integration.Console/ServiceClients.cs +++ b/src/NSwag.Integration.Console/ServiceClients.cs @@ -16,7 +16,7 @@ namespace NSwag.Integration.Console { using System = global::System; - + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.10.9.0 (NJsonSchema v10.4.1.0 (Newtonsoft.Json v11.0.0.0))")] public partial class GeoClient { diff --git a/src/NSwag.Integration.Console/ServiceClientsContracts.cs b/src/NSwag.Integration.Console/ServiceClientsContracts.cs index f5fa352267..2fb496fe09 100644 --- a/src/NSwag.Integration.Console/ServiceClientsContracts.cs +++ b/src/NSwag.Integration.Console/ServiceClientsContracts.cs @@ -14,7 +14,7 @@ namespace NSwag.Integration.Console.Contracts { using System = global::System; - + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.4.1.0 (Newtonsoft.Json v11.0.0.0)")] @@ -336,14 +336,14 @@ public bool IsPartial public FileResponse(int statusCode, System.Collections.Generic.IReadOnlyDictionary> headers, System.IO.Stream stream, System.IDisposable client, System.IDisposable response) { - StatusCode = statusCode; - Headers = headers; - Stream = stream; - _client = client; + StatusCode = statusCode; + Headers = headers; + Stream = stream; + _client = client; _response = response; } - public void Dispose() + public void Dispose() { Stream.Dispose(); if (_response != null) @@ -366,7 +366,7 @@ public SwaggerException(string message, int statusCode, string response, System. : base(message + "\n\nStatus: " + statusCode + "\nResponse: \n" + ((response == null) ? "(null)" : response.Substring(0, response.Length >= 512 ? 512 : response.Length)), innerException) { StatusCode = statusCode; - Response = response; + Response = response; Headers = headers; } diff --git a/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj b/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj index fd567f0b9e..ef88bbca32 100644 --- a/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj +++ b/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj @@ -14,6 +14,7 @@ NSwag.Integration.WebAPI NSwag.Integration.WebAPI v4.6 + win true diff --git a/src/NSwag.Sample.NETCore31/openapi.json b/src/NSwag.Sample.NETCore31/openapi.json index 91675a5439..4c8f88a78b 100644 --- a/src/NSwag.Sample.NETCore31/openapi.json +++ b/src/NSwag.Sample.NETCore31/openapi.json @@ -1,5 +1,5 @@ -{ - "x-generator": "NSwag v13.1.4.0 (NJsonSchema v10.0.27.0 (Newtonsoft.Json v9.0.0.0))", +{ + "x-generator": "NSwag v13.10.9.0 (NJsonSchema v10.4.1.0 (Newtonsoft.Json v12.0.0.0))", "openapi": "3.0.0", "info": { "title": "My Title", @@ -77,7 +77,7 @@ "content": { "application/json": { "schema": { - "type": "string" + "$ref": "#/components/schemas/TestEnum" } } } @@ -197,6 +197,18 @@ "format": "date-time" } } + }, + "TestEnum": { + "type": "string", + "description": "", + "x-enumNames": [ + "Foo", + "Bar" + ], + "enum": [ + "Foo", + "Bar" + ] } } } diff --git a/src/NSwag.Sample.NetCoreAngular/NSwag.Sample.NetCoreAngular.csproj b/src/NSwag.Sample.NetCoreAngular/NSwag.Sample.NetCoreAngular.csproj index 279f13ce7d..f75266f33b 100644 --- a/src/NSwag.Sample.NetCoreAngular/NSwag.Sample.NetCoreAngular.csproj +++ b/src/NSwag.Sample.NetCoreAngular/NSwag.Sample.NetCoreAngular.csproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + netcoreapp2.1 true false diff --git a/src/NSwag.Sample.NetCoreAurelia/NSwag.Sample.NetCoreAurelia.csproj b/src/NSwag.Sample.NetCoreAurelia/NSwag.Sample.NetCoreAurelia.csproj index a6da16e80f..0206d7d928 100644 --- a/src/NSwag.Sample.NetCoreAurelia/NSwag.Sample.NetCoreAurelia.csproj +++ b/src/NSwag.Sample.NetCoreAurelia/NSwag.Sample.NetCoreAurelia.csproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + netcoreapp2.1 true false diff --git a/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj b/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj index 350c99fdbf..e594ab6edd 100644 --- a/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj +++ b/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj @@ -13,6 +13,7 @@ Properties NSwag.Sample.NetGlobalAsax NSwag.Sample.NetGlobalAsax + win v4.5.2 false true diff --git a/src/NSwag.VersionMissmatchTest/NSwag.VersionMissmatchTest.csproj b/src/NSwag.VersionMissmatchTest/NSwag.VersionMissmatchTest.csproj index 4114ee60c4..49aecccd1e 100644 --- a/src/NSwag.VersionMissmatchTest/NSwag.VersionMissmatchTest.csproj +++ b/src/NSwag.VersionMissmatchTest/NSwag.VersionMissmatchTest.csproj @@ -10,6 +10,7 @@ NSwag.VersionMissmatchTest v4.6.1 512 + win true diff --git a/src/NSwagStudio/NSwagStudio.csproj b/src/NSwagStudio/NSwagStudio.csproj index 58e9be6c35..ec664b485a 100644 --- a/src/NSwagStudio/NSwagStudio.csproj +++ b/src/NSwagStudio/NSwagStudio.csproj @@ -16,6 +16,7 @@ true true + win @@ -308,7 +309,7 @@ - +