Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
a2b6154
Draft integration of Microsoft.OpenApi.Readers
sergey-tihon Mar 3, 2019
7a662b2
migration to fake 5
sergey-tihon Mar 4, 2019
c791b4a
env config
sergey-tihon Mar 4, 2019
81e27ba
xenial distro for travis
sergey-tihon Mar 5, 2019
8a19a4a
Added set of simple tests
sergey-tihon Mar 5, 2019
2745950
cleanup of APIsGuru usage
sergey-tihon Mar 5, 2019
41f08af
Azure pipeline config
sergey-tihon Mar 5, 2019
c09cbc1
Do not dispose on Mac/Linux - System.MissingMethodException: void Sys…
sergey-tihon Mar 5, 2019
87bfb98
publish test results in NUnit format
sergey-tihon Mar 5, 2019
64b100f
better test results report
sergey-tihon Mar 6, 2019
0bfa3e8
new test cases with schema parse errors validation
sergey-tihon Mar 7, 2019
978643b
bye travis and appveyor
sergey-tihon Mar 7, 2019
e9ea063
Fixes for operations generation
sergey-tihon Mar 24, 2019
37358d1
build infrastructure cleanup
sergey-tihon Jun 2, 2019
371e6d8
pipeline fix
sergey-tihon Jun 2, 2019
5c74c62
pipeline fix
sergey-tihon Jun 2, 2019
71dad88
Merge SwaggerProvider (V2) back
sergey-tihon Sep 13, 2019
b6372e5
SwaggerProvider rename and build fixes
sergey-tihon Sep 14, 2019
ef6062b
Server with test API migrated to AspNetCore WebApi
sergey-tihon Sep 14, 2019
85ce808
Uses stdin to signal when server should stop
sergey-tihon Sep 15, 2019
ed03b4a
small fixes
sergey-tihon Sep 15, 2019
cee300f
Fix tests for generated TP v2
sergey-tihon Sep 15, 2019
329ed3f
tests restored
sergey-tihon Sep 15, 2019
8253dbf
quick fix for build script
sergey-tihon Sep 15, 2019
4c2069b
moved from NSwag to Swashbuckle
sergey-tihon Sep 17, 2019
c022c3e
Merge commit 'f3e180d9d6fc589030c46f43c9bf975f529cf8d9' into openapi
sergey-tihon Oct 27, 2019
0a7ff8d
Merge branch 'dev' into openapi
sergey-tihon Oct 27, 2019
6ffb415
.NET Core 3.0 and local tools
sergey-tihon Oct 27, 2019
f677a15
target .NET Core 3.0
sergey-tihon Oct 27, 2019
7a5dc81
Fixed API server
sergey-tihon Oct 27, 2019
bf4a926
some test fixes
sergey-tihon Oct 27, 2019
2250ba3
tests projects migrated to netcore3
sergey-tihon Oct 27, 2019
3a7dd51
some test fixes
sergey-tihon Oct 27, 2019
4c13e39
test fixes
sergey-tihon Oct 27, 2019
c6c7ac0
Added support of F# type serialization (List) using FSharp.SystemText…
sergey-tihon Oct 27, 2019
1f9411e
Revert back to JSON.NET serializer
sergey-tihon Oct 27, 2019
89d9677
ignore tests
sergey-tihon Oct 28, 2019
4e17686
build script fix =(
sergey-tihon Oct 28, 2019
5473177
tests for OpenApiClientProvider
sergey-tihon Oct 28, 2019
68f67b1
Repro test for #126
sergey-tihon Oct 29, 2019
14bb4d6
code cleanup
sergey-tihon Oct 29, 2019
4b32616
Fixe payload processing for OpenAPI provided methods that require body
sergey-tihon Oct 29, 2019
34f6bbd
linux fix
sergey-tihon Oct 29, 2019
0664a4d
uncomment test
sergey-tihon Oct 29, 2019
db98a8d
Revert "uncomment test"
sergey-tihon Oct 29, 2019
f837170
Fix for null refs in #126
sergey-tihon Oct 30, 2019
c19f9b7
Proper OpenApiClientBase interface
sergey-tihon Oct 30, 2019
45f94c6
OpenApiClientBase renamed and simplified
sergey-tihon Oct 31, 2019
3b512cc
Query Url builder using HttpUtility
sergey-tihon Oct 31, 2019
2a79d91
test
sergey-tihon Oct 31, 2019
789bb5c
use latest OS images
sergey-tihon Oct 31, 2019
cca9c06
test mono again
sergey-tihon Oct 31, 2019
8a7b770
Can HttpClientFactory help?
sergey-tihon Nov 1, 2019
741cbed
Revert "Can HttpClientFactory help?"
sergey-tihon Nov 1, 2019
9d31d22
Something wrong with DelegatingHandler on Linux
sergey-tihon Nov 1, 2019
3ccaebf
byte[] as query param (one of impl)
sergey-tihon Nov 1, 2019
913c176
do not let null in query params
sergey-tihon Nov 1, 2019
76af018
Naive implementation of form payload
sergey-tihon Nov 1, 2019
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
18 changes: 18 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "5.226.0",
"commands": [
"paket"
]
},
"fake-cli": {
"version": "5.18.2",
"commands": [
"fake"
]
}
}
}
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,16 @@ nuget/*.nupkg
release.cmd
release.sh
localpackages/
paket-files
.paket/load/
*.orig
docs/content/license.md
docs/content/release-notes.md
.fake/
.idea/
.vs/
.ionide/
*.svclog
TestResult.xml
TestResult.xml

# Paket dependency manager
.paket/
paket-files/
481 changes: 0 additions & 481 deletions .paket/Paket.Restore.targets

This file was deleted.

Binary file removed .paket/paket.exe
Binary file not shown.
36 changes: 0 additions & 36 deletions .paket/paket.targets

This file was deleted.

17 changes: 0 additions & 17 deletions .travis.yml

This file was deleted.

3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

This SwaggerProvider can be used to access RESTful API generated using [Swagger.io](http://swagger.io)

[![Travis build status](https://travis-ci.org/fsprojects/SwaggerProvider.svg)](https://travis-ci.org/fsprojects/SwaggerProvider)
[![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/tcahkn4b1tayh39u?svg=true)](https://ci.appveyor.com/project/sergey-tihon/swaggerprovider)
[![Build Status](https://sergeytihon.visualstudio.com/SwaggerProvider/_apis/build/status/fsprojects.SwaggerProvider?branchName=master)](https://sergeytihon.visualstudio.com/SwaggerProvider/_build/latest?definitionId=2&branchName=master)
[![Tested on APIs.guru](https://api.apis.guru/badges/tested_on.svg)](https://APIs.guru)

Documentation: http://fsprojects.github.io/SwaggerProvider/
Expand Down
5 changes: 4 additions & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#### 0.10.0-beta06 - October 27, 2019
#### 0.10.0-beta07 - November 1, 2019
- Migration to new Type Provider SDK [#88](https://github.com/fsprojects/SwaggerProvider/pull/88)
- SwaggerParser moved to runtime assembly (and exposed as API to library users) - [#90](https://github.com/fsprojects/SwaggerProvider/pull/90)
- Added runtime dependency on YamlDotNet
Expand All @@ -13,6 +13,9 @@
- Do not reference design-time assembly when install from nuget [#104](https://github.com/fsprojects/SwaggerProvider/pull/104)
- Migration to `HttpClient`-based communication [#105](https://github.com/fsprojects/SwaggerProvider/pull/105)
- TP SDK update - [#125](https://github.com/fsprojects/SwaggerProvider/pull/125)
- Fixed null reference in query params [#126](https://github.com/fsprojects/SwaggerProvider/issues/126)
- HttpClient is used for all calls [#100](https://github.com/fsprojects/SwaggerProvider/issues/100)
- OpenApiClientProvider [#117](https://github.com/fsprojects/SwaggerProvider/pull/117)

#### 0.8.2 - January 19, 2017
* Fix probing locations [#97](https://github.com/fsprojects/SwaggerProvider/pull/97)
Expand Down
16 changes: 12 additions & 4 deletions SwaggerProvider.TestsAndDocs.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2010

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28621.142
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{63297B98-5CED-492C-A5B7-A5B4F73CF142}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -26,7 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.ProviderTests", "tests\SwaggerProvider.ProviderTests\SwaggerProvider.ProviderTests.fsproj", "{F26DFAA6-CB19-46EB-9FBD-F4A4DC46C3F5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwaggerProvider.ProviderTests.CSharp", "tests\SwaggerProvider.ProviderTests.CSharp\SwaggerProvider.ProviderTests.CSharp.csproj", "{2950E2AC-A436-452A-9524-04BE7C82FA05}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SwaggerProvider.ProviderTests.CSharp", "tests\SwaggerProvider.ProviderTests.CSharp\SwaggerProvider.ProviderTests.CSharp.csproj", "{2950E2AC-A436-452A-9524-04BE7C82FA05}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1D6B2F7D-FC4A-499B-B3D1-42A09F42AAAF}"
EndProject
Expand All @@ -48,6 +49,10 @@ Global
{2950E2AC-A436-452A-9524-04BE7C82FA05}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2950E2AC-A436-452A-9524-04BE7C82FA05}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2950E2AC-A436-452A-9524-04BE7C82FA05}.Release|Any CPU.Build.0 = Release|Any CPU
{DC3E73AF-5B15-45AD-B3C5-B3707DCB0F81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DC3E73AF-5B15-45AD-B3C5-B3707DCB0F81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DC3E73AF-5B15-45AD-B3C5-B3707DCB0F81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DC3E73AF-5B15-45AD-B3C5-B3707DCB0F81}.Release|Any CPU.Build.0 = Release|Any CPU
{0598B4A4-3017-493E-8A64-293EAB4CFB95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0598B4A4-3017-493E-8A64-293EAB4CFB95}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0598B4A4-3017-493E-8A64-293EAB4CFB95}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -64,4 +69,7 @@ Global
{DC3E73AF-5B15-45AD-B3C5-B3707DCB0F81} = {1D6B2F7D-FC4A-499B-B3D1-42A09F42AAAF}
{0598B4A4-3017-493E-8A64-293EAB4CFB95} = {1D6B2F7D-FC4A-499B-B3D1-42A09F42AAAF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F2D1B446-5EE2-4DDF-83A6-831E733173F4}
EndGlobalSection
EndGlobal
35 changes: 19 additions & 16 deletions SwaggerProvider.sln
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.28621.142
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.Runtime", "src\SwaggerProvider.Runtime\SwaggerProvider.Runtime.fsproj", "{AD0B2860-9373-4BD9-906D-6D19F2F7DEE9}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.Tests", "tests\SwaggerProvider.Tests\SwaggerProvider.Tests.fsproj", "{524FCCB2-CEA4-402B-BF6E-EE659966C853}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{04303D28-4592-430A-B4A6-892105A95B22}"
ProjectSection(SolutionItems) = preProject
paket.dependencies = paket.dependencies
Expand All @@ -24,10 +22,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution
RELEASE_NOTES.md = RELEASE_NOTES.md
EndProjectSection
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Swashbuckle.OWIN.Server", "tests\Swashbuckle.OWIN.Server\Swashbuckle.OWIN.Server.fsproj", "{C2CD65DA-37A4-4A58-B450-C2AA7C8E8D2F}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.DesignTime", "src\SwaggerProvider.DesignTime\SwaggerProvider.DesignTime.fsproj", "{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.Tests", "tests\SwaggerProvider.Tests\SwaggerProvider.Tests.fsproj", "{358F1AB1-0F38-4D7D-B022-24F4E9EB5673}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Swashbuckle.WebApi.Server", "tests\Swashbuckle.WebApi.Server\Swashbuckle.WebApi.Server.fsproj", "{112C445E-959B-4193-836A-78F36FB9F36E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -38,26 +38,29 @@ Global
{AD0B2860-9373-4BD9-906D-6D19F2F7DEE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AD0B2860-9373-4BD9-906D-6D19F2F7DEE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AD0B2860-9373-4BD9-906D-6D19F2F7DEE9}.Release|Any CPU.Build.0 = Release|Any CPU
{524FCCB2-CEA4-402B-BF6E-EE659966C853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{524FCCB2-CEA4-402B-BF6E-EE659966C853}.Debug|Any CPU.Build.0 = Debug|Any CPU
{524FCCB2-CEA4-402B-BF6E-EE659966C853}.Release|Any CPU.ActiveCfg = Release|Any CPU
{524FCCB2-CEA4-402B-BF6E-EE659966C853}.Release|Any CPU.Build.0 = Release|Any CPU
{C2CD65DA-37A4-4A58-B450-C2AA7C8E8D2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C2CD65DA-37A4-4A58-B450-C2AA7C8E8D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2CD65DA-37A4-4A58-B450-C2AA7C8E8D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C2CD65DA-37A4-4A58-B450-C2AA7C8E8D2F}.Release|Any CPU.Build.0 = Release|Any CPU
{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D}.Release|Any CPU.Build.0 = Release|Any CPU
{358F1AB1-0F38-4D7D-B022-24F4E9EB5673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{358F1AB1-0F38-4D7D-B022-24F4E9EB5673}.Debug|Any CPU.Build.0 = Debug|Any CPU
{358F1AB1-0F38-4D7D-B022-24F4E9EB5673}.Release|Any CPU.ActiveCfg = Release|Any CPU
{358F1AB1-0F38-4D7D-B022-24F4E9EB5673}.Release|Any CPU.Build.0 = Release|Any CPU
{112C445E-959B-4193-836A-78F36FB9F36E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{112C445E-959B-4193-836A-78F36FB9F36E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{112C445E-959B-4193-836A-78F36FB9F36E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{112C445E-959B-4193-836A-78F36FB9F36E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{AD0B2860-9373-4BD9-906D-6D19F2F7DEE9} = {727FB2BE-A8C5-4537-9C87-7083346E2865}
{524FCCB2-CEA4-402B-BF6E-EE659966C853} = {3A51AC71-D3EF-46DE-A7F0-E2B46370C6EE}
{C2CD65DA-37A4-4A58-B450-C2AA7C8E8D2F} = {3A51AC71-D3EF-46DE-A7F0-E2B46370C6EE}
{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D} = {727FB2BE-A8C5-4537-9C87-7083346E2865}
{358F1AB1-0F38-4D7D-B022-24F4E9EB5673} = {3A51AC71-D3EF-46DE-A7F0-E2B46370C6EE}
{112C445E-959B-4193-836A-78F36FB9F36E} = {3A51AC71-D3EF-46DE-A7F0-E2B46370C6EE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D1661E43-518D-450C-BB1F-43C008B97BB6}
EndGlobalSection
EndGlobal
11 changes: 0 additions & 11 deletions appveyor.yml

This file was deleted.

31 changes: 31 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
strategy:
matrix:
linux:
imageName: 'ubuntu-latest'
mac:
imageName: 'macOS-latest'
windows:
imageName: 'windows-latest'

pool:
vmImage: $(imageName)

steps:
- task: UseDotNet@2
displayName: 'Install .NET Core SDK (based on global.json)'
inputs:
packageType: 'sdk'
useGlobalJson: true
installationPath: $(Agent.ToolsDirectory)/dotnet
- bash: ./build.sh
condition: or( eq( variables['Agent.OS'], 'Darwin' ), eq( variables['Agent.OS'], 'Linux' ))
displayName: 'build.sh'
- powershell: .\build.cmd
condition: eq( variables['Agent.OS'], 'Windows_NT' )
displayName: 'build.cmd'
- task: PublishTestResults@2
inputs:
testResultsFormat: 'NUnit'
testResultsFiles: 'bin/TestResults-*.xml'
#searchFolder: '$(System.DefaultWorkingDirectory)' # Optional
mergeTestResults: true
11 changes: 3 additions & 8 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
@echo off
cls

.paket\paket.exe restore
if errorlevel 1 (
exit /b %errorlevel%
)

packages\build\FAKE\tools\FAKE.exe build.fsx %*
dotnet tool restore
dotnet paket restore
dotnet fake run build.fsx %*
Loading