Fix build RicoSuter#3418

AesisGit · Apr 25, 2021 · a40c82a · a40c82a
1 parent d2eacc0
commit a40c82a
Show file tree

Hide file tree

Showing 21 changed files with 85 additions and 58 deletions.
diff --git a/build/03_RunIntegrationTests.bat b/build/03_RunIntegrationTests.bat
@@ -7,34 +7,34 @@ 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
 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
@@ -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
@@ -192,10 +192,18 @@ public override async Task<object> 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
@@ -38,7 +38,7 @@
     <PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
     <PackageReference Include="NConsole" Version="3.9.6519.30868" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="System.Net.Http" Version="4.3.2" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.1.3" />

diff --git a/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj b/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj
@@ -15,6 +15,7 @@
     <RootNamespace>NSwag.Demo.Web</RootNamespace>
     <AssemblyName>NSwag.Demo.Web</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <RuntimeIdentifiers>win</RuntimeIdentifiers>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

diff --git 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 @@
     <AssemblyName>NSwag.Generation.WebApi.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <RuntimeIdentifiers>win</RuntimeIdentifiers>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>

diff --git 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
@@ -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
@@ -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<string, System.Collections.Generic.IEnumerable<string>> 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<string, System.Collections.Generic.IEnumerable<string>> Headers { get; private set; }
-        
-        public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers) 
+
+        public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers)
         {
-            StatusCode = statusCode; 
+            StatusCode = statusCode;
             Headers = headers;
         }
     }
@@ -371,8 +371,8 @@ public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDicti
     public partial class SwaggerResponse<TResult> : SwaggerResponse
     {
         public TResult Result { get; private set; }
-        
-        public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, TResult result) 
+
+        public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> 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
@@ -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
@@ -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<string, System.Collections.Generic.IEnumerable<string>> 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
@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <RuntimeIdentifiers>win</RuntimeIdentifiers>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git 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
@@ -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<string, System.Collections.Generic.IEnumerable<string>> 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
@@ -14,6 +14,7 @@
     <RootNamespace>NSwag.Integration.WebAPI</RootNamespace>
     <AssemblyName>NSwag.Integration.WebAPI</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <RuntimeIdentifiers>win</RuntimeIdentifiers>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

diff --git 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
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/NSwag.Sample.NetCoreAurelia/NSwag.Sample.NetCoreAurelia.csproj b/src/NSwag.Sample.NetCoreAurelia/NSwag.Sample.NetCoreAurelia.csproj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj b/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj
@@ -13,6 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NSwag.Sample.NetGlobalAsax</RootNamespace>
     <AssemblyName>NSwag.Sample.NetGlobalAsax</AssemblyName>
+    <RuntimeIdentifiers>win</RuntimeIdentifiers>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>

diff --git a/src/NSwag.VersionMissmatchTest/NSwag.VersionMissmatchTest.csproj b/src/NSwag.VersionMissmatchTest/NSwag.VersionMissmatchTest.csproj
@@ -10,6 +10,7 @@
     <AssemblyName>NSwag.VersionMissmatchTest</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <RuntimeIdentifiers>win</RuntimeIdentifiers>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
   </PropertyGroup>