From a60dbb87d2d42cf3102a141d2edbd660493a9b60 Mon Sep 17 00:00:00 2001 From: tpetricek Date: Tue, 9 Jun 2015 11:29:31 -0400 Subject: [PATCH] Fix docs generation and eliminate warnings There ware two build warning - this PR fixes those: - One was incomplete pattern matching in Type Provider starter pack (I fixed it there) - Another was FSharp.Core mismatch (FsCheck now uses 4.3.1.0), updated version in tests --- docs/tools/generate.fsx | 10 +--------- paket.lock | 6 +++--- tests/Test.RProvider/Test.RProvider.fsproj | 2 +- tests/Test.RProvider/app.config | 4 ++++ 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/docs/tools/generate.fsx b/docs/tools/generate.fsx index 5a732abd..0c9a6d9e 100644 --- a/docs/tools/generate.fsx +++ b/docs/tools/generate.fsx @@ -20,16 +20,8 @@ let info = // For typical project, no changes are needed below // -------------------------------------------------------------------------------------- -#I "../../packages/FSharp.Compiler.Service/lib/net40" -#I "../../packages/FSharp.Formatting/lib/net40" -#I "../../packages/RazorEngine/lib/net40/" -#r "../../packages/Microsoft.AspNet.Razor/lib/net40/System.Web.Razor.dll" +#load "../../packages/FSharp.Formatting/FSharp.Formatting.fsx" #r "../../packages/FAKE/tools/FakeLib.dll" -#r "RazorEngine.dll" -#r "FSharp.Literate.dll" -#r "FSharp.Markdown.dll" -#r "FSharp.CodeFormat.dll" -#r "FSharp.MetadataFormat.dll" open Fake open System.IO open Fake.FileHelper diff --git a/paket.lock b/paket.lock index f8e0c9bb..737987de 100644 --- a/paket.lock +++ b/paket.lock @@ -28,6 +28,6 @@ NUGET GITHUB remote: fsprojects/FSharp.TypeProviders.StarterPack specs: - src/DebugProvidedTypes.fs (70080986a4226e8218af09386cceb42e7a0ff00e) - src/ProvidedTypes.fs (70080986a4226e8218af09386cceb42e7a0ff00e) - src/ProvidedTypes.fsi (70080986a4226e8218af09386cceb42e7a0ff00e) \ No newline at end of file + src/DebugProvidedTypes.fs (c098da43ef99c9f15f7ed7ec4726dace9b95ad06) + src/ProvidedTypes.fs (c098da43ef99c9f15f7ed7ec4726dace9b95ad06) + src/ProvidedTypes.fsi (c098da43ef99c9f15f7ed7ec4726dace9b95ad06) \ No newline at end of file diff --git a/tests/Test.RProvider/Test.RProvider.fsproj b/tests/Test.RProvider/Test.RProvider.fsproj index 4adc188d..c4a4ddfe 100644 --- a/tests/Test.RProvider/Test.RProvider.fsproj +++ b/tests/Test.RProvider/Test.RProvider.fsproj @@ -12,7 +12,7 @@ v4.5 Test.RProvider ..\..\ - 4.3.0.0 + 4.3.1.0 true diff --git a/tests/Test.RProvider/app.config b/tests/Test.RProvider/app.config index f581e60e..cff6dbc5 100644 --- a/tests/Test.RProvider/app.config +++ b/tests/Test.RProvider/app.config @@ -14,6 +14,10 @@ + + + + \ No newline at end of file