Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
cd57ab2
Build with .NET 5
sergey-tihon Nov 28, 2020
e8a5655
Merge branch 'master' into net5
sergey-tihon Dec 22, 2020
195a73b
dependencies update
sergey-tihon Dec 22, 2020
68146c3
WIP migrating to System.Text.Json
xperiandri Jan 7, 2021
f57aedf
dependencies update
sergey-tihon Jan 17, 2021
7c0b3da
drop `net46` support
sergey-tihon Jan 17, 2021
4521376
Merge branch 'net5' into 'system_text_json'
sergey-tihon Jan 17, 2021
1dbc19c
ci for pr to net5
sergey-tihon Jan 17, 2021
ed812a1
naive fix for provided .ctors
sergey-tihon Jan 17, 2021
ac94419
uses JsonFSharpConverter on the server
sergey-tihon Jan 17, 2021
fb12c65
fix for byte[] serialization =( https://stackoverflow.com/questions/6…
sergey-tihon Jan 17, 2021
cc1869a
removed dependency on System.Net.Http.Json
sergey-tihon Jan 18, 2021
88c7b3f
default config for JsonFSharpConverter
sergey-tihon Jan 19, 2021
8459021
Fixed generation of constructors with optional parameters
xperiandri Jan 19, 2021
1046318
Added ability to run Expecto tests from Visual Studio
xperiandri Jan 19, 2021
4e002c9
Removed unnecessary reference from tests
xperiandri Jan 19, 2021
06654ed
Fixed client constructor parameters
xperiandri Jan 20, 2021
d30b8ca
enable v2 & v3 schema generation - https://github.com/domaindrivend…
sergey-tihon Jan 21, 2021
b39696f
explicit error on args mismatch
sergey-tihon Jan 21, 2021
f4f8838
enable SwaggerProvider tests
sergey-tihon Jan 21, 2021
61e3306
fix SwaggerProvider tests
sergey-tihon Jan 22, 2021
bdfbd94
Merge pull request #176 from xperiandri/system_text_json
sergey-tihon Jan 29, 2021
03746ed
release notes and beta release
sergey-tihon Jan 30, 2021
d463364
fix: package dependencies
sergey-tihon Jan 31, 2021
43c1b80
update for issue template
sergey-tihon Jan 31, 2021
0296318
typo fixed
sergey-tihon Jan 31, 2021
7380900
dependencies update
sergey-tihon Mar 3, 2021
ec9e0a5
dependencies update
sergey-tihon Mar 20, 2021
a06c0c0
fix for #181
sergey-tihon Mar 20, 2021
5da9bbc
feat: dependencies update
sergey-tihon Jun 12, 2021
2b577c5
feat: no optional param use in provided ctors
sergey-tihon Jun 19, 2021
e538ac4
feat: bump dependencies
sergey-tihon Jun 19, 2021
80836a4
Merge branch 'master' into net5
sergey-tihon Apr 9, 2022
e7edfb5
feat: target net6
sergey-tihon Apr 9, 2022
ad0219b
feat: dependencies update, fake and build fix
sergey-tihon Apr 9, 2022
80c0b37
fix: update copyright :)
sergey-tihon Apr 9, 2022
126bd46
dependencies update and v2 dictionary schema parse fix
sergey-tihon Apr 17, 2022
6105f8e
fix: do not parse slack response
sergey-tihon Apr 17, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
}
}
7 changes: 7 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 9 additions & 4 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
pull_request:
branches:
- master
- net5

jobs:
build:
Expand All @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -339,3 +339,5 @@ ASALocalRun/

# BeatPulse healthcheck temp database
healthchecksdb

.ionide
31 changes: 14 additions & 17 deletions build.fsx
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 | _ -> ()
)
Expand All @@ -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)
)
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 ""
Expand Down
Loading