From 433923817b5595e62dbef8b1572a6db6a5db7d4b Mon Sep 17 00:00:00 2001 From: Sergey Tihon Date: Thu, 14 Mar 2024 21:00:03 +0100 Subject: [PATCH] build and test with .net 8 (#242) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: build and test with .net 8 * fix: run fake though fsi * fix: workflow * fix: kill build.fsx.lock file * fix: checkout code 😂 * hk: update release notes --- .github/workflows/dotnetcore.yml | 9 +- build.cmd | 2 +- build.fsx | 41 ++-- build.fsx.lock | 193 ------------------ build.sh | 4 +- docs/RELEASE_NOTES.md | 3 + global.json | 2 +- paket.dependencies | 11 +- paket.lock | 118 +++++------ src/Common/AssemblyInfo.fs | 8 +- .../SwaggerProvider.DesignTime.fsproj | 4 +- .../SwaggerProvider.Runtime.fsproj | 2 +- src/SwaggerProvider.Runtime/paket.template | 4 +- .../SwaggerProvider.ProviderTests.fsproj | 2 +- .../SwaggerProvider.Tests.fsproj | 2 +- .../Swashbuckle.WebApi.Server.fsproj | 2 +- 16 files changed, 98 insertions(+), 309 deletions(-) delete mode 100644 build.fsx.lock diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index b2ed8390..9efac745 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -15,18 +15,17 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macOS-latest] - dotnet: [6.0.413] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v1 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + - name: Setup .NET 8.0 SDK + uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ matrix.dotnet }} + 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 fake run build.fsx + run: dotnet fsi build.fsx diff --git a/build.cmd b/build.cmd index 068103ab..609bd288 100644 --- a/build.cmd +++ b/build.cmd @@ -1,4 +1,4 @@ @echo off dotnet tool restore dotnet paket restore -dotnet fake run build.fsx %* +dotnet fsi build.fsx %* diff --git a/build.fsx b/build.fsx index ef8d9b90..c1f61cda 100644 --- a/build.fsx +++ b/build.fsx @@ -1,19 +1,22 @@ -#r @"paket: -source https://nuget.org/api/v2 -framework net6.0 -nuget FSharp.Core 6.0.0.0 -nuget Fake.Core.Target -nuget Fake.Core.Process -nuget Fake.Core.ReleaseNotes -nuget Fake.IO.FileSystem -nuget Fake.DotNet.Cli -nuget Fake.DotNet.MSBuild -nuget Fake.DotNet.AssemblyInfoFile -nuget Fake.DotNet.Paket -nuget Fake.DotNet.FSFormatting -nuget Fake.Tools.Git -nuget Fake.Api.GitHub //" -#load "./.fake/build.fsx/intellisense.fsx" +#r "nuget: Fake.Core.Target" +#r "nuget: Fake.Core.Process" +#r "nuget: Fake.Core.ReleaseNotes" +#r "nuget: Fake.IO.FileSystem" +#r "nuget: Fake.DotNet.Cli" +#r "nuget: Fake.DotNet.MSBuild" +#r "nuget: Fake.DotNet.AssemblyInfoFile" +#r "nuget: Fake.DotNet.Paket" +#r "nuget: Fake.DotNet.FSFormatting" +#r "nuget: Fake.Tools.Git" +#r "nuget: Fake.Api.GitHub" + +// Boilerplate - https://github.com/fsprojects/FAKE/issues/2719#issuecomment-1470687052 +System.Environment.GetCommandLineArgs() +|> Array.skip 2 // skip fsi.exe; build.fsx +|> Array.toList +|> Fake.Core.Context.FakeExecutionContext.Create false __SOURCE_FILE__ +|> Fake.Core.Context.RuntimeContext.Fake +|> Fake.Core.Context.setExecutionContext open Fake open Fake.Core.TargetOperators @@ -88,7 +91,7 @@ let webApiInputStream = StreamRef.Empty Target.create "StartServer" (fun _ -> Target.activateFinal "StopServer" - CreateProcess.fromRawCommandLine "dotnet" "tests/Swashbuckle.WebApi.Server/bin/Release/net6.0/Swashbuckle.WebApi.Server.dll" + CreateProcess.fromRawCommandLine "dotnet" "tests/Swashbuckle.WebApi.Server/bin/Release/net8.0/Swashbuckle.WebApi.Server.dll" |> CreateProcess.withStandardInput(CreatePipe webApiInputStream) |> Proc.start |> ignore @@ -113,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/net6.0/SwaggerProvider.Tests.dll") +Target.create "RunUnitTests" (fun _ -> runTests "tests/SwaggerProvider.Tests/bin/Release/net8.0/SwaggerProvider.Tests.dll") -Target.create "RunIntegrationTests" (fun _ -> runTests "tests/SwaggerProvider.ProviderTests/bin/Release/net6.0/SwaggerProvider.ProviderTests.dll") +Target.create "RunIntegrationTests" (fun _ -> runTests "tests/SwaggerProvider.ProviderTests/bin/Release/net8.0/SwaggerProvider.ProviderTests.dll") Target.create "RunTests" ignore diff --git a/build.fsx.lock b/build.fsx.lock deleted file mode 100644 index 1fc0508a..00000000 --- a/build.fsx.lock +++ /dev/null @@ -1,193 +0,0 @@ -STORAGE: NONE -RESTRICTION: == net6.0 -NUGET - remote: https://www.nuget.org/api/v2 - BlackFox.VsWhere (1.1) - FSharp.Core (>= 4.2.3) - Microsoft.Win32.Registry (>= 4.7) - Fake.Api.GitHub (5.23.1) - FSharp.Core (>= 6.0) - Octokit (>= 0.50) - Fake.Core.CommandLineParsing (5.23.1) - FParsec (>= 1.1.1) - FSharp.Core (>= 6.0) - Fake.Core.Context (5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Environment (5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.FakeVar (5.23.1) - Fake.Core.Context (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Process (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.FakeVar (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - System.Collections.Immutable (>= 5.0) - Fake.Core.ReleaseNotes (5.23.1) - Fake.Core.SemVer (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.SemVer (5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.String (5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Target (5.23.1) - Fake.Core.CommandLineParsing (>= 5.23.1) - Fake.Core.Context (>= 5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.FakeVar (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - FSharp.Control.Reactive (>= 5.0.2) - FSharp.Core (>= 6.0) - Fake.Core.Tasks (5.23.1) - Fake.Core.Trace (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Trace (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.FakeVar (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Xml (5.23.1) - Fake.Core.String (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.DotNet.AssemblyInfoFile (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.DotNet.Cli (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.DotNet.MSBuild (>= 5.23.1) - Fake.DotNet.NuGet (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - Mono.Posix.NETStandard (>= 1.0) - Newtonsoft.Json (>= 13.0.1) - Fake.DotNet.FSFormatting (5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.DotNet.Cli (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.DotNet.MSBuild (5.23.1) - BlackFox.VsWhere (>= 1.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - MSBuild.StructuredLogger (>= 2.1.545) - Fake.DotNet.NuGet (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.SemVer (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Tasks (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.Core.Xml (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - Fake.Net.Http (>= 5.23.1) - FSharp.Core (>= 6.0) - Newtonsoft.Json (>= 13.0.1) - NuGet.Protocol (>= 5.11) - Fake.DotNet.Paket (5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.DotNet.Cli (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.IO.FileSystem (5.23.1) - Fake.Core.String (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Net.Http (5.23.1) - Fake.Core.Trace (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Tools.Git (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.SemVer (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - FParsec (1.1.1) - FSharp.Core (>= 4.3.4) - FSharp.Control.Reactive (5.0.5) - FSharp.Core (>= 4.7.2) - System.Reactive (>= 5.0 < 6.0) - FSharp.Core (6.0) - Microsoft.Build.Framework (17.7.2) - Microsoft.Win32.Registry (>= 5.0) - System.Memory (>= 4.5.5) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Security.Permissions (>= 7.0) - System.Security.Principal.Windows (>= 5.0) - Microsoft.Build.Utilities.Core (17.7.2) - Microsoft.Build.Framework (>= 17.7.2) - Microsoft.NET.StringTools (>= 17.7.2) - Microsoft.Win32.Registry (>= 5.0) - System.Collections.Immutable (>= 7.0) - System.Configuration.ConfigurationManager (>= 7.0) - System.Memory (>= 4.5.5) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Security.Permissions (>= 7.0) - System.Security.Principal.Windows (>= 5.0) - System.Text.Encoding.CodePages (>= 7.0) - Microsoft.NET.StringTools (17.7.2) - System.Memory (>= 4.5.5) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - Microsoft.Win32.Registry (5.0) - System.Security.AccessControl (>= 5.0) - System.Security.Principal.Windows (>= 5.0) - Microsoft.Win32.SystemEvents (7.0) - Mono.Posix.NETStandard (1.0) - MSBuild.StructuredLogger (2.1.858) - Microsoft.Build.Framework (>= 17.5) - Microsoft.Build.Utilities.Core (>= 17.5) - Newtonsoft.Json (13.0.3) - NuGet.Common (6.7) - NuGet.Frameworks (>= 6.7) - NuGet.Configuration (6.7) - NuGet.Common (>= 6.7) - System.Security.Cryptography.ProtectedData (>= 4.4) - NuGet.Frameworks (6.7) - NuGet.Packaging (6.7) - Newtonsoft.Json (>= 13.0.1) - NuGet.Configuration (>= 6.7) - NuGet.Versioning (>= 6.7) - System.Security.Cryptography.Pkcs (>= 6.0.4) - NuGet.Protocol (6.7) - NuGet.Packaging (>= 6.7) - NuGet.Versioning (6.7) - Octokit (9.0) - System.Collections.Immutable (7.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Configuration.ConfigurationManager (7.0) - System.Security.Cryptography.ProtectedData (>= 7.0) - System.Security.Permissions (>= 7.0) - System.Drawing.Common (7.0) - Microsoft.Win32.SystemEvents (>= 7.0) - System.Formats.Asn1 (7.0) - System.Memory (4.5.5) - System.Reactive (5.0) - System.Runtime.CompilerServices.Unsafe (6.0) - System.Security.AccessControl (6.0) - System.Security.Cryptography.Pkcs (7.0.3) - System.Formats.Asn1 (>= 7.0) - System.Security.Cryptography.ProtectedData (7.0.1) - System.Security.Permissions (7.0) - System.Windows.Extensions (>= 7.0) - System.Security.Principal.Windows (5.0) - System.Text.Encoding.CodePages (7.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Windows.Extensions (7.0) - System.Drawing.Common (>= 7.0) diff --git a/build.sh b/build.sh index 2fc81634..89f23555 100755 --- a/build.sh +++ b/build.sh @@ -5,5 +5,5 @@ then else dotnet tool restore dotnet paket restore - dotnet fake run build.fsx $@ -fi \ No newline at end of file + dotnet fsi build.fsx $@ +fi diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md index 1d682659..37a6bf1a 100644 --- a/docs/RELEASE_NOTES.md +++ b/docs/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 2.1.0 - Mar 14, 2024 +- Build and test with .NET 8.0 + #### 2.0.1 - Mar 12, 2024 - fix: update ProvidedTypes.fs (#235) - FSharp.Data utilities update (#238) diff --git a/global.json b/global.json index c7bf057b..cd9202de 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.413", + "version": "8.0.201", "rollForward": "minor" } } diff --git a/paket.dependencies b/paket.dependencies index c573a291..601c9ec5 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,6 +1,6 @@ -version 7.2.1 +version 8.0.3 source https://api.nuget.org/v3/index.json -frameworks: net6.0, netstandard2.0 +frameworks: net8.0, netstandard2.0 nuget FSharp.Core ~> 6 // We need task{} CE from F# 6.0 nuget System.Text.Json ~> 6 @@ -8,9 +8,6 @@ nuget FSharp.SystemTextJson nuget Microsoft.OpenApi.Readers nuget NETStandard.Library.NETFramework -nuget System.Text.Encodings.Web ~> 6 -nuget Microsoft.Bcl.AsyncInterfaces ~> 6 - # delete when we drop custom parser for v2 nuget YamlDotNet @@ -23,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: net6.0 + framework: net8.0 nuget Microsoft.AspNetCore nuget Microsoft.AspNetCore.Mvc @@ -34,7 +31,7 @@ group Server group Test source https://api.nuget.org/v3/index.json - frameworks: net6.0 + frameworks: net8.0 nuget FSharp.Compiler.Service nuget FSharp.Core diff --git a/paket.lock b/paket.lock index 41890afb..5f9d850b 100644 --- a/paket.lock +++ b/paket.lock @@ -1,52 +1,52 @@ -RESTRICTION: || (== net6.0) (== netstandard2.0) +RESTRICTION: || (== net8.0) (== netstandard2.0) NUGET remote: https://api.nuget.org/v3/index.json FSharp.Core (6.0.7) FSharp.SystemTextJson (1.2.42) FSharp.Core (>= 4.7) System.Text.Json (>= 6.0) - Microsoft.Bcl.AsyncInterfaces (6.0) - System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0) - Microsoft.OpenApi (1.6.10) - Microsoft.OpenApi.Readers (1.6.10) - Microsoft.OpenApi (>= 1.6.10) - SharpYaml (>= 2.1) + Microsoft.Bcl.AsyncInterfaces (6.0) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) + Microsoft.OpenApi (1.6.14) + Microsoft.OpenApi.Readers (1.6.14) + Microsoft.OpenApi (>= 1.6.14) + SharpYaml (>= 2.1.1) NETStandard.Library.NETFramework (2.0.0-preview2-25405-01) - SharpYaml (2.1) - System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Memory (4.5.5) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) + 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) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== 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 (6.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.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.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Json (6.0.8) - Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Text.Json (6.0.9) + 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.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0) - YamlDotNet (13.7.1) + 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 (15.1.2) GITHUB remote: fsprojects/FSharp.TypeProviders.SDK - src/ProvidedTypes.fs (48abfa531a90a42a7f62a7cbfd0027741e83b9da) - src/ProvidedTypes.fsi (48abfa531a90a42a7f62a7cbfd0027741e83b9da) + src/ProvidedTypes.fs (6149ed507f15caa68a475808bcf5b3c2f52a4d34) + src/ProvidedTypes.fsi (6149ed507f15caa68a475808bcf5b3c2f52a4d34) remote: fsprojects/FSharp.Data src/FSharp.Data.Runtime.Utilities/NameUtils.fs (8a6688f34abede0a80306e6c802601ef74edf473) src/FSharp.Data.Runtime.Utilities/Pluralizer.fs (8a6688f34abede0a80306e6c802601ef74edf473) GROUP Server -RESTRICTION: == net6.0 +RESTRICTION: == net8.0 NUGET remote: https://api.nuget.org/v3/index.json - FSharp.Core (7.0.401) + FSharp.Core (8.0.200) Microsoft.AspNetCore (2.2) Microsoft.AspNetCore.Diagnostics (>= 2.2) Microsoft.AspNetCore.HostFiltering (>= 2.2) @@ -104,9 +104,7 @@ NUGET Microsoft.Extensions.Hosting.Abstractions (>= 7.0) Microsoft.Extensions.Logging.Abstractions (>= 7.0.1) Microsoft.Extensions.Options (>= 7.0.1) - Microsoft.Win32.Registry (>= 5.0) System.Security.Cryptography.Xml (>= 7.0.1) - System.Security.Principal.Windows (>= 5.0) Microsoft.AspNetCore.DataProtection.Abstractions (7.0.13) Microsoft.AspNetCore.Diagnostics (2.2) Microsoft.AspNetCore.Diagnostics.Abstractions (>= 2.2) @@ -431,7 +429,6 @@ NUGET Microsoft.Extensions.Logging.Abstractions (>= 7.0) Microsoft.Extensions.Logging.Configuration (>= 7.0) Microsoft.Extensions.Options (>= 7.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Text.Json (>= 7.0) Microsoft.Extensions.Logging.Debug (7.0) Microsoft.Extensions.DependencyInjection.Abstractions (>= 7.0) @@ -443,7 +440,6 @@ NUGET Microsoft.Extensions.Logging.Abstractions (>= 7.0) Microsoft.Extensions.Options (>= 7.0) Microsoft.Extensions.Primitives (>= 7.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Text.Json (>= 7.0) Microsoft.Extensions.ObjectPool (7.0.13) Microsoft.Extensions.Options (7.0.1) @@ -456,18 +452,13 @@ NUGET Microsoft.Extensions.Options (>= 7.0) Microsoft.Extensions.Primitives (>= 7.0) Microsoft.Extensions.Primitives (7.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) Microsoft.Extensions.WebEncoders (7.0.13) Microsoft.Extensions.DependencyInjection.Abstractions (>= 7.0) Microsoft.Extensions.Options (>= 7.0.1) - System.Text.Encodings.Web (>= 7.0) Microsoft.Net.Http.Headers (2.2.8) Microsoft.Extensions.Primitives (>= 2.2) System.Buffers (>= 4.5) - Microsoft.OpenApi (1.6.10) - Microsoft.Win32.Registry (5.0) - System.Security.AccessControl (>= 5.0) - System.Security.Principal.Windows (>= 5.0) + Microsoft.OpenApi (1.6.14) Newtonsoft.Json (13.0.3) Newtonsoft.Json.Bson (1.0.2) Newtonsoft.Json (>= 12.0.1) @@ -483,10 +474,8 @@ NUGET Swashbuckle.AspNetCore.SwaggerUI (6.5) System.Buffers (4.5.1) System.Collections.Immutable (7.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) System.ComponentModel.Annotations (5.0) System.Diagnostics.DiagnosticSource (7.0.2) - System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Formats.Asn1 (7.0) System.IO.Pipelines (7.0) System.Memory (4.5.5) @@ -494,7 +483,6 @@ NUGET System.Reflection.Metadata (7.0.2) System.Collections.Immutable (>= 7.0) System.Runtime.CompilerServices.Unsafe (6.0) - System.Security.AccessControl (6.0) System.Security.Cryptography.Cng (5.0) System.Formats.Asn1 (>= 5.0) System.Security.Cryptography.Pkcs (7.0.3) @@ -503,18 +491,16 @@ NUGET System.Security.Cryptography.Pkcs (>= 7.0) System.Security.Principal.Windows (5.0) System.Text.Encodings.Web (7.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Text.Json (7.0.3) - System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Text.Encodings.Web (>= 7.0) System.Threading.Tasks.Extensions (4.5.4) GROUP Test -RESTRICTION: == net6.0 +RESTRICTION: == net8.0 NUGET remote: https://api.nuget.org/v3/index.json - FSharp.Compiler.Service (43.7.401) - FSharp.Core (7.0.401) + FSharp.Compiler.Service (43.8.200) + FSharp.Core (8.0.200) System.Buffers (>= 4.5.1) System.Collections.Immutable (>= 7.0) System.Diagnostics.DiagnosticSource (>= 7.0.2) @@ -522,49 +508,43 @@ NUGET System.Reflection.Emit (>= 4.7) System.Reflection.Metadata (>= 7.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) - FSharp.Core (7.0.401) + FSharp.Core (8.0.200) FSharp.SystemTextJson (1.2.42) FSharp.Core (>= 4.7) System.Text.Json (>= 6.0) - FsUnit.Xunit (5.5) + FsUnit.Xunit (6.0) FSharp.Core (>= 5.0.2) - NHamcrest (>= 3.3 < 4.0) - xunit (>= 2.5.3 < 2.6) - Microsoft.CodeCoverage (17.7.2) - Microsoft.NET.Test.Sdk (17.7.2) - Microsoft.CodeCoverage (>= 17.7.2) - Microsoft.TestPlatform.TestHost (>= 17.7.2) + NHamcrest (>= 3.4) + xunit (>= 2.5.3) + Microsoft.CodeCoverage (17.9) + Microsoft.NET.Test.Sdk (17.9) + Microsoft.CodeCoverage (>= 17.9) + Microsoft.TestPlatform.TestHost (>= 17.9) Microsoft.NETCore.Platforms (7.0.4) - Microsoft.OpenApi (1.6.10) - redirects: force - Microsoft.OpenApi.Readers (1.6.10) - redirects: force - Microsoft.OpenApi (>= 1.6.10) - SharpYaml (>= 2.1) - Microsoft.TestPlatform.ObjectModel (17.7.2) - NuGet.Frameworks (>= 6.5) + Microsoft.OpenApi (1.6.14) - redirects: force + Microsoft.OpenApi.Readers (1.6.14) - redirects: force + Microsoft.OpenApi (>= 1.6.14) + SharpYaml (>= 2.1.1) + Microsoft.TestPlatform.ObjectModel (17.9) System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.7.2) - Microsoft.TestPlatform.ObjectModel (>= 17.7.2) + Microsoft.TestPlatform.TestHost (17.9) + Microsoft.TestPlatform.ObjectModel (>= 17.9) Newtonsoft.Json (>= 13.0.1) NETStandard.Library (2.0.3) Microsoft.NETCore.Platforms (>= 1.1) Newtonsoft.Json (13.0.3) NHamcrest (3.4) - NuGet.Frameworks (6.7) - SharpYaml (2.1) - redirects: force + SharpYaml (2.1.1) - redirects: force System.Buffers (4.5.1) System.Collections.Immutable (7.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Diagnostics.DiagnosticSource (7.0.2) - System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Memory (4.5.5) System.Reflection.Emit (4.7) System.Reflection.Metadata (7.0.2) System.Collections.Immutable (>= 7.0) System.Runtime.CompilerServices.Unsafe (6.0) System.Text.Encodings.Web (7.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Text.Json (7.0.3) - System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Text.Encodings.Web (>= 7.0) xunit (2.5.3) xunit.analyzers (>= 1.4) diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs index d8e8aba0..c62c7ce4 100644 --- a/src/Common/AssemblyInfo.fs +++ b/src/Common/AssemblyInfo.fs @@ -5,13 +5,13 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "SwaggerProvider" let [] AssemblyProduct = "SwaggerProvider" let [] AssemblyDescription = "F# Type Provider for Swagger & Open API" - let [] AssemblyVersion = "2.0.1" - let [] AssemblyFileVersion = "2.0.1" + let [] AssemblyVersion = "2.1.0" + let [] AssemblyFileVersion = "2.1.0" diff --git a/src/SwaggerProvider.DesignTime/SwaggerProvider.DesignTime.fsproj b/src/SwaggerProvider.DesignTime/SwaggerProvider.DesignTime.fsproj index 6217e746..aa9a7d53 100644 --- a/src/SwaggerProvider.DesignTime/SwaggerProvider.DesignTime.fsproj +++ b/src/SwaggerProvider.DesignTime/SwaggerProvider.DesignTime.fsproj @@ -2,7 +2,7 @@ Library - netstandard2.0;net6.0 + netstandard2.0;net8.0 true true true @@ -58,4 +58,4 @@ - \ No newline at end of file + diff --git a/src/SwaggerProvider.Runtime/SwaggerProvider.Runtime.fsproj b/src/SwaggerProvider.Runtime/SwaggerProvider.Runtime.fsproj index 29b12b6f..8a68946f 100644 --- a/src/SwaggerProvider.Runtime/SwaggerProvider.Runtime.fsproj +++ b/src/SwaggerProvider.Runtime/SwaggerProvider.Runtime.fsproj @@ -29,7 +29,7 @@ - + diff --git a/src/SwaggerProvider.Runtime/paket.template b/src/SwaggerProvider.Runtime/paket.template index 4f743536..5ffb1ebd 100644 --- a/src/SwaggerProvider.Runtime/paket.template +++ b/src/SwaggerProvider.Runtime/paket.template @@ -15,7 +15,7 @@ licenseUrl requireLicenseAcceptance false copyright - Copyright 2015-2023 + Copyright 2015-2024 tags F# fsharp data typeprovider Swagger API REST OpenAPI summary @@ -25,7 +25,7 @@ description files bin/Release/netstandard2.0/SwaggerProvider.Runtime.* ==> lib/netstandard2.0 bin/Release/typeproviders/fsharp41/netstandard2.0/*.dll ==> typeproviders/fsharp41/netstandard2.0 - bin/Release/typeproviders/fsharp41/net6.0/*.dll ==> typeproviders/fsharp41/net6.0 + bin/Release/typeproviders/fsharp41/net8.0/*.dll ==> typeproviders/fsharp41/net8.0 references SwaggerProvider.Runtime.dll dependencies diff --git a/tests/SwaggerProvider.ProviderTests/SwaggerProvider.ProviderTests.fsproj b/tests/SwaggerProvider.ProviderTests/SwaggerProvider.ProviderTests.fsproj index 11963c5d..68caa5f8 100644 --- a/tests/SwaggerProvider.ProviderTests/SwaggerProvider.ProviderTests.fsproj +++ b/tests/SwaggerProvider.ProviderTests/SwaggerProvider.ProviderTests.fsproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 true true diff --git a/tests/SwaggerProvider.Tests/SwaggerProvider.Tests.fsproj b/tests/SwaggerProvider.Tests/SwaggerProvider.Tests.fsproj index e82fb95a..c95d0a34 100644 --- a/tests/SwaggerProvider.Tests/SwaggerProvider.Tests.fsproj +++ b/tests/SwaggerProvider.Tests/SwaggerProvider.Tests.fsproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 true diff --git a/tests/Swashbuckle.WebApi.Server/Swashbuckle.WebApi.Server.fsproj b/tests/Swashbuckle.WebApi.Server/Swashbuckle.WebApi.Server.fsproj index 74c76c55..1e3c0ecc 100644 --- a/tests/Swashbuckle.WebApi.Server/Swashbuckle.WebApi.Server.fsproj +++ b/tests/Swashbuckle.WebApi.Server/Swashbuckle.WebApi.Server.fsproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 true true Swashbuckle.WebApi.Server