From 0ab028de2ecf0ba1eab337ee2571e1de35621c71 Mon Sep 17 00:00:00 2001 From: Rico Suter Date: Wed, 12 Jun 2024 22:06:48 +0200 Subject: [PATCH] Update NJS to v11.0.1 (#4913) * update NJS to v11.0.1 * fix tests * add .net 6 sdk * update --- .github/workflows/build.yml | 12 ++++++++++++ .github/workflows/pr.yml | 12 ++++++++++++ build/Build.CI.GitHubActions.cs | 6 ++---- src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj | 2 +- .../NSwag.CodeGeneration.CSharp.csproj | 2 +- .../NSwag.CodeGeneration.Tests.csproj | 2 +- .../NSwag.CodeGeneration.TypeScript.csproj | 2 +- src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj | 2 +- src/NSwag.Console.x86/NSwag.Console.x86.csproj | 2 +- src/NSwag.Console/NSwag.Console.csproj | 2 +- src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj | 1 + src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj | 2 +- src/NSwag.Core/NSwag.Core.csproj | 2 +- .../NSwag.Generation.AspNetCore.Tests.Web.csproj | 2 +- .../NSwag.Generation.AspNetCore.Tests.csproj | 2 +- src/NSwag.Generation/NSwag.Generation.csproj | 2 +- 16 files changed, 39 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82c3d65546..a1242d0e58 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,6 +40,10 @@ jobs: run: | echo "Adding GNU tar to PATH" echo C:\Program Files\Git\usr\bin>>"%GITHUB_PATH%" + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 6.0.423 - uses: actions/checkout@v3 - name: 'Run: Compile, Test, Pack, Publish' run: ./build.cmd Compile Test Pack Publish @@ -72,6 +76,10 @@ jobs: name: ubuntu-latest runs-on: ubuntu-latest steps: + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 6.0.423 - uses: actions/checkout@v3 - name: 'Run: Compile, Test, Pack, Publish' run: ./build.cmd Compile Test Pack Publish @@ -84,6 +92,10 @@ jobs: name: macos-latest runs-on: macos-latest steps: + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 6.0.423 - uses: actions/checkout@v3 - name: 'Run: Compile, Test, Pack, Publish' run: ./build.cmd Compile Test Pack Publish diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 78bd0912de..6198fa53bc 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -38,6 +38,10 @@ jobs: run: | echo "Adding GNU tar to PATH" echo C:\Program Files\Git\usr\bin>>"%GITHUB_PATH%" + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 6.0.423 - uses: actions/checkout@v3 - name: 'Run: Compile, Test, Pack' run: ./build.cmd Compile Test Pack @@ -65,6 +69,10 @@ jobs: name: ubuntu-latest runs-on: ubuntu-latest steps: + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 6.0.423 - uses: actions/checkout@v3 - name: 'Run: Compile, Test, Pack' run: ./build.cmd Compile Test Pack @@ -72,6 +80,10 @@ jobs: name: macos-latest runs-on: macos-latest steps: + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 6.0.423 - uses: actions/checkout@v3 - name: 'Run: Compile, Test, Pack' run: ./build.cmd Compile Test Pack diff --git a/build/Build.CI.GitHubActions.cs b/build/Build.CI.GitHubActions.cs index 2ad653c7ea..58ed828945 100644 --- a/build/Build.CI.GitHubActions.cs +++ b/build/Build.CI.GitHubActions.cs @@ -49,12 +49,10 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC var newSteps = new List(job.Steps); // only need to list the ones that are missing from default image - /* - newSteps.Insert(0, new GitHubActionsSetupDotNetStep(new[] + newSteps.Insert(0, new GitHubActionsSetupDotNetStep(new[] { - "8.0.100" + "6.0.423" })); - */ var onWindows = image.ToString().StartsWith("windows", StringComparison.OrdinalIgnoreCase); if (onWindows) diff --git a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj index b072770c1d..b3092b6bec 100644 --- a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj +++ b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj index 36c2723439..5ee749d05a 100644 --- a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj +++ b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj @@ -13,6 +13,6 @@ - + \ No newline at end of file diff --git a/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj b/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj index e768804a67..0e260716de 100644 --- a/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj +++ b/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj index 6e1ab9fde3..fb5639e742 100644 --- a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj +++ b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj @@ -13,6 +13,6 @@ - + \ No newline at end of file diff --git a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj index a38ace6d2c..bbcc15a67d 100644 --- a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj +++ b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/NSwag.Console.x86/NSwag.Console.x86.csproj b/src/NSwag.Console.x86/NSwag.Console.x86.csproj index 9801796baa..a5fc53ece7 100644 --- a/src/NSwag.Console.x86/NSwag.Console.x86.csproj +++ b/src/NSwag.Console.x86/NSwag.Console.x86.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/NSwag.Console/NSwag.Console.csproj b/src/NSwag.Console/NSwag.Console.csproj index fcdea0987c..4e0c217d1e 100644 --- a/src/NSwag.Console/NSwag.Console.csproj +++ b/src/NSwag.Console/NSwag.Console.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj b/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj index a1aac26855..211d6fd69b 100644 --- a/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj +++ b/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj @@ -32,6 +32,7 @@ + diff --git a/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj b/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj index b7fc28cc2e..b2bca4283d 100644 --- a/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj +++ b/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/NSwag.Core/NSwag.Core.csproj b/src/NSwag.Core/NSwag.Core.csproj index 40216984e6..31473918f4 100644 --- a/src/NSwag.Core/NSwag.Core.csproj +++ b/src/NSwag.Core/NSwag.Core.csproj @@ -5,6 +5,6 @@ true - + \ No newline at end of file diff --git a/src/NSwag.Generation.AspNetCore.Tests.Web/NSwag.Generation.AspNetCore.Tests.Web.csproj b/src/NSwag.Generation.AspNetCore.Tests.Web/NSwag.Generation.AspNetCore.Tests.Web.csproj index dea412e347..44a8384265 100644 --- a/src/NSwag.Generation.AspNetCore.Tests.Web/NSwag.Generation.AspNetCore.Tests.Web.csproj +++ b/src/NSwag.Generation.AspNetCore.Tests.Web/NSwag.Generation.AspNetCore.Tests.Web.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/NSwag.Generation.AspNetCore.Tests/NSwag.Generation.AspNetCore.Tests.csproj b/src/NSwag.Generation.AspNetCore.Tests/NSwag.Generation.AspNetCore.Tests.csproj index 3af581f35b..d3483b7f8e 100644 --- a/src/NSwag.Generation.AspNetCore.Tests/NSwag.Generation.AspNetCore.Tests.csproj +++ b/src/NSwag.Generation.AspNetCore.Tests/NSwag.Generation.AspNetCore.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/NSwag.Generation/NSwag.Generation.csproj b/src/NSwag.Generation/NSwag.Generation.csproj index e143e415de..6ec94d7b1d 100644 --- a/src/NSwag.Generation/NSwag.Generation.csproj +++ b/src/NSwag.Generation/NSwag.Generation.csproj @@ -7,7 +7,7 @@ - +