From 46f31ed0e7eb39f1ea2cee967e327f904ce1e10d Mon Sep 17 00:00:00 2001 From: Sergey Tihon Date: Wed, 23 Dec 2015 15:20:13 +0300 Subject: [PATCH] Fixed docs and bug in `SwaggerProvider.fsx` --- RELEASE_NOTES.md | 3 +++ docs/content/index.fsx | 4 +--- docs/content/tutorial.fsx | 7 ++----- src/Common/AssemblyInfo.fs | 6 +++--- src/SwaggerProvider/SwaggerProvider.fsx | 7 +++++-- src/SwaggerProvider/paket.template | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 05e79df0..dcc0a7ee 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -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 diff --git a/docs/content/index.fsx b/docs/content/index.fsx index 8e7e63c1..41ae2f9f 100644 --- a/docs/content/index.fsx +++ b/docs/content/index.fsx @@ -3,8 +3,6 @@ // it to define helpers that you do not want to show in the documentation. #I "../../bin" -[] -let filePath = __SOURCE_DIRECTORY__ + "../../../tests/SwaggerProvider.Tests/Schemas/PetStore.Swagger.json" (** SwaggerProvider ====================== @@ -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"> diff --git a/docs/content/tutorial.fsx b/docs/content/tutorial.fsx index 9044372d..425ff51b 100644 --- a/docs/content/tutorial.fsx +++ b/docs/content/tutorial.fsx @@ -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 [] -let path = __SOURCE_DIRECTORY__ + "/Schemas/PetStore.Swagger.json" +let path = "http://petstore.swagger.io/v2/swagger.json" type PetStore = SwaggerProvider (** diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs index 9e3aad4e..ee256f1b 100644 --- a/src/Common/AssemblyInfo.fs +++ b/src/Common/AssemblyInfo.fs @@ -4,9 +4,9 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "0.3.0" + let [] Version = "0.3.1" diff --git a/src/SwaggerProvider/SwaggerProvider.fsx b/src/SwaggerProvider/SwaggerProvider.fsx index 2f318874..fb52f036 100644 --- a/src/SwaggerProvider/SwaggerProvider.fsx +++ b/src/SwaggerProvider/SwaggerProvider.fsx @@ -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" @@ -17,5 +19,6 @@ // Reference SwaggerProvider and Newtonsoft.Json #r "Newtonsoft.Json.dll" +#r "YamlDotNet.dll" #r "SwaggerProvider.dll" #r "SwaggerProvider.Runtime.dll" diff --git a/src/SwaggerProvider/paket.template b/src/SwaggerProvider/paket.template index 519ead0a..e4193c5f 100644 --- a/src/SwaggerProvider/paket.template +++ b/src/SwaggerProvider/paket.template @@ -24,4 +24,4 @@ files SwaggerProvider.fsx ==> . dependencies Newtonsoft.Json >= 7.0.1 - YamlDotNet \ No newline at end of file + YamlDotNet >= 3.7 \ No newline at end of file