Merge branch 'RicoSuter:master' into master

RicoSuter · Jun 26, 2024 · 3207ff2 · 3207ff2
2 parents d5d4a15 + 8af0c71
commit 3207ff2
Show file tree

Hide file tree

Showing 31 changed files with 61 additions and 48 deletions.
diff --git 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
@@ -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,13 +69,21 @@ 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
   macos-latest:
     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/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>14.0.7</VersionPrefix>
+    <VersionPrefix>14.0.8</VersionPrefix>
 
     <Authors>Rico Suter</Authors>
     <Copyright>Copyright © Rico Suter, 2023</Copyright>

diff --git 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<GitHubActionsStep>(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.Owin/SwaggerUi/index.html b/src/NSwag.AspNet.Owin/SwaggerUi/index.html
@@ -65,21 +65,17 @@
   });
 
   if ("{ClientId}") {
-    const oAuthConfig = {
+    var clientSecret = "{ClientSecret}";
+    ui.initOAuth({
       clientId: "{ClientId}",
+      clientSecret: clientSecret ? clientSecret : undefined,
       realm: "{Realm}",
       appName: "{AppName}",
       scopeSeparator: "{ScopeSeparator}",
       scopes: {Scopes},
       additionalQueryStringParams: {AdditionalQueryStringParameters},
       usePkceWithAuthorizationCodeGrant: {UsePkceWithAuthorizationCodeGrant}
-    };
-
-    if (!{UsePkceWithAuthorizationCodeGrant}) {
-      oAuthConfig.clientSecret = "{ClientSecret}";
-    }
-
-    ui.initOAuth(oAuthConfig);
+    });
   }
 
   window.ui = ui;

diff --git a/src/NSwag.AspNet.Owin/SwaggerUi/swagger-ui-bundle.js b/src/NSwag.AspNet.Owin/SwaggerUi/swagger-ui-bundle.js
diff --git a/src/NSwag.AspNet.Owin/SwaggerUi/swagger-ui-es-bundle-core.js b/src/NSwag.AspNet.Owin/SwaggerUi/swagger-ui-es-bundle-core.js
diff --git a/src/NSwag.AspNet.Owin/SwaggerUi/swagger-ui-es-bundle.js b/src/NSwag.AspNet.Owin/SwaggerUi/swagger-ui-es-bundle.js
diff --git a/src/NSwag.AspNet.Owin/SwaggerUi/swagger-ui-standalone-preset.js b/src/NSwag.AspNet.Owin/SwaggerUi/swagger-ui-standalone-preset.js
diff --git a/src/NSwag.AspNet.Owin/SwaggerUi/swagger-ui.css b/src/NSwag.AspNet.Owin/SwaggerUi/swagger-ui.css
diff --git a/src/NSwag.AspNet.Owin/SwaggerUi/swagger-ui.js b/src/NSwag.AspNet.Owin/SwaggerUi/swagger-ui.js
diff --git a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
-    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0" />
+    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NSwag.AspNetCore/SwaggerUi/swagger-ui-bundle.js b/src/NSwag.AspNetCore/SwaggerUi/swagger-ui-bundle.js
diff --git a/src/NSwag.AspNetCore/SwaggerUi/swagger-ui-es-bundle-core.js b/src/NSwag.AspNetCore/SwaggerUi/swagger-ui-es-bundle-core.js
diff --git a/src/NSwag.AspNetCore/SwaggerUi/swagger-ui-es-bundle.js b/src/NSwag.AspNetCore/SwaggerUi/swagger-ui-es-bundle.js
diff --git a/src/NSwag.AspNetCore/SwaggerUi/swagger-ui-standalone-preset.js b/src/NSwag.AspNetCore/SwaggerUi/swagger-ui-standalone-preset.js
diff --git a/src/NSwag.AspNetCore/SwaggerUi/swagger-ui.css b/src/NSwag.AspNetCore/SwaggerUi/swagger-ui.css
diff --git a/src/NSwag.AspNetCore/SwaggerUi/swagger-ui.js b/src/NSwag.AspNetCore/SwaggerUi/swagger-ui.js
diff --git a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj
@@ -13,6 +13,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="11.0.0" />
+    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="11.0.1" />
   </ItemGroup>
 </Project>
diff --git a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.PathParameter.liquid b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.PathParameter.liquid
@@ -1,11 +1,11 @@
 {% if parameter.IsDateTimeArray -%}
-for (var i = 0; i < {{ parameter.VariableName }}.Length; i++)
+for (var i = 0; i < {{ parameter.VariableName }}.Count(); i++)
 {
     if (i > 0) urlBuilder_.Append(',');
     urlBuilder_.Append(System.Uri.EscapeDataString({{ parameter.VariableName }}[i].ToString("{{ ParameterDateTimeFormat }}", System.Globalization.CultureInfo.InvariantCulture)));
 }
 {% elsif parameter.IsDateArray -%}
-for (var i = 0; i < {{ parameter.VariableName }}.Length; i++)
+for (var i = 0; i < {{ parameter.VariableName }}.Count(); i++)
 {
     if (i > 0) urlBuilder_.Append(',');
     urlBuilder_.Append(System.Uri.EscapeDataString({{ parameter.VariableName }}[i].ToString("{{ ParameterDateFormat }}", System.Globalization.CultureInfo.InvariantCulture)));
@@ -15,11 +15,11 @@ urlBuilder_.Append(System.Uri.EscapeDataString({{ parameter.VariableName }}.ToSt
 {% elsif parameter.IsDate -%}
 urlBuilder_.Append(System.Uri.EscapeDataString({{ parameter.VariableName }}.ToString("{{ ParameterDateFormat }}", System.Globalization.CultureInfo.InvariantCulture)));
 {% elsif parameter.IsArray -%}
-for (var i = 0; i < {{ parameter.VariableName }}.Length; i++)
+for (var i = 0; i < {{ parameter.VariableName }}.Count(); i++)
 {
     if (i > 0) urlBuilder_.Append(',');
-    urlBuilder_.Append(ConvertToString({{ parameter.VariableName }}[i], System.Globalization.CultureInfo.InvariantCulture));
+    urlBuilder_.Append(ConvertToString({{ parameter.VariableName }}.ElementAt(i), System.Globalization.CultureInfo.InvariantCulture));
 }
 {% else -%}
 urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString({{ parameter.VariableName }}, System.Globalization.CultureInfo.InvariantCulture)));
-{%- endif %}
+{%- endif %}
diff --git a/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj b/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj
@@ -5,7 +5,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0" />
+    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.1" />
     <PackageReference Include="xunit" Version="2.6.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5" />
   </ItemGroup>

diff --git a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj
@@ -13,6 +13,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="11.0.0" />
+    <PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="11.0.1" />
   </ItemGroup>
 </Project>
diff --git a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.CodeGeneration" Version="11.0.0" />
+    <PackageReference Include="NJsonSchema.CodeGeneration" Version="11.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NSwag.Console.x86/NSwag.Console.x86.csproj b/src/NSwag.Console.x86/NSwag.Console.x86.csproj
@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
     <PackageReference Include="NConsole" Version="3.12.6605.26941" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
   </ItemGroup>

diff --git a/src/NSwag.Console/NSwag.Console.csproj b/src/NSwag.Console/NSwag.Console.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
     <PackageReference Include="NConsole" Version="3.12.6605.26941" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
   </ItemGroup>

diff --git a/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj b/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj
@@ -32,6 +32,7 @@
     <PackageReference Include="NConsole" Version="3.12.6605.26941" />
     <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
   </ItemGroup>
 
   <!-- Workaround for https://github.com/NuGet/Home/issues/3891 -->

diff --git a/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj b/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.Yaml" Version="11.0.0" />
+    <PackageReference Include="NJsonSchema.Yaml" Version="11.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NSwag.Core/NSwag.Core.csproj b/src/NSwag.Core/NSwag.Core.csproj
@@ -5,6 +5,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NJsonSchema" Version="11.0.0" />
+    <PackageReference Include="NJsonSchema" Version="11.0.1" />
   </ItemGroup>
 </Project>
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
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
   </ItemGroup>
 

diff --git 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 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
     <PackageReference Include="xunit" Version="2.6.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5" />
   </ItemGroup>

diff --git a/src/NSwag.Generation/NSwag.Generation.csproj b/src/NSwag.Generation/NSwag.Generation.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0" />
+    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.1" />
   </ItemGroup>
 
   <ItemGroup>