Skip to content

Commit

Permalink
Fixed docs and bug in SwaggerProvider.fsx
Browse files Browse the repository at this point in the history
  • Loading branch information
sergey-tihon committed Dec 23, 2015
1 parent d1980e4 commit 46f31ed
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 14 deletions.
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#### 0.3.1 - December 23 2015
* Fixed docs and bug in `SwaggerProvider.fsx`

#### 0.3.0 - December 22 2015
* Added support of schemes in YAML format

Expand Down
4 changes: 1 addition & 3 deletions docs/content/index.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
// it to define helpers that you do not want to show in the documentation.
#I "../../bin"

[<Literal>]
let filePath = __SOURCE_DIRECTORY__ + "../../../tests/SwaggerProvider.Tests/Schemas/PetStore.Swagger.json"
(**
SwaggerProvider
======================
Expand All @@ -31,7 +29,7 @@ the optional argument Headers may also be used. Headers supplied here will be us
*)

#r "SwaggerProvider/SwaggerProvider.dll"
#load @"packages/SwaggerProvider/SwaggerProvider.fsx"
open SwaggerProvider

type PetStore = SwaggerProvider<"http://petstore.swagger.io/v2/swagger.json">
Expand Down
7 changes: 2 additions & 5 deletions docs/content/tutorial.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,14 @@
SwaggerProvider Tutorial
========================
Based on the script file "SwaggerProvider/tests/SwaggerProvider.Tests/script.fsx".
Change the paths to match your own directories, if you do not use the entire github repository.
Start by loading the swagger provider.
*)

#r @"../../src/SwaggerProvider/bin/Release/SwaggerProvider.dll"
#load @"packages/SwaggerProvider/SwaggerProvider.fsx"
open SwaggerProvider

[<Literal>]
let path = __SOURCE_DIRECTORY__ + "/Schemas/PetStore.Swagger.json"
let path = "http://petstore.swagger.io/v2/swagger.json"
type PetStore = SwaggerProvider<path, "Content-Type=application/json">

(**
Expand Down
6 changes: 3 additions & 3 deletions src/Common/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ open System.Reflection
[<assembly: AssemblyTitleAttribute("SwaggerProvider")>]
[<assembly: AssemblyProductAttribute("SwaggerProvider")>]
[<assembly: AssemblyDescriptionAttribute("F# Type Provider for Swagger")>]
[<assembly: AssemblyVersionAttribute("0.3.0")>]
[<assembly: AssemblyFileVersionAttribute("0.3.0")>]
[<assembly: AssemblyVersionAttribute("0.3.1")>]
[<assembly: AssemblyFileVersionAttribute("0.3.1")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] Version = "0.3.0"
let [<Literal>] Version = "0.3.1"
7 changes: 5 additions & 2 deletions src/SwaggerProvider/SwaggerProvider.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
#I "."
#I "lib/net40"

// Standard NuGet locations for Newtonsoft.Json
// Standard NuGet locations packages
#I "../Newtonsoft.Json.7.0.1/lib/net40"
#I "../YamlDotNet.3.7.0/lib/net35"

// Standard Paket locations for Newtonsoft.Json
// Standard Paket locations packages
#I "../Newtonsoft.Json/lib/net40"
#I "../YamlDotNet/lib/net35"

// Try various folders that people might like
#I "bin"
Expand All @@ -17,5 +19,6 @@

// Reference SwaggerProvider and Newtonsoft.Json
#r "Newtonsoft.Json.dll"
#r "YamlDotNet.dll"
#r "SwaggerProvider.dll"
#r "SwaggerProvider.Runtime.dll"
2 changes: 1 addition & 1 deletion src/SwaggerProvider/paket.template
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ files
SwaggerProvider.fsx ==> .
dependencies
Newtonsoft.Json >= 7.0.1
YamlDotNet
YamlDotNet >= 3.7

0 comments on commit 46f31ed

Please sign in to comment.