diff --git a/.gitignore b/.gitignore index 8b5541931..87cfc8ad5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.suo .fake/ +.vs/ bin/ obj/ paket-files/ diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..019846854 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,9 @@ +init: + - git config --global core.autocrlf input +build_script: + - cmd: build.cmd +test: off +version: 0.0.1.{build} +artifacts: + - path: bin + name: bin diff --git a/paket.lock b/paket.lock index 08a5a850a..1eb1ec50e 100644 --- a/paket.lock +++ b/paket.lock @@ -2,7 +2,7 @@ NUGET remote: http://nuget.org/api/v2 specs: CommandLineParser (1.9.71) - FAKE (4.3.4) + FAKE (4.4.2) FSharp.Compiler.Service (0.0.90) FSharpVSPowerTools.Core (1.9.0) FSharp.Compiler.Service (>= 0.0.90) @@ -17,4 +17,4 @@ NUGET GITHUB remote: matthid/Yaaf.FSharp.Scripting specs: - src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs (1823a75ec30e022c1a086b32c773d5a6ddd0db00) \ No newline at end of file + src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs (25170f50dabf631b6ec319d12c78b5276370f418) \ No newline at end of file diff --git a/tests/FSharp.MetadataFormat.Tests/App.config b/tests/FSharp.MetadataFormat.Tests/App.config index 4e1805713..f2b38ec2a 100644 --- a/tests/FSharp.MetadataFormat.Tests/App.config +++ b/tests/FSharp.MetadataFormat.Tests/App.config @@ -37,7 +37,7 @@ - + diff --git a/tests/FSharp.MetadataFormat.Tests/Tests.fs b/tests/FSharp.MetadataFormat.Tests/Tests.fs index 23f0fdb0f..002f28fff 100644 --- a/tests/FSharp.MetadataFormat.Tests/Tests.fs +++ b/tests/FSharp.MetadataFormat.Tests/Tests.fs @@ -432,8 +432,24 @@ let ``MetadataFormat omit works without markdown``() = let binDir = root @@ "files/FsLib/bin/Debug" let library = binDir @@ "FsLib2.dll" let output = getOutputDir() - MetadataFormat.Generate([library], output, layoutRoots, info, libDirs = [binDir; root @@ "../../lib"], markDownComments = false) + MetadataFormat.Generate + ([library], output, layoutRoots, info, libDirs = [binDir; root @@ "../../lib"], + markDownComments = false) let fileNames = Directory.GetFiles(output) let files = dict [ for f in fileNames -> Path.GetFileName(f), File.ReadAllText(f) ] files.ContainsKey "fslib-test_omit.html" |> should equal false + +[] +let ``MetadataFormat test FsLib1``() = + let binDir = root @@ "files/FsLib/bin/Debug" + let library = binDir @@ "FsLib1.dll" + let output = getOutputDir() + MetadataFormat.Generate + ([ library ], output, layoutRoots, info, libDirs = [ binDir; root @@ "../../lib" ], + markDownComments = false) + let fileNames = Directory.GetFiles(output) + + let files = + dict [ for f in fileNames -> Path.GetFileName(f), File.ReadAllText(f) ] + files.ContainsKey "fslib-test_omit.html" |> should equal false \ No newline at end of file diff --git a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj index 13a9ffda1..b0e341840 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj @@ -8,9 +8,10 @@ Library FsLib FsLib2 - v4.0 - 4.3.0.0 + v4.6 + 4.4.0.0 FsLib1 + true diff --git a/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library1.fs b/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library1.fs index 3ac51294d..dde61b43c 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library1.fs +++ b/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library1.fs @@ -1,7 +1,7 @@ namespace FsLib /// Union sample -type Union = +type Union = /// Hello of int | Hello of int /// World of string and int @@ -12,7 +12,7 @@ type Union = #endif /// Record sample -type Record = +type Record = { /// This is name Name : string /// This is age @@ -20,3 +20,21 @@ type Record = /// Additional members member x.Foo = 0 member x.Foo2() = 0 + +type ITestInterface = + abstract Test : unit -> RazorEngine.Templating.IRazorEngineService + abstract FixScript : string -> string + +/// Issue 201 docs +[] +module Test_Issue201 = + /// Extension docs + [] + let MyExtension (o : ITestInterface) = + ignore <| o.Test().GetKey(null) + +[] +module Test_Issue201Extensions = + type ITestInterface with + member x.MyExtension() = + Test_Issue201.MyExtension x \ No newline at end of file diff --git a/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library2.fs b/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library2.fs index c967f85e9..b47317311 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library2.fs +++ b/tests/FSharp.MetadataFormat.Tests/files/FsLib/Library2.fs @@ -45,17 +45,6 @@ type ITestInterface = /// Issue 201 docs [] module Test_Issue201 = - let internal notImpl () = - (raise <| System.NotSupportedException("Migration is not supported by this type, please implement GetMigrator.")) - : 'a - /// Test FixScript_MSSQL Documentation - let FixScript_MSSQL (script:string) = script - /// Test FixScript_MySQL Documentation - let FixScript_MySQL (script:string) = - script.Replace( - "from information_schema.columns where", - "FROM information_schema.columns WHERE table_schema = SCHEMA() AND") - /// Extension docs [] let MyExtension (o : ITestInterface) =