diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index eb6a05d..c202c4e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "paket": { - "version": "8.0.3", + "version": "9.0.2", "commands": [ "paket" ], @@ -17,7 +17,7 @@ "rollForward": false }, "fantomas": { - "version": "6.3.12", + "version": "6.3.16", "commands": [ "fantomas" ], diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 9efac74..53f13ff 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -3,14 +3,13 @@ name: Build and Test on: push: branches: - - master + - master pull_request: branches: - - master + - master jobs: build: - strategy: fail-fast: false matrix: @@ -18,14 +17,14 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v1 - - name: Setup .NET 8.0 SDK - uses: actions/setup-dotnet@v4 - with: - dotnet-version: '8.0.x' - - name: Install local tools - run: dotnet tool restore - - name: Paket Restore - run: dotnet paket restore - - name: Build and Test - run: dotnet fsi build.fsx + - uses: actions/checkout@v1 + - name: Setup .NET 9.0 SDK + uses: actions/setup-dotnet@v4 + with: + dotnet-version: "9.0.x" + - name: Install local tools + run: dotnet tool restore + - name: Paket Restore + run: dotnet paket restore + - name: Build and Test + run: dotnet fsi build.fsx diff --git a/build.fsx b/build.fsx index c1f61cd..c007612 100644 --- a/build.fsx +++ b/build.fsx @@ -91,7 +91,7 @@ let webApiInputStream = StreamRef.Empty Target.create "StartServer" (fun _ -> Target.activateFinal "StopServer" - CreateProcess.fromRawCommandLine "dotnet" "tests/Swashbuckle.WebApi.Server/bin/Release/net8.0/Swashbuckle.WebApi.Server.dll" + CreateProcess.fromRawCommandLine "dotnet" "tests/Swashbuckle.WebApi.Server/bin/Release/net9.0/Swashbuckle.WebApi.Server.dll" |> CreateProcess.withStandardInput(CreatePipe webApiInputStream) |> Proc.start |> ignore @@ -116,9 +116,9 @@ Target.create "BuildTests" (fun _ -> dotnet "build" "SwaggerProvider.TestsAndDoc let runTests assembly = dotnet "test" $"{assembly} -c Release --no-build" -Target.create "RunUnitTests" (fun _ -> runTests "tests/SwaggerProvider.Tests/bin/Release/net8.0/SwaggerProvider.Tests.dll") +Target.create "RunUnitTests" (fun _ -> runTests "tests/SwaggerProvider.Tests/bin/Release/net9.0/SwaggerProvider.Tests.dll") -Target.create "RunIntegrationTests" (fun _ -> runTests "tests/SwaggerProvider.ProviderTests/bin/Release/net8.0/SwaggerProvider.ProviderTests.dll") +Target.create "RunIntegrationTests" (fun _ -> runTests "tests/SwaggerProvider.ProviderTests/bin/Release/net9.0/SwaggerProvider.ProviderTests.dll") Target.create "RunTests" ignore diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md index 3b2fc8b..8867600 100644 --- a/docs/RELEASE_NOTES.md +++ b/docs/RELEASE_NOTES.md @@ -1,3 +1,8 @@ +#### 2.2.0 - Jan 6, 2025 + +- hk: build with .NET 9 +- hk: Dependencies update + #### 2.1.3 - Sep 8, 2024 - hk: Dependencies update diff --git a/global.json b/global.json index bbdacaa..45f790c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.401", + "version": "9.0.101", "rollForward": "minor" } } diff --git a/paket.dependencies b/paket.dependencies index 601c9ec..c7787a6 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -20,7 +20,7 @@ github fsprojects/FSharp.Data:main src/FSharp.Data.Runtime.Utilities/NameUtils.f group Server source https://api.nuget.org/v3/index.json - framework: net8.0 + framework: net9.0 nuget Microsoft.AspNetCore nuget Microsoft.AspNetCore.Mvc @@ -28,10 +28,12 @@ group Server nuget Swashbuckle.AspNetCore nuget Microsoft.OpenApi nuget FSharp.Core + nuget System.Text.Json + group Test source https://api.nuget.org/v3/index.json - frameworks: net8.0 + frameworks: net9.0 nuget FSharp.Compiler.Service nuget FSharp.Core diff --git a/paket.lock b/paket.lock index 9607422..1e7c24d 100644 --- a/paket.lock +++ b/paket.lock @@ -5,48 +5,48 @@ NUGET FSharp.SystemTextJson (1.3.13) FSharp.Core (>= 4.7) System.Text.Json (>= 6.0) - Microsoft.Bcl.AsyncInterfaces (8.0) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) + Microsoft.Bcl.AsyncInterfaces (9.0) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) - Microsoft.OpenApi (1.6.21) - Microsoft.OpenApi.Readers (1.6.21) - Microsoft.OpenApi (>= 1.6.21) + Microsoft.OpenApi (1.6.23) + Microsoft.OpenApi.Readers (1.6.23) + Microsoft.OpenApi (>= 1.6.23) SharpYaml (>= 2.1.1) NETStandard.Library.NETFramework (2.0.0-preview2-25405-01) SharpYaml (2.1.1) - System.Buffers (4.5.1) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Memory (4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net8.0) (< netcoreapp2.0)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (4.5) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (6.0) - System.Text.Encodings.Web (8.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) - System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0) - System.Text.Json (6.0.9) + System.Buffers (4.6) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Memory (4.6) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Buffers (>= 4.6) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (== netstandard2.0) + System.Numerics.Vectors (>= 4.6) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (== netstandard2.0) + System.Numerics.Vectors (4.6) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (6.1) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Text.Encodings.Web (9.0) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (== netstandard2.0) + System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (== netstandard2.0) + System.Text.Json (6.0.11) Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) System.Memory (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (>= 6.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Text.Encodings.Web (>= 6.0.1) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.0)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= wp8)) (== netstandard2.0) - YamlDotNet (16.1) + System.Threading.Tasks.Extensions (4.6) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (== netstandard2.0) + YamlDotNet (16.3) GITHUB remote: fsprojects/FSharp.TypeProviders.SDK src/ProvidedTypes.fs (3a9510e466cb8ab04e0b86841dc777994909f881) src/ProvidedTypes.fsi (3a9510e466cb8ab04e0b86841dc777994909f881) remote: fsprojects/FSharp.Data - src/FSharp.Data.Runtime.Utilities/NameUtils.fs (71c95c7264cbda846bb675fe177a639d04b94e67) - src/FSharp.Data.Runtime.Utilities/Pluralizer.fs (71c95c7264cbda846bb675fe177a639d04b94e67) + src/FSharp.Data.Runtime.Utilities/NameUtils.fs (992bd093c6eacb65a69bf09097889b72bbba7146) + src/FSharp.Data.Runtime.Utilities/Pluralizer.fs (992bd093c6eacb65a69bf09097889b72bbba7146) GROUP Server -RESTRICTION: == net8.0 +RESTRICTION: == net9.0 NUGET remote: https://api.nuget.org/v3/index.json - FSharp.Core (8.0.400) + FSharp.Core (9.0.100) Microsoft.AspNetCore (2.2) Microsoft.AspNetCore.Diagnostics (>= 2.2) Microsoft.AspNetCore.HostFiltering (>= 2.2) @@ -80,32 +80,31 @@ NUGET Microsoft.AspNetCore.Authentication.Abstractions (>= 2.2) Microsoft.AspNetCore.Http (>= 2.2) Microsoft.AspNetCore.Http.Extensions (>= 2.2) - Microsoft.AspNetCore.Authorization (8.0.8) - Microsoft.AspNetCore.Metadata (>= 8.0.8) - Microsoft.Extensions.Logging.Abstractions (>= 8.0.1) - Microsoft.Extensions.Options (>= 8.0.2) + Microsoft.AspNetCore.Authorization (9.0) + Microsoft.AspNetCore.Metadata (>= 9.0) + Microsoft.Extensions.Logging.Abstractions (>= 9.0) + Microsoft.Extensions.Options (>= 9.0) Microsoft.AspNetCore.Authorization.Policy (2.2) Microsoft.AspNetCore.Authentication.Abstractions (>= 2.2) Microsoft.AspNetCore.Authorization (>= 2.2) - Microsoft.AspNetCore.Connections.Abstractions (8.0.8) - Microsoft.Extensions.Features (>= 8.0.8) - System.IO.Pipelines (>= 8.0) + Microsoft.AspNetCore.Connections.Abstractions (9.0) + Microsoft.Extensions.Features (>= 9.0) Microsoft.AspNetCore.Cors (2.2) Microsoft.AspNetCore.Http.Extensions (>= 2.2) Microsoft.Extensions.Configuration.Abstractions (>= 2.2) Microsoft.Extensions.DependencyInjection.Abstractions (>= 2.2) Microsoft.Extensions.Logging.Abstractions (>= 2.2) Microsoft.Extensions.Options (>= 2.2) - Microsoft.AspNetCore.Cryptography.Internal (8.0.8) - Microsoft.AspNetCore.DataProtection (8.0.8) - Microsoft.AspNetCore.Cryptography.Internal (>= 8.0.8) - Microsoft.AspNetCore.DataProtection.Abstractions (>= 8.0.8) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.1) - Microsoft.Extensions.Hosting.Abstractions (>= 8.0) - Microsoft.Extensions.Logging.Abstractions (>= 8.0.1) - Microsoft.Extensions.Options (>= 8.0.2) - System.Security.Cryptography.Xml (>= 8.0.1) - Microsoft.AspNetCore.DataProtection.Abstractions (8.0.8) + Microsoft.AspNetCore.Cryptography.Internal (9.0) + Microsoft.AspNetCore.DataProtection (9.0) + Microsoft.AspNetCore.Cryptography.Internal (>= 9.0) + Microsoft.AspNetCore.DataProtection.Abstractions (>= 9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.Hosting.Abstractions (>= 9.0) + Microsoft.Extensions.Logging.Abstractions (>= 9.0) + Microsoft.Extensions.Options (>= 9.0) + System.Security.Cryptography.Xml (>= 9.0) + Microsoft.AspNetCore.DataProtection.Abstractions (9.0) Microsoft.AspNetCore.Diagnostics (2.2) Microsoft.AspNetCore.Diagnostics.Abstractions (>= 2.2) Microsoft.AspNetCore.Hosting.Abstractions (>= 2.2) @@ -172,7 +171,7 @@ NUGET Microsoft.AspNetCore.Http.Extensions (>= 2.2) Microsoft.Extensions.Configuration.Binder (>= 2.2) Microsoft.Extensions.Options (>= 2.2) - Microsoft.AspNetCore.JsonPatch (8.0.8) + Microsoft.AspNetCore.JsonPatch (9.0) Microsoft.CSharp (>= 4.7) Newtonsoft.Json (>= 13.0.3) Microsoft.AspNetCore.Localization (2.2) @@ -180,7 +179,7 @@ NUGET Microsoft.Extensions.Localization.Abstractions (>= 2.2) Microsoft.Extensions.Logging.Abstractions (>= 2.2) Microsoft.Extensions.Options (>= 2.2) - Microsoft.AspNetCore.Metadata (8.0.8) + Microsoft.AspNetCore.Metadata (9.0) Microsoft.AspNetCore.Mvc (2.2) Microsoft.AspNetCore.Mvc.Analyzers (>= 2.2) Microsoft.AspNetCore.Mvc.ApiExplorer (>= 2.2) @@ -240,9 +239,9 @@ NUGET Microsoft.CodeAnalysis.Razor (>= 2.2) Microsoft.Extensions.Caching.Memory (>= 2.2) Microsoft.Extensions.FileProviders.Composite (>= 2.2) - Microsoft.AspNetCore.Mvc.Razor.Extensions (6.0.33) - Microsoft.AspNetCore.Razor.Language (>= 6.0.33) - Microsoft.CodeAnalysis.Razor (>= 6.0.33) + Microsoft.AspNetCore.Mvc.Razor.Extensions (6.0.36) + Microsoft.AspNetCore.Razor.Language (>= 6.0.36) + Microsoft.CodeAnalysis.Razor (>= 6.0.36) Microsoft.AspNetCore.Mvc.RazorPages (2.2.5) Microsoft.AspNetCore.Mvc.Razor (>= 2.2) Microsoft.AspNetCore.Mvc.TagHelpers (2.2) @@ -264,7 +263,7 @@ NUGET Microsoft.AspNetCore.Razor (2.2) Microsoft.AspNetCore.Html.Abstractions (>= 2.2) Microsoft.AspNetCore.Razor.Design (2.2) - Microsoft.AspNetCore.Razor.Language (6.0.33) + Microsoft.AspNetCore.Razor.Language (6.0.36) Microsoft.AspNetCore.Razor.Runtime (2.2) Microsoft.AspNetCore.Html.Abstractions (>= 2.2) Microsoft.AspNetCore.Razor (>= 2.2) @@ -326,188 +325,178 @@ NUGET Microsoft.AspNetCore.Hosting.Abstractions (>= 2.2) Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions (>= 2.2) Microsoft.Extensions.Options (>= 2.2) - Microsoft.AspNetCore.WebUtilities (8.0.8) - Microsoft.Net.Http.Headers (>= 8.0.8) - System.IO.Pipelines (>= 8.0) - Microsoft.CodeAnalysis.Analyzers (3.3.4) - Microsoft.CodeAnalysis.Common (4.11) + Microsoft.AspNetCore.WebUtilities (9.0) + Microsoft.Net.Http.Headers (>= 9.0) + Microsoft.CodeAnalysis.Analyzers (3.11) + Microsoft.CodeAnalysis.Common (4.12) Microsoft.CodeAnalysis.Analyzers (>= 3.3.4) System.Collections.Immutable (>= 8.0) System.Reflection.Metadata (>= 8.0) - Microsoft.CodeAnalysis.CSharp (4.11) + Microsoft.CodeAnalysis.CSharp (4.12) Microsoft.CodeAnalysis.Analyzers (>= 3.3.4) - Microsoft.CodeAnalysis.Common (4.11) + Microsoft.CodeAnalysis.Common (4.12) System.Collections.Immutable (>= 8.0) System.Reflection.Metadata (>= 8.0) - Microsoft.CodeAnalysis.Razor (6.0.33) - Microsoft.AspNetCore.Razor.Language (>= 6.0.33) + Microsoft.CodeAnalysis.Razor (6.0.36) + Microsoft.AspNetCore.Razor.Language (>= 6.0.36) Microsoft.CodeAnalysis.Common (>= 4.0) Microsoft.CodeAnalysis.CSharp (>= 4.0) Microsoft.CSharp (4.7) - Microsoft.Extensions.ApiDescription.Server (8.0.8) - Microsoft.Extensions.Caching.Abstractions (8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.Caching.Memory (8.0) - Microsoft.Extensions.Caching.Abstractions (>= 8.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) - Microsoft.Extensions.Logging.Abstractions (>= 8.0) - Microsoft.Extensions.Options (>= 8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.Configuration (8.0) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.Configuration.Abstractions (8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.Configuration.Binder (8.0.2) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0) - Microsoft.Extensions.Configuration.CommandLine (8.0) - Microsoft.Extensions.Configuration (>= 8.0) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0) - Microsoft.Extensions.Configuration.EnvironmentVariables (8.0) - Microsoft.Extensions.Configuration (>= 8.0) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0) - Microsoft.Extensions.Configuration.FileExtensions (8.0.1) - Microsoft.Extensions.Configuration (>= 8.0) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0) - Microsoft.Extensions.FileProviders.Abstractions (>= 8.0) - Microsoft.Extensions.FileProviders.Physical (>= 8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.Configuration.Json (8.0) - Microsoft.Extensions.Configuration (>= 8.0) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0) - Microsoft.Extensions.Configuration.FileExtensions (>= 8.0) - Microsoft.Extensions.FileProviders.Abstractions (>= 8.0) - System.Text.Json (>= 8.0) - Microsoft.Extensions.Configuration.UserSecrets (8.0) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0) - Microsoft.Extensions.Configuration.Json (>= 8.0) - Microsoft.Extensions.FileProviders.Abstractions (>= 8.0) - Microsoft.Extensions.FileProviders.Physical (>= 8.0) - Microsoft.Extensions.DependencyInjection (8.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) - Microsoft.Extensions.DependencyInjection.Abstractions (8.0.1) - Microsoft.Extensions.DependencyModel (8.0.1) - System.Text.Encodings.Web (>= 8.0) - System.Text.Json (>= 8.0.4) - Microsoft.Extensions.Diagnostics.Abstractions (8.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) - Microsoft.Extensions.Options (>= 8.0) - System.Diagnostics.DiagnosticSource (>= 8.0) - Microsoft.Extensions.Features (8.0.8) - Microsoft.Extensions.FileProviders.Abstractions (8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.FileProviders.Composite (8.0) - Microsoft.Extensions.FileProviders.Abstractions (>= 8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.FileProviders.Physical (8.0) - Microsoft.Extensions.FileProviders.Abstractions (>= 8.0) - Microsoft.Extensions.FileSystemGlobbing (>= 8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.FileSystemGlobbing (8.0) - Microsoft.Extensions.Hosting.Abstractions (8.0) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) - Microsoft.Extensions.Diagnostics.Abstractions (>= 8.0) - Microsoft.Extensions.FileProviders.Abstractions (>= 8.0) - Microsoft.Extensions.Logging.Abstractions (>= 8.0) - Microsoft.Extensions.Localization (8.0.8) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.1) - Microsoft.Extensions.Localization.Abstractions (>= 8.0.8) - Microsoft.Extensions.Logging.Abstractions (>= 8.0.1) - Microsoft.Extensions.Options (>= 8.0.2) - Microsoft.Extensions.Localization.Abstractions (8.0.8) - Microsoft.Extensions.Logging (8.0) - Microsoft.Extensions.DependencyInjection (>= 8.0) - Microsoft.Extensions.Logging.Abstractions (>= 8.0) - Microsoft.Extensions.Options (>= 8.0) - Microsoft.Extensions.Logging.Abstractions (8.0.1) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.1) - Microsoft.Extensions.Logging.Configuration (8.0) - Microsoft.Extensions.Configuration (>= 8.0) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0) - Microsoft.Extensions.Configuration.Binder (>= 8.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) - Microsoft.Extensions.Logging (>= 8.0) - Microsoft.Extensions.Logging.Abstractions (>= 8.0) - Microsoft.Extensions.Options (>= 8.0) - Microsoft.Extensions.Options.ConfigurationExtensions (>= 8.0) - Microsoft.Extensions.Logging.Console (8.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) - Microsoft.Extensions.Logging (>= 8.0) - Microsoft.Extensions.Logging.Abstractions (>= 8.0) - Microsoft.Extensions.Logging.Configuration (>= 8.0) - Microsoft.Extensions.Options (>= 8.0) - System.Text.Json (>= 8.0) - Microsoft.Extensions.Logging.Debug (8.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) - Microsoft.Extensions.Logging (>= 8.0) - Microsoft.Extensions.Logging.Abstractions (>= 8.0) - Microsoft.Extensions.Logging.EventSource (8.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) - Microsoft.Extensions.Logging (>= 8.0) - Microsoft.Extensions.Logging.Abstractions (>= 8.0) - Microsoft.Extensions.Options (>= 8.0) - Microsoft.Extensions.Primitives (>= 8.0) - System.Text.Json (>= 8.0) - Microsoft.Extensions.ObjectPool (8.0.8) - Microsoft.Extensions.Options (8.0.2) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.Options.ConfigurationExtensions (8.0) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0) - Microsoft.Extensions.Configuration.Binder (>= 8.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0) - Microsoft.Extensions.Options (>= 8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.Primitives (8.0) - Microsoft.Extensions.WebEncoders (8.0.8) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.1) - Microsoft.Extensions.Options (>= 8.0.2) - Microsoft.Net.Http.Headers (8.0.8) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.OpenApi (1.6.21) + Microsoft.Extensions.ApiDescription.Server (9.0) + Microsoft.Extensions.Caching.Abstractions (9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.Caching.Memory (9.0) + Microsoft.Extensions.Caching.Abstractions (>= 9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.Logging.Abstractions (>= 9.0) + Microsoft.Extensions.Options (>= 9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.Configuration (9.0) + Microsoft.Extensions.Configuration.Abstractions (>= 9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.Configuration.Abstractions (9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.Configuration.Binder (9.0) + Microsoft.Extensions.Configuration.Abstractions (>= 9.0) + Microsoft.Extensions.Configuration.CommandLine (9.0) + Microsoft.Extensions.Configuration (>= 9.0) + Microsoft.Extensions.Configuration.Abstractions (>= 9.0) + Microsoft.Extensions.Configuration.EnvironmentVariables (9.0) + Microsoft.Extensions.Configuration (>= 9.0) + Microsoft.Extensions.Configuration.Abstractions (>= 9.0) + Microsoft.Extensions.Configuration.FileExtensions (9.0) + Microsoft.Extensions.Configuration (>= 9.0) + Microsoft.Extensions.Configuration.Abstractions (>= 9.0) + Microsoft.Extensions.FileProviders.Abstractions (>= 9.0) + Microsoft.Extensions.FileProviders.Physical (>= 9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.Configuration.Json (9.0) + Microsoft.Extensions.Configuration (>= 9.0) + Microsoft.Extensions.Configuration.Abstractions (>= 9.0) + Microsoft.Extensions.Configuration.FileExtensions (>= 9.0) + Microsoft.Extensions.FileProviders.Abstractions (>= 9.0) + Microsoft.Extensions.Configuration.UserSecrets (9.0) + Microsoft.Extensions.Configuration.Abstractions (>= 9.0) + Microsoft.Extensions.Configuration.Json (>= 9.0) + Microsoft.Extensions.FileProviders.Abstractions (>= 9.0) + Microsoft.Extensions.FileProviders.Physical (>= 9.0) + Microsoft.Extensions.DependencyInjection (9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (9.0) + Microsoft.Extensions.DependencyModel (9.0) + Microsoft.Extensions.Diagnostics.Abstractions (9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.Options (>= 9.0) + Microsoft.Extensions.Features (9.0) + Microsoft.Extensions.FileProviders.Abstractions (9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.FileProviders.Composite (9.0) + Microsoft.Extensions.FileProviders.Abstractions (>= 9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.FileProviders.Physical (9.0) + Microsoft.Extensions.FileProviders.Abstractions (>= 9.0) + Microsoft.Extensions.FileSystemGlobbing (>= 9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.FileSystemGlobbing (9.0) + Microsoft.Extensions.Hosting.Abstractions (9.0) + Microsoft.Extensions.Configuration.Abstractions (>= 9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.Diagnostics.Abstractions (>= 9.0) + Microsoft.Extensions.FileProviders.Abstractions (>= 9.0) + Microsoft.Extensions.Logging.Abstractions (>= 9.0) + Microsoft.Extensions.Localization (9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.Localization.Abstractions (>= 9.0) + Microsoft.Extensions.Logging.Abstractions (>= 9.0) + Microsoft.Extensions.Options (>= 9.0) + Microsoft.Extensions.Localization.Abstractions (9.0) + Microsoft.Extensions.Logging (9.0) + Microsoft.Extensions.DependencyInjection (>= 9.0) + Microsoft.Extensions.Logging.Abstractions (>= 9.0) + Microsoft.Extensions.Options (>= 9.0) + Microsoft.Extensions.Logging.Abstractions (9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.Logging.Configuration (9.0) + Microsoft.Extensions.Configuration (>= 9.0) + Microsoft.Extensions.Configuration.Abstractions (>= 9.0) + Microsoft.Extensions.Configuration.Binder (>= 9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.Logging (>= 9.0) + Microsoft.Extensions.Logging.Abstractions (>= 9.0) + Microsoft.Extensions.Options (>= 9.0) + Microsoft.Extensions.Options.ConfigurationExtensions (>= 9.0) + Microsoft.Extensions.Logging.Console (9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.Logging (>= 9.0) + Microsoft.Extensions.Logging.Abstractions (>= 9.0) + Microsoft.Extensions.Logging.Configuration (>= 9.0) + Microsoft.Extensions.Options (>= 9.0) + Microsoft.Extensions.Logging.Debug (9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.Logging (>= 9.0) + Microsoft.Extensions.Logging.Abstractions (>= 9.0) + Microsoft.Extensions.Logging.EventSource (9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.Logging (>= 9.0) + Microsoft.Extensions.Logging.Abstractions (>= 9.0) + Microsoft.Extensions.Options (>= 9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.ObjectPool (9.0) + Microsoft.Extensions.Options (9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.Options.ConfigurationExtensions (9.0) + Microsoft.Extensions.Configuration.Abstractions (>= 9.0) + Microsoft.Extensions.Configuration.Binder (>= 9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.Options (>= 9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.Primitives (9.0) + Microsoft.Extensions.WebEncoders (9.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 9.0) + Microsoft.Extensions.Options (>= 9.0) + Microsoft.Net.Http.Headers (9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.OpenApi (1.6.23) Newtonsoft.Json (13.0.3) - Newtonsoft.Json.Bson (1.0.2) - Newtonsoft.Json (>= 12.0.1) - Swashbuckle.AspNetCore (6.7.3) + Newtonsoft.Json.Bson (1.0.3) + Newtonsoft.Json (>= 13.0.1) + Swashbuckle.AspNetCore (7.2) Microsoft.Extensions.ApiDescription.Server (>= 6.0.5) - Swashbuckle.AspNetCore.Swagger (>= 6.7.3) - Swashbuckle.AspNetCore.SwaggerGen (>= 6.7.3) - Swashbuckle.AspNetCore.SwaggerUI (>= 6.7.3) - Swashbuckle.AspNetCore.Swagger (6.7.3) - Microsoft.OpenApi (>= 1.6.14) - Swashbuckle.AspNetCore.SwaggerGen (6.7.3) - Swashbuckle.AspNetCore.Swagger (>= 6.7.3) - Swashbuckle.AspNetCore.SwaggerUI (6.7.3) - System.Buffers (4.5.1) - System.Collections.Immutable (8.0) + Swashbuckle.AspNetCore.Swagger (>= 7.2) + Swashbuckle.AspNetCore.SwaggerGen (>= 7.2) + Swashbuckle.AspNetCore.SwaggerUI (>= 7.2) + Swashbuckle.AspNetCore.Swagger (7.2) + Microsoft.OpenApi (>= 1.6.22) + Swashbuckle.AspNetCore.SwaggerGen (7.2) + Swashbuckle.AspNetCore.Swagger (>= 7.2) + Swashbuckle.AspNetCore.SwaggerUI (7.2) + System.Buffers (4.6) + System.Collections.Immutable (9.0) System.ComponentModel.Annotations (5.0) - System.Diagnostics.DiagnosticSource (8.0.1) - System.Formats.Asn1 (8.0.1) - System.IO.Pipelines (8.0) - System.Memory (4.5.5) - System.Numerics.Vectors (4.5) - System.Reflection.Metadata (8.0) - System.Collections.Immutable (>= 8.0) - System.Runtime.CompilerServices.Unsafe (6.0) + System.Diagnostics.DiagnosticSource (9.0) + System.Formats.Asn1 (9.0) + System.IO.Pipelines (9.0) + System.Memory (4.6) + System.Numerics.Vectors (4.6) + System.Reflection.Metadata (9.0) + System.Runtime.CompilerServices.Unsafe (6.1) System.Security.Cryptography.Cng (5.0) System.Formats.Asn1 (>= 5.0) - System.Security.Cryptography.Pkcs (8.0) - System.Formats.Asn1 (>= 8.0) - System.Security.Cryptography.Xml (8.0.1) - System.Security.Cryptography.Pkcs (>= 8.0) + System.Security.Cryptography.Pkcs (9.0) + System.Security.Cryptography.Xml (9.0) + System.Security.Cryptography.Pkcs (>= 9.0) System.Security.Principal.Windows (5.0) - System.Text.Encodings.Web (8.0) - System.Text.Json (8.0.4) - System.Text.Encodings.Web (>= 8.0) - System.Threading.Tasks.Extensions (4.5.4) + System.Text.Encodings.Web (9.0) + System.Text.Json (9.0) + System.Threading.Tasks.Extensions (4.6) GROUP Test -RESTRICTION: == net8.0 +RESTRICTION: == net9.0 NUGET remote: https://api.nuget.org/v3/index.json - FSharp.Compiler.Service (43.8.400) - FSharp.Core (8.0.400) + FSharp.Compiler.Service (43.9.100) + FSharp.Core (9.0.100) System.Buffers (>= 4.5.1) System.Collections.Immutable (>= 8.0) System.Diagnostics.DiagnosticSource (>= 8.0) @@ -515,52 +504,62 @@ NUGET System.Reflection.Emit (>= 4.7) System.Reflection.Metadata (>= 8.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) - FSharp.Core (8.0.400) + FSharp.Core (9.0.100) FSharp.SystemTextJson (1.3.13) FSharp.Core (>= 4.7) System.Text.Json (>= 6.0) - FsUnit.Xunit (6.0) + FsUnit.xUnit (7.0.1) FSharp.Core (>= 5.0.2) - NHamcrest (>= 3.4) - xunit (>= 2.5.3) - Microsoft.CodeCoverage (17.11.1) - Microsoft.NET.Test.Sdk (17.11.1) - Microsoft.CodeCoverage (>= 17.11.1) - Microsoft.TestPlatform.TestHost (>= 17.11.1) - Microsoft.OpenApi (1.6.21) - redirects: force - Microsoft.OpenApi.Readers (1.6.21) - redirects: force - Microsoft.OpenApi (>= 1.6.21) + NHamcrest (>= 4.0) + xunit.v3 (>= 1.0) + Microsoft.Bcl.AsyncInterfaces (9.0) + Microsoft.CodeCoverage (17.12) + Microsoft.NET.Test.Sdk (17.12) + Microsoft.CodeCoverage (>= 17.12) + Microsoft.TestPlatform.TestHost (>= 17.12) + Microsoft.OpenApi (1.6.23) - redirects: force + Microsoft.OpenApi.Readers (1.6.23) - redirects: force + Microsoft.OpenApi (>= 1.6.23) SharpYaml (>= 2.1.1) - Microsoft.TestPlatform.ObjectModel (17.11.1) + Microsoft.Testing.Extensions.TrxReport.Abstractions (1.5) + Microsoft.Testing.Platform (>= 1.5) + Microsoft.Testing.Platform (1.5) + Microsoft.Testing.Platform.MSBuild (1.5) + Microsoft.Testing.Platform (>= 1.5) + Microsoft.TestPlatform.ObjectModel (17.12) System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.11.1) - Microsoft.TestPlatform.ObjectModel (>= 17.11.1) + Microsoft.TestPlatform.TestHost (17.12) + Microsoft.TestPlatform.ObjectModel (>= 17.12) Newtonsoft.Json (>= 13.0.1) Newtonsoft.Json (13.0.3) - NHamcrest (3.4) + NHamcrest (4.0) SharpYaml (2.1.1) - redirects: force - System.Buffers (4.5.1) - System.Collections.Immutable (8.0) - System.Diagnostics.DiagnosticSource (8.0.1) - System.Memory (4.5.5) + System.Buffers (4.6) + System.Collections.Immutable (9.0) + System.Diagnostics.DiagnosticSource (9.0) + System.Memory (4.6) System.Reflection.Emit (4.7) - System.Reflection.Metadata (8.0) - System.Collections.Immutable (>= 8.0) - System.Runtime.CompilerServices.Unsafe (6.0) - System.Text.Encodings.Web (8.0) - System.Text.Json (8.0.4) - System.Text.Encodings.Web (>= 8.0) - xunit (2.9) - xunit.analyzers (>= 1.15) - xunit.assert (>= 2.9) - xunit.core (2.9) - xunit.abstractions (2.0.3) - xunit.analyzers (1.16) - xunit.assert (2.9) - xunit.core (2.9) - xunit.extensibility.core (2.9) - xunit.extensibility.execution (2.9) - xunit.extensibility.core (2.9) - xunit.abstractions (>= 2.0.3) - xunit.extensibility.execution (2.9) - xunit.extensibility.core (2.9) + System.Reflection.Metadata (9.0) + System.Runtime.CompilerServices.Unsafe (6.1) + System.Text.Json (9.0) + xunit.analyzers (1.18) + xunit.v3 (1.0) + xunit.analyzers (>= 1.18) + xunit.v3.assert (1.0) + xunit.v3.core (1.0) + xunit.v3.assert (1.0) + xunit.v3.common (1.0) + Microsoft.Bcl.AsyncInterfaces (>= 6.0) + xunit.v3.core (1.0) + Microsoft.Testing.Platform.MSBuild (>= 1.4.3) + xunit.v3.extensibility.core (1.0) + xunit.v3.runner.inproc.console (1.0) + xunit.v3.extensibility.core (1.0) + xunit.v3.common (1.0) + xunit.v3.runner.common (1.0) + xunit.v3.common (1.0) + xunit.v3.runner.inproc.console (1.0) + Microsoft.Testing.Extensions.TrxReport.Abstractions (>= 1.4.3) + Microsoft.Testing.Platform (>= 1.4.3) + xunit.v3.extensibility.core (1.0) + xunit.v3.runner.common (1.0) diff --git a/src/SwaggerProvider.Runtime/paket.template b/src/SwaggerProvider.Runtime/paket.template index 5ffb1eb..30c51c4 100644 --- a/src/SwaggerProvider.Runtime/paket.template +++ b/src/SwaggerProvider.Runtime/paket.template @@ -15,7 +15,7 @@ licenseUrl requireLicenseAcceptance false copyright - Copyright 2015-2024 + Copyright 2015-2025 tags F# fsharp data typeprovider Swagger API REST OpenAPI summary diff --git a/tests/SwaggerProvider.ProviderTests/SwaggerProvider.ProviderTests.fsproj b/tests/SwaggerProvider.ProviderTests/SwaggerProvider.ProviderTests.fsproj index 68caa5f..cebba28 100644 --- a/tests/SwaggerProvider.ProviderTests/SwaggerProvider.ProviderTests.fsproj +++ b/tests/SwaggerProvider.ProviderTests/SwaggerProvider.ProviderTests.fsproj @@ -1,7 +1,7 @@ - + - net8.0 + net9.0 true true diff --git a/tests/SwaggerProvider.Tests/SwaggerProvider.Tests.fsproj b/tests/SwaggerProvider.Tests/SwaggerProvider.Tests.fsproj index c95d0a3..2bb7d9b 100644 --- a/tests/SwaggerProvider.Tests/SwaggerProvider.Tests.fsproj +++ b/tests/SwaggerProvider.Tests/SwaggerProvider.Tests.fsproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 true diff --git a/tests/Swashbuckle.WebApi.Server/Swashbuckle.WebApi.Server.fsproj b/tests/Swashbuckle.WebApi.Server/Swashbuckle.WebApi.Server.fsproj index 1e3c0ec..d87181b 100644 --- a/tests/Swashbuckle.WebApi.Server/Swashbuckle.WebApi.Server.fsproj +++ b/tests/Swashbuckle.WebApi.Server/Swashbuckle.WebApi.Server.fsproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 true true Swashbuckle.WebApi.Server