Merge pull request #168 from fsprojects/net5

.NET 6

Author: sergey-tihon

.config/dotnet-tools.json

@@ -3,22 +3,28 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "5.247.4",
+      "version": "7.1.4",
       "commands": [
         "paket"
       ]
     },
     "fake-cli": {
-      "version": "5.20.2",
+      "version": "5.22.0",
       "commands": [
         "fake"
       ]
     },
     "dotnet-serve": {
-      "version": "1.7.131",
+      "version": "1.10.93",
       "commands": [
         "dotnet-serve"
       ]
+    },
+    "fantomas-tool": {
+      "version": "5.0.0-alpha-002",
+      "commands": [
+        "fantomas"
+      ]
     }
   }
 }

.editorconfig

@@ -15,3 +15,10 @@ insert_final_newline = true
 [*.fs]
 indent_size = 4
 indent_style = space
+max_line_length=150
+fsharp_max_function_binding_width=10
+fsharp_max_infix_operator_expression=70
+fsharp_space_before_parameter=false
+fsharp_space_before_lowercase_invocation=false
+fsharp_multiline_block_brackets_on_same_column=true
+fsharp_ragnarok=true

.github/ISSUE_TEMPLATE.md

@@ -6,23 +6,28 @@ Please provide a succinct description of your issue.
 
 Please provide the steps required to reproduce the problem
 
-1. Step A
+1. Type provider type definition with parameters
 
-2. Step B
+2. Sample schema or relevant schema part
 
 ### Expected behavior
 
 Please provide a description of the behavior you expect.
 
 ### Actual behavior
 
-Please provide a description of the actual behavior you observe. 
+Please provide a description of the actual behavior you observe.
 
 ### Known workarounds
 
 Please provide a description of any known workarounds.
 
-### Related information 
+### Affected Type Providers
+
+- [ ] SwaggerClientProvider
+- [ ] OpenApiClientProvider
+
+### Related information
 
 * Operating system
 * Branch

.github/workflows/dotnetcore.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
     - master
+    - net5
 
 jobs:
   build:
@@ -15,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        dotnet: [3.1.417]
+        dotnet: [6.0.201]
     runs-on: ${{ matrix.os }}
 
     steps:

.gitignore

@@ -339,3 +339,5 @@ ASALocalRun/
 
 # BeatPulse healthcheck temp database
 healthchecksdb
+
+.ionide

build.fsx

@@ -1,27 +1,24 @@
 #r @"paket:
 source https://nuget.org/api/v2
-framework netstandard2.0
+framework net6.0
+nuget FSharp.Core 4.7.2
 nuget Fake.Core.Target
 nuget Fake.Core.Process
-nuget Fake.Core.ReleaseNotes 
+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.Testing.Expecto 
-nuget Fake.DotNet.FSFormatting 
+nuget Fake.DotNet.Testing.Expecto
+nuget Fake.DotNet.FSFormatting
 nuget Fake.Tools.Git
 nuget Fake.Api.GitHub //"
-
-#if !FAKE
 #load "./.fake/build.fsx/intellisense.fsx"
-#r "netstandard" // Temp fix for https://github.com/fsharp/FAKE/issues/1985
-#endif
 
-open Fake 
+open Fake
 open Fake.Core.TargetOperators
-open Fake.Core 
+open Fake.Core
 open Fake.IO
 open Fake.IO.FileSystemOperators
 open Fake.IO.Globbing.Operators
@@ -70,7 +67,7 @@ Target.create "AssemblyInfo" (fun _ ->
 Target.create "Clean" (fun _ ->
     !! "**/**/bin/" |> Shell.cleanDirs
     //!! "**/**/obj/" |> Shell.cleanDirs
-    
+
     Shell.cleanDirs ["bin"; "temp"]
     try File.Delete("swaggerlog") with | _ -> ()
 )
@@ -90,11 +87,11 @@ let webApiInputStream = StreamRef.Empty
 Target.create "StartServer" (fun _ ->
     Target.activateFinal "StopServer"
 
-    CreateProcess.fromRawCommandLine "dotnet" "tests/Swashbuckle.WebApi.Server/bin/Release/netcoreapp3.1/Swashbuckle.WebApi.Server.dll"
+    CreateProcess.fromRawCommandLine "dotnet" "tests/Swashbuckle.WebApi.Server/bin/Release/net6.0/Swashbuckle.WebApi.Server.dll"
     |> CreateProcess.withStandardInput (CreatePipe webApiInputStream)
     |> Proc.start
     |> ignore
-    
+
     // We need delay to guarantee that server is bootstrapped
     System.Threading.Thread.Sleep(2000)
 )
@@ -118,7 +115,7 @@ Target.create "BuildTests" (fun _ ->
 let runTests assembly =
     [Path.Combine(__SOURCE_DIRECTORY__, assembly)]
     |> Testing.Expecto.run (fun p ->
-        { p with 
+        { p with
             WorkingDirectory = __SOURCE_DIRECTORY__
             FailOnFocusedTests = true
             PrintVersion = true
@@ -128,11 +125,11 @@ let runTests assembly =
         })
 
 Target.create "RunUnitTests" (fun _ ->
-    runTests "tests/SwaggerProvider.Tests/bin/Release/netcoreapp3.1/SwaggerProvider.Tests.dll"
+    runTests "tests/SwaggerProvider.Tests/bin/Release/net6.0/SwaggerProvider.Tests.dll"
 )
 
 Target.create "RunIntegrationTests" (fun _ ->
-    runTests "tests/SwaggerProvider.ProviderTests/bin/Release/netcoreapp3.1/SwaggerProvider.ProviderTests.dll"
+    runTests "tests/SwaggerProvider.ProviderTests/bin/Release/net6.0/SwaggerProvider.ProviderTests.dll"
 )
 
 Target.create "RunTests" ignore
@@ -209,7 +206,7 @@ Target.create "BrowseDocs" (fun _ ->
 
 Target.create "Release" (fun _ ->
     // not fully converted from  FAKE 4
-    
+
     // StageAll ""
     // Git.Commit.Commit "" (sprintf "Bump version to %s" release.NugetVersion)
     // Branches.push ""