diff --git a/.gitignore b/.gitignore index 87cfc8ad5..57687b5ce 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ misc/literate/output/content/ *.sln.DotSettings.user *.userprefs *.bak -.paket/paket.exe release.cmd *.orig *.aux diff --git a/.paket/paket.exe b/.paket/paket.exe new file mode 100644 index 000000000..117ede660 Binary files /dev/null and b/.paket/paket.exe differ diff --git a/.paket/paket.exe.config b/.paket/paket.exe.config new file mode 100644 index 000000000..2fc733f95 --- /dev/null +++ b/.paket/paket.exe.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/FSharp.Formatting.sln b/FSharp.Formatting.sln index d9bf85df6..3a653244f 100644 --- a/FSharp.Formatting.sln +++ b/FSharp.Formatting.sln @@ -1,15 +1,22 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.9 MinimumVisualStudioVersion = 12.0.31101.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{194BD478-0DB5-44F3-A6C2-1FC75D3F3294}" ProjectSection(SolutionItems) = preProject + .gitignore = .gitignore + .travis.yml = .travis.yml + appveyor.yml = appveyor.yml + build.cmd = build.cmd build.fsx = build.fsx + build.sh = build.sh nuget\FSharp.Formatting.CommandTool.nuspec = nuget\FSharp.Formatting.CommandTool.nuspec packages\FSharp.Formatting\FSharp.Formatting.fsx = packages\FSharp.Formatting\FSharp.Formatting.fsx nuget\FSharp.Formatting.nuspec = nuget\FSharp.Formatting.nuspec paket.dependencies = paket.dependencies + paket.lock = paket.lock + README.md = README.md RELEASE_NOTES.md = RELEASE_NOTES.md EndProjectSection EndProject diff --git a/build.cmd b/build.cmd index 0c12be79b..84ce4640e 100644 --- a/build.cmd +++ b/build.cmd @@ -1,14 +1,9 @@ @echo off -.paket\paket.bootstrapper.exe -if errorlevel 1 ( - exit /b %errorlevel% -) - .paket\paket.exe restore if errorlevel 1 ( exit /b %errorlevel% ) packages\FAKE\tools\FAKE.exe build.fsx %* -pause + diff --git a/build.fsx b/build.fsx index 75581c31f..8c5f40d1e 100644 --- a/build.fsx +++ b/build.fsx @@ -1,3 +1,5 @@ +System.IO.Directory.SetCurrentDirectory __SOURCE_DIRECTORY__ + // -------------------------------------------------------------------------------------- // FAKE build script // -------------------------------------------------------------------------------------- @@ -12,8 +14,6 @@ open Fake.AssemblyInfoFile open Fake.Git open Fake.ReleaseNotesHelper -Environment.CurrentDirectory <- __SOURCE_DIRECTORY__ - // Information about the project to be used at NuGet and in AssemblyInfo files let project = "FSharp.Formatting" let projectTool = "FSharp.Formatting.CommandTool" @@ -97,14 +97,21 @@ Target "UpdateFsxVersions" (fun _ -> // -------------------------------------------------------------------------------------- // Build library + +let solutionFile = "FSharp.Formatting.sln" + +let msbuild14 = ProgramFilesX86"MSBuild""14.0""Bin""MSBuild.exe" + +if isWindows && fileExists msbuild14 then + setEnvironVar "MSBUILD" msbuild14 + Target "Build" (fun _ -> - { BaseDirectory = __SOURCE_DIRECTORY__ - Includes = ["FSharp.Formatting.sln"] - Excludes = [] } + !! solutionFile |> MSBuildRelease "" "Rebuild" |> ignore ) + Target "MergeVSPowerTools" (fun _ -> () (* let binDir = __SOURCE_DIRECTORY__ @@ "bin" @@ -137,34 +144,36 @@ Target "BuildTests" (fun _ -> { BaseDirectory = __SOURCE_DIRECTORY__ Includes = ["FSharp.Formatting.sln"] Excludes = [] } - |> MSBuildRelease "" "Rebuild" + |> MSBuildRelease "" "Build" |> ignore { BaseDirectory = __SOURCE_DIRECTORY__ Includes = ["tests/*/files/FsLib/FsLib.sln"] Excludes = [] } - |> MSBuildDebug "" "Rebuild" + |> MSBuildDebug "" "Build" |> ignore { BaseDirectory = __SOURCE_DIRECTORY__ Includes = ["tests/*/files/crefLib/crefLib.sln"] Excludes = [] } - |> MSBuildDebug "" "Rebuild" + |> MSBuildDebug "" "Build" |> ignore { BaseDirectory = __SOURCE_DIRECTORY__ Includes = ["tests/*/files/csharpSupport/csharpSupport.sln"] Excludes = [] } - |> MSBuildDebug "" "Rebuild" + |> MSBuildDebug "" "Build" |> ignore { BaseDirectory = __SOURCE_DIRECTORY__ Includes = ["tests/*/files/TestLib/TestLib.sln"] Excludes = [] } - |> MSBuildDebug "" "Rebuild" + |> MSBuildDebug "" "Build" |> ignore ) +open Fake.Testing + let testProjects = [ "FSharp.CodeFormat.Tests"; "FSharp.Literate.Tests"; "FSharp.Markdown.Tests"; "FSharp.MetadataFormat.Tests" ] @@ -177,12 +186,11 @@ for name in testProjects do let taskName = sprintf "RunTest_%s" name Target taskName <| fun () -> !! (sprintf "tests/*/bin/Release/%s.dll" name) - |> NUnit (fun p -> + |> NUnit3 (fun p -> { p with - DisableShadowCopy = true + ShadowCopy = true TimeOut = TimeSpan.FromMinutes 20. - Framework = "4.0" - OutputFile = "TestResults.xml" }) + OutputDir = "TestResults.xml" }) taskName ==> "RunTests" |> ignore "BuildTests" ==> taskName |> ignore @@ -208,7 +216,7 @@ let RequireRange breakingPoint version = Target "CopyFSharpCore" (fun _ -> // We need to include optdata and sigdata as well, we copy everything to be consistent - for file in System.IO.Directory.EnumerateFiles("packages" @@ "FSharp.Core" @@ "lib" @@ "net40") do + for file in System.IO.Directory.EnumerateFiles("packages" "FSharp.Core" "lib" "net40") do let source, dest = file, Path.Combine("bin", Path.GetFileName(file)) printfn "Copying %s to %s" source dest File.Copy(source, dest, true)) @@ -252,7 +260,7 @@ Target "NuGet" (fun _ -> // -------------------------------------------------------------------------------------- // Generate the documentation -let fakePath = "packages" @@ "FAKE" @@ "tools" @@ "FAKE.exe" +let fakePath = "packages" "FAKE" "tools" "FAKE.exe" let fakeStartInfo script workingDirectory args fsiargs environmentVars = (fun (info: System.Diagnostics.ProcessStartInfo) -> info.FileName <- System.IO.Path.GetFullPath fakePath @@ -266,7 +274,7 @@ let fakeStartInfo script workingDirectory args fsiargs environmentVars = setVar "GIT" Git.CommandHelper.gitPath setVar "FSI" fsiPath) -let commandToolPath = "bin" @@ "fsformatting.exe" +let commandToolPath = "bin" "fsformatting.exe" let commandToolStartInfo workingDirectory environmentVars args = (fun (info: System.Diagnostics.ProcessStartInfo) -> info.FileName <- System.IO.Path.GetFullPath commandToolPath @@ -364,15 +372,15 @@ let bootStrapDocumentationFiles () = // If you came here from the nuspec file add your file. // If you add files here to make the CI happy add those files to the .nuspec file as well // TODO: INSTEAD build the nuspec file before generating the documentation and extract it... - ensureDirectory (__SOURCE_DIRECTORY__ @@ "packages/FSharp.Formatting/lib/net40") + ensureDirectory (__SOURCE_DIRECTORY__ "packages/FSharp.Formatting/lib/net40") let buildFiles = [ "CSharpFormat.dll"; "FSharp.CodeFormat.dll"; "FSharp.Literate.dll" "FSharp.Markdown.dll"; "FSharp.MetadataFormat.dll"; "RazorEngine.dll"; "System.Web.Razor.dll"; "FSharp.Formatting.Common.dll"; "FSharp.Formatting.Razor.dll" ] let bundledFiles = buildFiles |> List.map (fun f -> - __SOURCE_DIRECTORY__ @@ sprintf "bin/%s" f, - __SOURCE_DIRECTORY__ @@ sprintf "packages/FSharp.Formatting/lib/net40/%s" f) + __SOURCE_DIRECTORY__ sprintf "bin/%s" f, + __SOURCE_DIRECTORY__ sprintf "packages/FSharp.Formatting/lib/net40/%s" f) |> List.map (fun (source, dest) -> Path.GetFullPath source, Path.GetFullPath dest) for source, dest in bundledFiles do try @@ -459,15 +467,15 @@ Target "All" DoNothing Target "DownloadPython" (fun _ -> if not isUnix then let w = new System.Net.WebClient() - let zipFile = "temp"@@"cpython.zip" + let zipFile = "temp""cpython.zip" if File.Exists zipFile then File.Delete zipFile w.DownloadFile("https://www.python.org/ftp/python/3.5.1/python-3.5.1-embed-amd64.zip", zipFile) - let cpython = "temp"@@"CPython" + let cpython = "temp""CPython" CleanDir cpython System.IO.Compression.ZipFile.ExtractToDirectory(zipFile, cpython) - let cpythonStdLib = cpython@@"stdlib" + let cpythonStdLib = cpython"stdlib" CleanDir cpythonStdLib - System.IO.Compression.ZipFile.ExtractToDirectory(cpython@@"python35.zip", cpythonStdLib) + System.IO.Compression.ZipFile.ExtractToDirectory(cpython"python35.zip", cpythonStdLib) ) Target "CreateTestJson" (fun _ -> @@ -477,11 +485,11 @@ Target "CreateTestJson" (fun _ -> let pythonExe, stdLib = if not isUnix then - System.IO.Path.GetFullPath ("temp"@@"CPython"@@"python.exe"), - System.IO.Path.GetFullPath ("temp"@@"CPython"@@"stdlib") + System.IO.Path.GetFullPath ("temp""CPython""python.exe"), + System.IO.Path.GetFullPath ("temp""CPython""stdlib") else "python", "" - let resultFile = "temp"@@"commonmark-tests.json" + let resultFile = "temp""commonmark-tests.json" if File.Exists resultFile then File.Delete resultFile ( use fileStream = new StreamWriter(File.Open(resultFile, System.IO.FileMode.Create)) executeHelper @@ -499,7 +507,7 @@ Target "CreateTestJson" (fun _ -> setVar "MSBuild" msBuildExe setVar "GIT" Git.CommandHelper.gitPath setVar "FSI" fsiPath)) - File.Copy(resultFile, "tests"@@"commonmark_spec.json") + File.Copy(resultFile, "tests""commonmark_spec.json") ) "Clean" ==> "AssemblyInfo" ==> "Build" ==> "BuildTests" diff --git a/build.sh b/build.sh index fe60d6326..bd9340e37 100755 --- a/build.sh +++ b/build.sh @@ -2,11 +2,6 @@ if test "$OS" = "Windows_NT" then # use .Net - .paket/paket.bootstrapper.exe - exit_code=$? - if [ $exit_code -ne 0 ]; then - exit $exit_code - fi .paket/paket.exe restore exit_code=$? @@ -18,11 +13,6 @@ then else # use mono - mono .paket/paket.bootstrapper.exe - exit_code=$? - if [ $exit_code -ne 0 ]; then - exit $exit_code - fi mono .paket/paket.exe restore exit_code=$? diff --git a/paket.dependencies b/paket.dependencies index fedf76c83..beb715f9f 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,16 +1,15 @@ -source http://nuget.org/api/v2 +source https://api.nuget.org/v3/index.json +source https://nuget.org/api/v2 redirects: on nuget FSharp.Data nuget FAKE nuget CommandLineParser -nuget FSharp.Core +nuget FSharp.Core 4.0.0.1 redirects:force nuget Microsoft.AspNet.Razor -nuget RazorEngine -nuget NUnit ~> 2 -nuget NUnit.Runners ~> 2 +nuget RazorEngine 3.9.3 framework: net45 nuget NuGet.CommandLine -nuget FSharp.Compiler.Service == 2.0.0.6 +nuget FSharp.Compiler.Service 2.0.0.6 // See http://fsprojects.github.io/Paket/nuget-dependencies.html // This basically means we need the lowest version for its dependencies (FSharp.Compiler.Service) // Otherwise we get runtime errors without binding redirects @@ -20,3 +19,12 @@ nuget FSharpVSPowerTools.Core !>= 0 nuget ILRepack github matthid/Yaaf.FSharp.Scripting src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs + +group Test + source https://api.nuget.org/v3/index.json + redirects: on + + nuget FSharp.Core 4.0.0.1 redirects:force + nuget FsUnit 3.0.0 framework:net45 + nuget NUnit + nuget NUnit.Console diff --git a/paket.lock b/paket.lock index ce4088f8e..dfdb4504f 100644 --- a/paket.lock +++ b/paket.lock @@ -1,23 +1,539 @@ REDIRECTS: ON NUGET - remote: http://www.nuget.org/api/v2 + remote: https://api.nuget.org/v3/index.json CommandLineParser (1.9.71) - FAKE (4.22.8) + FAKE (4.56) FSharp.Compiler.Service (2.0.0.6) - FSharp.Core (4.0.0.1) - FSharp.Data (2.2.5) - Zlib.Portable (>= 1.10) - framework: portable-net40+sl50+wp80+win80 + FSharp.Core (4.0.0.1) - redirects: force + FSharp.Data (2.3.2) + Zlib.Portable (>= 1.11) - framework: >= netstandard11, portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81 FSharpVSPowerTools.Core (2.3) FSharp.Compiler.Service (>= 2.0.0.3) - ILRepack (2.0.10) + ILRepack (2.0.12) Microsoft.AspNet.Razor (3.2.3) - NuGet.CommandLine (3.3) - NUnit (2.6.4) - NUnit.Runners (2.6.4) - RazorEngine (3.7.7) + NuGet.CommandLine (3.5) + RazorEngine (3.9.3) - framework: net45 Microsoft.AspNet.Razor (>= 3.0) - framework: >= net45 - Microsoft.AspNet.Razor (2.0.30506) - framework: net40 - Zlib.Portable (1.11) - framework: portable-net40+sl50+wp80+win80 + Zlib.Portable (1.11) - framework: >= netstandard11, portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81 GITHUB remote: matthid/Yaaf.FSharp.Scripting - src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs (48789eeb63382a6934966472e270e87880cb49ed) \ No newline at end of file + src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs (40ef4e32a115962436809666b6868693be6444c2) +GROUP Test +REDIRECTS: ON +NUGET + remote: https://api.nuget.org/v3/index.json + FSharp.Core (4.0.0.1) - redirects: force + FsUnit (3.0) - framework: net45 + FSharp.Core (>= 3.1.2.5) - framework: >= net10, netstandard10, netstandard11, netstandard12, netstandard13, netstandard14, netstandard15 + NUnit (>= 3.6) + Microsoft.NETCore.Platforms (1.1) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Targets (1.1) - framework: >= net463, >= netstandard16 + Microsoft.Win32.Primitives (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 + Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13 + System.Runtime (>= 4.3) - framework: >= netstandard13 + NETStandard.Library (1.6.1) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard10 + Microsoft.Win32.Primitives (>= 4.3) - framework: >= net46, >= netstandard13 + System.AppContext (>= 4.3) - framework: >= net46, >= netstandard13 + System.Collections (>= 4.3) - framework: >= netstandard10 + System.Collections.Concurrent (>= 4.3) - framework: >= net45, >= netstandard11 + System.Console (>= 4.3) - framework: >= net46, >= netstandard13 + System.Diagnostics.Debug (>= 4.3) - framework: >= netstandard10 + System.Diagnostics.Tools (>= 4.3) - framework: >= netstandard10 + System.Diagnostics.Tracing (>= 4.3) - framework: >= net45, >= netstandard11 + System.Globalization (>= 4.3) - framework: >= netstandard10 + System.Globalization.Calendars (>= 4.3) - framework: >= net46, >= netstandard13 + System.IO (>= 4.3) - framework: >= netstandard10 + System.IO.Compression (>= 4.3) - framework: >= net45, >= netstandard11 + System.IO.Compression.ZipFile (>= 4.3) - framework: >= net46, >= netstandard13 + System.IO.FileSystem (>= 4.3) - framework: >= net46, >= netstandard13 + System.IO.FileSystem.Primitives (>= 4.3) - framework: >= net46, >= netstandard13 + System.Linq (>= 4.3) - framework: >= netstandard10 + System.Linq.Expressions (>= 4.3) - framework: >= netstandard10 + System.Net.Http (>= 4.3) - framework: >= net45, >= netstandard11 + System.Net.Primitives (>= 4.3) - framework: >= netstandard10 + System.Net.Sockets (>= 4.3) - framework: >= net46, >= netstandard13 + System.ObjectModel (>= 4.3) - framework: >= netstandard10 + System.Reflection (>= 4.3) - framework: >= netstandard10 + System.Reflection.Extensions (>= 4.3) - framework: >= netstandard10 + System.Reflection.Primitives (>= 4.3) - framework: >= netstandard10 + System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard10 + System.Runtime (>= 4.3) - framework: >= netstandard10 + System.Runtime.Extensions (>= 4.3) - framework: >= netstandard10 + System.Runtime.Handles (>= 4.3) - framework: >= net46, >= netstandard13 + System.Runtime.InteropServices (>= 4.3) - framework: >= net45, >= netstandard11 + System.Runtime.InteropServices.RuntimeInformation (>= 4.3) - framework: >= net45, >= netstandard11 + System.Runtime.Numerics (>= 4.3) - framework: >= net45, >= netstandard11 + System.Security.Cryptography.Algorithms (>= 4.3) - framework: >= net46, >= netstandard13 + System.Security.Cryptography.Encoding (>= 4.3) - framework: >= net46, >= netstandard13 + System.Security.Cryptography.Primitives (>= 4.3) - framework: >= net46, >= netstandard13 + System.Security.Cryptography.X509Certificates (>= 4.3) - framework: >= net46, >= netstandard13 + System.Text.Encoding (>= 4.3) - framework: >= netstandard10 + System.Text.Encoding.Extensions (>= 4.3) - framework: >= netstandard10 + System.Text.RegularExpressions (>= 4.3) - framework: >= netstandard10 + System.Threading (>= 4.3) - framework: >= netstandard10 + System.Threading.Tasks (>= 4.3) - framework: >= netstandard10 + System.Threading.Timer (>= 4.3) - framework: >= net451, >= netstandard12 + System.Xml.ReaderWriter (>= 4.3) - framework: >= netstandard10 + System.Xml.XDocument (>= 4.3) - framework: >= netstandard10 + NUnit (3.6.1) + NETStandard.Library (>= 1.6) - framework: >= net463, >= netstandard16 + System.Runtime.Loader (>= 4.0) - framework: >= net463, >= netstandard16 + NUnit.Console (3.6.1) + NUnit.ConsoleRunner (>= 3.6.1) + NUnit.Extension.NUnitProjectLoader (>= 3.5) + NUnit.Extension.NUnitV2Driver (>= 3.6) + NUnit.Extension.NUnitV2ResultWriter (>= 3.5) + NUnit.Extension.TeamCityEventListener (>= 1.0.2) + NUnit.Extension.VSProjectLoader (>= 3.5) + NUnit.ConsoleRunner (3.6.1) + NUnit.Extension.NUnitProjectLoader (3.5) + NUnit.Extension.NUnitV2Driver (3.6) + NUnit.Extension.NUnitV2ResultWriter (3.5) + NUnit.Extension.TeamCityEventListener (1.0.2) + NUnit.Extension.VSProjectLoader (3.5) + runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - framework: >= net463, >= netstandard16 + runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - framework: >= net463, >= netstandard16 + runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - framework: >= net463, >= netstandard16 + runtime.native.System (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) + Microsoft.NETCore.Targets (>= 1.1) + runtime.native.System.IO.Compression (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) + Microsoft.NETCore.Targets (>= 1.1) + runtime.native.System.Net.Http (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) + Microsoft.NETCore.Targets (>= 1.1) + runtime.native.System.Security.Cryptography.Apple (4.3) - framework: >= net463, >= netstandard16 + runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (>= 4.3) + runtime.native.System.Security.Cryptography.OpenSsl (4.3) - framework: >= net463, >= netstandard16 + runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) + runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) + runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) + runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) + runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) + runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) + runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) + runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) + runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) + runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) + runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - framework: >= net463, >= netstandard16 + runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - framework: >= net463, >= netstandard16 + runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (4.3) - framework: >= net463, >= netstandard16 + runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - framework: >= net463, >= netstandard16 + runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - framework: >= net463, >= netstandard16 + runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - framework: >= net463, >= netstandard16 + runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - framework: >= net463, >= netstandard16 + runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - framework: >= net463, >= netstandard16 + System.AppContext (4.3) - framework: >= net463, >= netstandard16 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard16 + System.Buffers (4.3) - framework: >= net463, >= netstandard16 + System.Diagnostics.Debug (>= 4.3) - framework: >= netstandard11 + System.Diagnostics.Tracing (>= 4.3) - framework: >= netstandard11 + System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard11 + System.Runtime (>= 4.3) - framework: >= netstandard11 + System.Threading (>= 4.3) - framework: >= netstandard11 + System.Collections (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Collections.Concurrent (4.3) - framework: >= net463, >= netstandard16 + System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Diagnostics.Tracing (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Reflection (>= 4.3) - framework: >= netstandard13 + System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard11, >= netstandard13 + System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Threading.Tasks (>= 4.3) - framework: dnxcore50, netstandard11, >= netstandard13 + System.Console (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 + Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13 + System.IO (>= 4.3) - framework: >= netstandard13 + System.Runtime (>= 4.3) - framework: >= netstandard13 + System.Text.Encoding (>= 4.3) - framework: >= netstandard13 + System.Diagnostics.Debug (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Diagnostics.DiagnosticSource (4.3) - framework: >= net463, >= netstandard16 + System.Collections (>= 4.3) - framework: netstandard11, >= netstandard13 + System.Diagnostics.Tracing (>= 4.3) - framework: netstandard11, >= netstandard13 + System.Reflection (>= 4.3) - framework: netstandard11, >= netstandard13 + System.Runtime (>= 4.3) - framework: netstandard11, >= netstandard13 + System.Threading (>= 4.3) - framework: netstandard11, >= netstandard13 + System.Diagnostics.Tools (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, >= netstandard10 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, >= netstandard10 + System.Runtime (>= 4.3) - framework: dnxcore50, >= netstandard10 + System.Diagnostics.Tracing (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 + System.Globalization (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Globalization.Calendars (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 + Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13 + System.Globalization (>= 4.3) - framework: >= netstandard13 + System.Runtime (>= 4.3) - framework: >= netstandard13 + System.Globalization.Extensions (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 + System.Globalization (>= 4.3) - framework: >= netstandard13 + System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard13 + System.Runtime (>= 4.3) - framework: >= netstandard13 + System.Runtime.Extensions (>= 4.3) - framework: >= netstandard13 + System.Runtime.InteropServices (>= 4.3) - framework: >= netstandard13 + System.IO (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 + System.Text.Encoding (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 + System.Threading.Tasks (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 + System.IO.Compression (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 + runtime.native.System (>= 4.3) - framework: >= netstandard13 + runtime.native.System.IO.Compression (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Buffers (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.IO (>= 4.3) - framework: dnxcore50, netstandard11, >= netstandard13 + System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard11, >= netstandard13 + System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Runtime.Handles (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Runtime.InteropServices (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Text.Encoding (>= 4.3) - framework: dnxcore50, netstandard11, >= netstandard13 + System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Threading.Tasks (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.IO.Compression.ZipFile (4.3) - framework: >= net463, >= netstandard16 + System.Buffers (>= 4.3) - framework: >= netstandard13 + System.IO (>= 4.3) - framework: >= netstandard13 + System.IO.Compression (>= 4.3) - framework: >= netstandard13 + System.IO.FileSystem (>= 4.3) - framework: >= netstandard13 + System.IO.FileSystem.Primitives (>= 4.3) - framework: >= netstandard13 + System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard13 + System.Runtime (>= 4.3) - framework: >= netstandard13 + System.Runtime.Extensions (>= 4.3) - framework: >= netstandard13 + System.Text.Encoding (>= 4.3) - framework: >= netstandard13 + System.IO.FileSystem (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 + Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13 + System.IO (>= 4.3) - framework: >= netstandard13 + System.IO.FileSystem.Primitives (>= 4.3) - framework: >= net46, >= netstandard13 + System.Runtime (>= 4.3) - framework: >= netstandard13 + System.Runtime.Handles (>= 4.3) - framework: >= netstandard13 + System.Text.Encoding (>= 4.3) - framework: >= netstandard13 + System.Threading.Tasks (>= 4.3) - framework: >= netstandard13 + System.IO.FileSystem.Primitives (4.3) - framework: >= net463, >= netstandard16 + System.Runtime (>= 4.3) - framework: >= netstandard13 + System.Linq (4.3) - framework: >= net463, >= netstandard16 + System.Collections (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard16 + System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard16 + System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Linq.Expressions (4.3) - framework: >= net463, >= netstandard16 + System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.IO (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Linq (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.ObjectModel (>= 4.3) - framework: >= netstandard16 + System.Reflection (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16 + System.Reflection.Emit (>= 4.3) - framework: >= netstandard16 + System.Reflection.Emit.ILGeneration (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Reflection.Emit.Lightweight (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Reflection.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Reflection.Primitives (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Reflection.TypeExtensions (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16 + System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Net.Http (4.3.1) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard13, >= netstandard16 + runtime.native.System (>= 4.3) - framework: >= netstandard16 + runtime.native.System.Net.Http (>= 4.3) - framework: >= netstandard16 + runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - framework: >= netstandard16 + System.Collections (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard16 + System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard16 + System.Diagnostics.DiagnosticSource (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard16 + System.Diagnostics.Tracing (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard16 + System.Globalization (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard16 + System.Globalization.Extensions (>= 4.3) - framework: >= netstandard16 + System.IO (>= 4.3) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard16 + System.IO.FileSystem (>= 4.3) - framework: >= netstandard16 + System.Net.Primitives (>= 4.3) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard16 + System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard16 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard16 + System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard16 + System.Runtime.Handles (>= 4.3) - framework: netstandard13, >= netstandard16 + System.Runtime.InteropServices (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard16 + System.Security.Cryptography.Algorithms (>= 4.3) - framework: >= netstandard16 + System.Security.Cryptography.Encoding (>= 4.3) - framework: >= netstandard16 + System.Security.Cryptography.OpenSsl (>= 4.3) - framework: >= netstandard16 + System.Security.Cryptography.Primitives (>= 4.3) - framework: >= netstandard16 + System.Security.Cryptography.X509Certificates (>= 4.3) - framework: >= net46, dnxcore50, netstandard13, >= netstandard16 + System.Text.Encoding (>= 4.3) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard16 + System.Threading (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard16 + System.Threading.Tasks (>= 4.3) - framework: dnxcore50, netstandard11, netstandard13, >= netstandard16 + System.Net.Primitives (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, netstandard11, >= netstandard13 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, netstandard11, >= netstandard13 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard11, >= netstandard13 + System.Runtime.Handles (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Net.Sockets (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 + Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13 + System.IO (>= 4.3) - framework: >= netstandard13 + System.Net.Primitives (>= 4.3) - framework: >= netstandard13 + System.Runtime (>= 4.3) - framework: >= netstandard13 + System.Threading.Tasks (>= 4.3) - framework: >= netstandard13 + System.ObjectModel (4.3) - framework: >= net463, >= netstandard16 + System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Reflection (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 + System.IO (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 + System.Reflection.Primitives (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 + System.Reflection.Emit (4.3) - framework: >= net463, >= netstandard16 + System.IO (>= 4.3) - framework: >= netstandard11 + System.Reflection (>= 4.3) - framework: >= netstandard11 + System.Reflection.Emit.ILGeneration (>= 4.3) - framework: >= netstandard11 + System.Reflection.Primitives (>= 4.3) - framework: >= netstandard11 + System.Runtime (>= 4.3) - framework: >= netstandard11 + System.Reflection.Emit.ILGeneration (4.3) - framework: >= net463, >= netstandard16 + System.Reflection (>= 4.3) - framework: >= netstandard10 + System.Reflection.Primitives (>= 4.3) - framework: >= netstandard10 + System.Runtime (>= 4.3) - framework: >= netstandard10 + System.Reflection.Emit.Lightweight (4.3) - framework: >= net463, >= netstandard16 + System.Reflection (>= 4.3) - framework: >= netstandard10 + System.Reflection.Emit.ILGeneration (>= 4.3) - framework: >= netstandard10 + System.Reflection.Primitives (>= 4.3) - framework: >= netstandard10 + System.Runtime (>= 4.3) - framework: >= netstandard10 + System.Reflection.Extensions (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, >= netstandard10 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, >= netstandard10 + System.Reflection (>= 4.3) - framework: dnxcore50, >= netstandard10 + System.Runtime (>= 4.3) - framework: dnxcore50, >= netstandard10 + System.Reflection.Primitives (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, >= netstandard10 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, >= netstandard10 + System.Runtime (>= 4.3) - framework: dnxcore50, >= netstandard10 + System.Reflection.TypeExtensions (4.3) - framework: >= net463, >= netstandard16 + System.Reflection (>= 4.3) - framework: >= net462, dnxcore50, netstandard13, >= netstandard15 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard15 + System.Resources.ResourceManager (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, >= netstandard10 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, >= netstandard10 + System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard10 + System.Reflection (>= 4.3) - framework: dnxcore50, >= netstandard10 + System.Runtime (>= 4.3) - framework: dnxcore50, >= netstandard10 + System.Runtime (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15 + System.Runtime.Extensions (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 + System.Runtime.Handles (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 + Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13 + System.Runtime (>= 4.3) - framework: >= netstandard13 + System.Runtime.InteropServices (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 + System.Reflection (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 + System.Reflection.Primitives (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 + System.Runtime (>= 4.3) - framework: net462, >= net463, dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 + System.Runtime.Handles (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard15 + System.Runtime.InteropServices.RuntimeInformation (4.3) - framework: >= net463, >= netstandard16 + runtime.native.System (>= 4.3) - framework: >= netstandard11 + System.Reflection (>= 4.3) - framework: dnxcore50, >= netstandard11 + System.Reflection.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard11 + System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard11 + System.Runtime (>= 4.3) - framework: dnxcore50, >= netstandard11 + System.Runtime.InteropServices (>= 4.3) - framework: >= netstandard11 + System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard11 + System.Runtime.Loader (4.3) - framework: >= net463, >= netstandard16 + System.IO (>= 4.3) - framework: >= netstandard15 + System.Reflection (>= 4.3) - framework: >= netstandard15 + System.Runtime (>= 4.3) - framework: >= netstandard15 + System.Runtime.Numerics (4.3) - framework: >= net463, >= netstandard16 + System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard11, >= netstandard13 + System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Security.Cryptography.Algorithms (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, >= netstandard16 + runtime.native.System.Security.Cryptography.Apple (>= 4.3) - framework: >= netstandard16 + runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - framework: >= netstandard16 + System.Collections (>= 4.3) - framework: >= netstandard16 + System.IO (>= 4.3) - framework: >= net463, dnxcore50, netstandard13, netstandard14, >= netstandard16 + System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Runtime (>= 4.3) - framework: >= net463, dnxcore50, netstandard13, netstandard14, >= netstandard16 + System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Runtime.Handles (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Runtime.InteropServices (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Runtime.Numerics (>= 4.3) - framework: >= netstandard16 + System.Security.Cryptography.Encoding (>= 4.3) - framework: >= net463, dnxcore50, >= netstandard16 + System.Security.Cryptography.Primitives (>= 4.3) - framework: net46, net461, >= net463, dnxcore50, netstandard13, netstandard14, >= netstandard16 + System.Text.Encoding (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Security.Cryptography.Cng (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: netstandard14, >= netstandard16 + System.IO (>= 4.3) - framework: netstandard13, netstandard14, >= netstandard16 + System.Resources.ResourceManager (>= 4.3) - framework: netstandard14, >= netstandard16 + System.Runtime (>= 4.3) - framework: netstandard13, netstandard14, >= netstandard16 + System.Runtime.Extensions (>= 4.3) - framework: netstandard14, >= netstandard16 + System.Runtime.Handles (>= 4.3) - framework: netstandard13, netstandard14, >= netstandard16 + System.Runtime.InteropServices (>= 4.3) - framework: netstandard14, >= netstandard16 + System.Security.Cryptography.Algorithms (>= 4.3) - framework: net46, net461, >= net463, netstandard13, netstandard14, >= netstandard16 + System.Security.Cryptography.Encoding (>= 4.3) - framework: netstandard14, >= netstandard16 + System.Security.Cryptography.Primitives (>= 4.3) - framework: net46, net461, >= net463, netstandard13, netstandard14, >= netstandard16 + System.Text.Encoding (>= 4.3) - framework: netstandard14, >= netstandard16 + System.Security.Cryptography.Csp (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 + System.IO (>= 4.3) - framework: >= netstandard13 + System.Reflection (>= 4.3) - framework: >= netstandard13 + System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard13 + System.Runtime (>= 4.3) - framework: >= netstandard13 + System.Runtime.Extensions (>= 4.3) - framework: >= netstandard13 + System.Runtime.Handles (>= 4.3) - framework: >= netstandard13 + System.Runtime.InteropServices (>= 4.3) - framework: >= netstandard13 + System.Security.Cryptography.Algorithms (>= 4.3) - framework: >= net46, >= netstandard13 + System.Security.Cryptography.Encoding (>= 4.3) - framework: >= netstandard13 + System.Security.Cryptography.Primitives (>= 4.3) - framework: >= net46, >= netstandard13 + System.Text.Encoding (>= 4.3) - framework: >= netstandard13 + System.Threading (>= 4.3) - framework: >= netstandard13 + System.Security.Cryptography.Encoding (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 + runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - framework: >= netstandard13 + System.Collections (>= 4.3) - framework: >= netstandard13 + System.Collections.Concurrent (>= 4.3) - framework: >= netstandard13 + System.Linq (>= 4.3) - framework: >= netstandard13 + System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard13 + System.Runtime (>= 4.3) - framework: >= netstandard13 + System.Runtime.Extensions (>= 4.3) - framework: >= netstandard13 + System.Runtime.Handles (>= 4.3) - framework: >= netstandard13 + System.Runtime.InteropServices (>= 4.3) - framework: >= netstandard13 + System.Security.Cryptography.Primitives (>= 4.3) - framework: >= netstandard13 + System.Text.Encoding (>= 4.3) - framework: >= netstandard13 + System.Security.Cryptography.OpenSsl (4.3) - framework: >= net463, >= netstandard16 + runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - framework: >= net463, >= netstandard16, monoandroid, monotouch, xamarinios, xamarinmac + System.Collections (>= 4.3) - framework: >= netstandard16 + System.IO (>= 4.3) - framework: >= net463, >= netstandard16 + System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard16 + System.Runtime (>= 4.3) - framework: >= net463, >= netstandard16 + System.Runtime.Extensions (>= 4.3) - framework: >= net463, >= netstandard16 + System.Runtime.Handles (>= 4.3) - framework: >= netstandard16 + System.Runtime.InteropServices (>= 4.3) - framework: >= netstandard16 + System.Runtime.Numerics (>= 4.3) - framework: >= netstandard16 + System.Security.Cryptography.Algorithms (>= 4.3) - framework: >= net463, >= netstandard16 + System.Security.Cryptography.Encoding (>= 4.3) - framework: >= net463, >= netstandard16 + System.Security.Cryptography.Primitives (>= 4.3) - framework: >= net463, >= netstandard16 + System.Text.Encoding (>= 4.3) - framework: >= netstandard16 + System.Security.Cryptography.Primitives (4.3) - framework: >= net463, >= netstandard16 + System.Diagnostics.Debug (>= 4.3) - framework: >= netstandard13 + System.Globalization (>= 4.3) - framework: >= netstandard13 + System.IO (>= 4.3) - framework: >= netstandard13 + System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard13 + System.Runtime (>= 4.3) - framework: >= netstandard13 + System.Threading (>= 4.3) - framework: >= netstandard13 + System.Threading.Tasks (>= 4.3) - framework: >= netstandard13 + System.Security.Cryptography.X509Certificates (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, >= netstandard16 + runtime.native.System (>= 4.3) - framework: >= netstandard16 + runtime.native.System.Net.Http (>= 4.3) - framework: >= netstandard16 + runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - framework: >= netstandard16 + System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Diagnostics.Debug (>= 4.3) - framework: >= netstandard16 + System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Globalization.Calendars (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.IO (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.IO.FileSystem (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.IO.FileSystem.Primitives (>= 4.3) - framework: >= netstandard16 + System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard13, netstandard14, >= netstandard16 + System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Runtime.Handles (>= 4.3) - framework: dnxcore50, netstandard13, netstandard14, >= netstandard16 + System.Runtime.InteropServices (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Runtime.Numerics (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Security.Cryptography.Algorithms (>= 4.3) - framework: net46, >= net461, dnxcore50, netstandard13, netstandard14, >= netstandard16 + System.Security.Cryptography.Cng (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Security.Cryptography.Csp (>= 4.3) - framework: >= netstandard16 + System.Security.Cryptography.Encoding (>= 4.3) - framework: net46, >= net461, dnxcore50, netstandard13, netstandard14, >= netstandard16 + System.Security.Cryptography.OpenSsl (>= 4.3) - framework: >= netstandard16 + System.Security.Cryptography.Primitives (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Text.Encoding (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Text.Encoding (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Text.Encoding.Extensions (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Text.Encoding (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Text.RegularExpressions (4.3) - framework: >= net463, >= netstandard16 + System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16 + System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard16 + System.Threading (4.3) - framework: >= net463, >= netstandard16 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Threading.Tasks (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Threading.Tasks (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Threading.Tasks.Extensions (4.3) - framework: >= net463, >= netstandard16 + System.Collections (>= 4.3) - framework: >= netstandard10 + System.Runtime (>= 4.3) - framework: >= netstandard10 + System.Threading.Tasks (>= 4.3) - framework: >= netstandard10 + System.Threading.Timer (4.3) - framework: >= net463, >= netstandard16 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, >= netstandard12 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, >= netstandard12 + System.Runtime (>= 4.3) - framework: dnxcore50, >= netstandard12 + System.Xml.ReaderWriter (4.3) - framework: >= net463, >= netstandard16 + System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.IO (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.IO.FileSystem (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.IO.FileSystem.Primitives (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Runtime.InteropServices (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Text.Encoding (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Text.Encoding.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Text.RegularExpressions (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Threading.Tasks (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Threading.Tasks.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Xml.XDocument (4.3) - framework: >= net463, >= netstandard16 + System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Diagnostics.Tools (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.IO (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Reflection (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Text.Encoding (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard13 + System.Xml.ReaderWriter (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 diff --git a/src/Common/AssemblyInfo.cs b/src/Common/AssemblyInfo.cs index 119fb60d0..55a8d3b30 100644 --- a/src/Common/AssemblyInfo.cs +++ b/src/Common/AssemblyInfo.cs @@ -10,6 +10,12 @@ [assembly: AssemblyCopyrightAttribute("Apache 2.0 License")] namespace System { internal static class AssemblyVersionInformation { - internal const string Version = "3.0.0"; + internal const System.String AssemblyTitle = "FSharp.Formatting"; + internal const System.String AssemblyProduct = "FSharp.Formatting"; + internal const System.String AssemblyDescription = "A package of libraries for building great F# documentation, samples and blogs"; + internal const System.String AssemblyVersion = "3.0.0"; + internal const System.String AssemblyFileVersion = "3.0.0"; + internal const System.String AssemblyInformationalVersion = "3.0.0-beta01"; + internal const System.String AssemblyCopyright = "Apache 2.0 License"; } } diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs index d0f098350..c5e3d2406 100644 --- a/src/Common/AssemblyInfo.fs +++ b/src/Common/AssemblyInfo.fs @@ -1,4 +1,5 @@ -namespace System +// Auto-Generated by FAKE; do not edit +namespace System open System.Reflection [] @@ -11,4 +12,10 @@ open System.Reflection do () module internal AssemblyVersionInformation = - let [] Version = "3.0.0" + let [] AssemblyTitle = "FSharp.Formatting" + let [] AssemblyProduct = "FSharp.Formatting" + let [] AssemblyDescription = "A package of libraries for building great F# documentation, samples and blogs" + let [] AssemblyVersion = "3.0.0" + let [] AssemblyFileVersion = "3.0.0" + let [] AssemblyInformationalVersion = "3.0.0-beta01" + let [] AssemblyCopyright = "Apache 2.0 License" diff --git a/src/FSharp.CodeFormat/CodeFormatAgent.fs b/src/FSharp.CodeFormat/CodeFormatAgent.fs index 29c3e291e..99ee56a50 100644 --- a/src/FSharp.CodeFormat/CodeFormatAgent.fs +++ b/src/FSharp.CodeFormat/CodeFormatAgent.fs @@ -258,7 +258,7 @@ type CodeFormatAgent() = let! symbolUses = languageService.GetAllUsesOfAllSymbolsInFile (opts, file, source, AllowStaleResults.No, false, new Profiler()) return checkResults, symbolUses } - + // ------------------------------------------------------------------------------------ let processSourceCode (file, source, options, defines) = async { diff --git a/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj b/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj index 4681c815f..af1069bba 100644 --- a/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj +++ b/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -15,7 +15,7 @@ FSharp.CodeFormat ..\..\ true - 4.3.0.0 + 4.4.0.0 true @@ -38,12 +38,21 @@ ..\..\bin\FSharp.CodeFormat.xml AnyCPU + + 14.0 + 11 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets @@ -55,7 +64,7 @@ - + @@ -82,9 +91,6 @@ - - True - @@ -125,6 +131,71 @@ + + + + + ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll + True + True + + + + diff --git a/src/FSharp.CodeFormat/app.config b/src/FSharp.CodeFormat/app.config index f072f570e..84919544e 100644 --- a/src/FSharp.CodeFormat/app.config +++ b/src/FSharp.CodeFormat/app.config @@ -1,3 +1,15 @@  - + + + + + + + + True + + + + + \ No newline at end of file diff --git a/src/FSharp.CodeFormat/paket.references b/src/FSharp.CodeFormat/paket.references index 2edeea241..8f4c61640 100644 --- a/src/FSharp.CodeFormat/paket.references +++ b/src/FSharp.CodeFormat/paket.references @@ -1,2 +1,3 @@ FSharp.Compiler.Service -FSharpVSPowerTools.Core \ No newline at end of file +FSharpVSPowerTools.Core +FSharp.Core \ No newline at end of file diff --git a/src/FSharp.Formatting.CommandTool/App.config b/src/FSharp.Formatting.CommandTool/App.config index eb54b13f2..c5e99b644 100644 --- a/src/FSharp.Formatting.CommandTool/App.config +++ b/src/FSharp.Formatting.CommandTool/App.config @@ -28,35 +28,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + + + + \ No newline at end of file diff --git a/src/FSharp.Formatting.CommandTool/Exec.fs b/src/FSharp.Formatting.CommandTool/Exec.fs index 8ca259b30..3372d9fb3 100644 --- a/src/FSharp.Formatting.CommandTool/Exec.fs +++ b/src/FSharp.Formatting.CommandTool/Exec.fs @@ -1,5 +1,6 @@ module FSharp.Formatting.Exec +open FSharp.Formatting open FSharp.Formatting.Common open FSharp.Formatting.Options open FSharp.Formatting.Options.Literate @@ -84,7 +85,7 @@ type Env (argv: string []) = elif (argv.Length = 1) then match argv.[0] with | "--help" -> fullHelp(); exit 0 - | "--version" -> printfn "\nfsformatting version %s" Version; exit 0 + | "--version" -> printfn "\nfsformatting version %s" AssemblyVersion; exit 0 | _ -> exit -1 /// dispatch verb commands, combined 1st and 2nd level else diff --git a/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj b/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj index f7a3eab0c..b6c32c948 100644 --- a/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj +++ b/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj @@ -1,5 +1,5 @@  - + Debug @@ -46,9 +46,6 @@ - - True - @@ -81,6 +78,11 @@ {91bad90e-bf3b-4646-a1a7-1568f8f25075} True + + FSharp.Formatting.Razor + {c6b3c274-71a8-4239-ba9a-1af7b2f7c736} + True + FSharp.Literate {65e6d541-0486-4383-b619-5cfc5d2ba2f0} @@ -96,13 +98,9 @@ {bc4946ba-2724-4524-ac50-dfc49ee154a1} True - - FSharp.Formatting.Razor.fsproj - {c6b3c274-71a8-4239-ba9a-1af7b2f7c736} - True - + 14.0 11 @@ -127,7 +125,7 @@ - + - + + + + + ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll + True + True + + + + + \ No newline at end of file diff --git a/src/FSharp.Markdown/app.config b/src/FSharp.Markdown/app.config new file mode 100644 index 000000000..a4daf5445 --- /dev/null +++ b/src/FSharp.Markdown/app.config @@ -0,0 +1,9 @@ + + + + + True + + + + diff --git a/src/FSharp.Markdown/paket.references b/src/FSharp.Markdown/paket.references new file mode 100644 index 000000000..640cf9145 --- /dev/null +++ b/src/FSharp.Markdown/paket.references @@ -0,0 +1 @@ +FSharp.Core \ No newline at end of file diff --git a/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj b/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj index 61826e835..367a648fe 100644 --- a/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj +++ b/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj @@ -1,5 +1,5 @@  - + Debug @@ -15,7 +15,7 @@ ..\..\ true - 4.3.0.0 + 4.4.0.0 true @@ -37,18 +37,24 @@ 3 ..\..\bin\FSharp.MetadataFormat.xml - - 11 - ..\..\bin\ + + 14.0 + 11 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets @@ -60,7 +66,7 @@ - + - - FsUnit.fs - Always @@ -85,12 +83,6 @@ - - ..\..\bin\FSharp.CodeFormat.dll - - - False - @@ -102,11 +94,159 @@ True - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - + + + + + ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll + True + True + + + + + + + + + ..\..\packages\test\FsUnit\lib\net45\FsUnit.NUnit.dll + True + True + + + + + + + + + ..\..\packages\test\NUnit\lib\MonoAndroid\nunit.framework.dll + True + True + + + + + + + ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll + True + True + + + ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll + True + True + + + + + + + ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll + True + True + + + + + + + ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll + True + True + + + + + + + ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll + True + True + + + + + + + ..\..\packages\test\NUnit\lib\netstandard1.6\nunit.framework.dll + True + True + + + + + + + ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81\nunit.framework.dll + True + True + + + + + + + ..\..\packages\test\NUnit\lib\Xamarin.iOS10\nunit.framework.dll + True + True + + + + \ No newline at end of file diff --git a/tests/FSharp.CodeFormat.Tests/Tests.fs b/tests/FSharp.CodeFormat.Tests/Tests.fs index 369c14e8d..476320801 100644 --- a/tests/FSharp.CodeFormat.Tests/Tests.fs +++ b/tests/FSharp.CodeFormat.Tests/Tests.fs @@ -1,7 +1,7 @@ #if INTERACTIVE #r "../../bin/FSharp.CodeFormat.dll" -#r "../../packages/NUnit/lib/nunit.framework.dll" -#load "../Common/FsUnit.fs" +#r "../../packages/test/NUnit/lib/net45/nunit.framework.dll" +#r "../../packages/test/FsUnit/lib/net45/FsUnit.NUnit.dll" #else module FSharp.CodeFormat.Tests #endif @@ -9,6 +9,7 @@ module FSharp.CodeFormat.Tests open FsUnit open NUnit.Framework open FSharp.CodeFormat +open FsUnitTyped // -------------------------------------------------------------------------------------- // Initialization - find F# compiler dll, setup formatting agent diff --git a/tests/FSharp.CodeFormat.Tests/paket.references b/tests/FSharp.CodeFormat.Tests/paket.references index 24a08ca93..bc0023968 100644 --- a/tests/FSharp.CodeFormat.Tests/paket.references +++ b/tests/FSharp.CodeFormat.Tests/paket.references @@ -1,2 +1,6 @@ +FSharp.Core +group Test + NUnit -NUnit.Runners +NUnit.Console +FsUnit \ No newline at end of file diff --git a/tests/FSharp.Literate.Tests/App.config b/tests/FSharp.Literate.Tests/App.config index eaba40a10..0bb6ee95a 100644 --- a/tests/FSharp.Literate.Tests/App.config +++ b/tests/FSharp.Literate.Tests/App.config @@ -18,10 +18,6 @@ - - - - @@ -31,8 +27,14 @@ + True - + + + + True + + \ No newline at end of file diff --git a/tests/FSharp.Literate.Tests/EvalTests.fs b/tests/FSharp.Literate.Tests/EvalTests.fs index c294d2193..51115d87d 100644 --- a/tests/FSharp.Literate.Tests/EvalTests.fs +++ b/tests/FSharp.Literate.Tests/EvalTests.fs @@ -3,8 +3,8 @@ #r "FSharp.Literate.dll" #r "FSharp.CodeFormat.dll" #r "FSharp.Markdown.dll" -#r "../../packages/NUnit/lib/nunit.framework.dll" -#load "../Common/FsUnit.fs" +#r "../../packages/test/NUnit/lib/net45/nunit.framework.dll" +#r "../../packages/test/FsUnit/lib/net45/FsUnit.NUnit.dll" #load "../Common/MarkdownUnit.fs" #load "Setup.fs" #else @@ -12,6 +12,7 @@ module FSharp.Literate.Tests.Eval #endif open FsUnit +open FsUnitTyped open System.IO open FSharp.Markdown open FSharp.Literate @@ -46,7 +47,7 @@ printf ">>%d<<" 12343 (*** include-output: test ***) """ - let doc = Literate.ParseScriptString(content, "." @@ "A.fsx", getFormatAgent(), fsiEvaluator = getFsiEvaluator()) + let doc = Literate.ParseScriptString(content, "." "A.fsx", getFormatAgent(), fsiEvaluator = getFsiEvaluator()) doc.Errors |> Seq.length |> shouldEqual 0 // Contains formatted code and markdown @@ -70,7 +71,7 @@ let ``Can evaluate hidden code snippets`` () = printfn "42" (*** include-output: test ***) """ - let doc = Literate.ParseScriptString(content, "." @@ "A.fsx", getFormatAgent(), fsiEvaluator = getFsiEvaluator()) + let doc = Literate.ParseScriptString(content, "." "A.fsx", getFormatAgent(), fsiEvaluator = getFsiEvaluator()) let html = Literate.WriteHtml(doc) html.Contains("42") |> shouldEqual true html.Contains(">printfn<") |> shouldEqual false @@ -90,7 +91,7 @@ let test = [1;2;3] Some [ ListBlock(MarkdownListKind.Ordered, items, None) ] else None) - let doc = Literate.ParseScriptString(content, "." @@ "A.fsx", getFormatAgent(), fsiEvaluator = fsiEvaluator) + let doc = Literate.ParseScriptString(content, "." "A.fsx", getFormatAgent(), fsiEvaluator = fsiEvaluator) doc.Paragraphs |> shouldMatchPar (function | ListBlock(Ordered, items, None) -> @@ -115,7 +116,7 @@ test 2 printfn "hi" (*** include-output:t ***) """ - let doc = Literate.ParseScriptString(content, "." @@ "A.fsx", getFormatAgent(), fsiEvaluator = getFsiEvaluator()) + let doc = Literate.ParseScriptString(content, "." "A.fsx", getFormatAgent(), fsiEvaluator = getFsiEvaluator()) let html = Literate.WriteHtml(doc) html.Split([| "" |], System.StringSplitOptions.None).Length |> shouldEqual 5 @@ -128,11 +129,11 @@ let ``Can disable evaluation on an entire script file`` () = printfn "%d" (40 + 2) (*** include-output:t ***) """ - let doc1 = Literate.ParseScriptString(content, "." @@ "A.fsx", getFormatAgent(), fsiEvaluator = getFsiEvaluator()) + let doc1 = Literate.ParseScriptString(content, "." "A.fsx", getFormatAgent(), fsiEvaluator = getFsiEvaluator()) let html1 = Literate.WriteHtml(doc1) html1.Contains("42") |> shouldEqual true - let doc2 = Literate.ParseScriptString("(*** do-not-eval-file ***)\n" + content, "." @@ "A.fsx", getFormatAgent(), fsiEvaluator = getFsiEvaluator()) + let doc2 = Literate.ParseScriptString("(*** do-not-eval-file ***)\n" + content, "." "A.fsx", getFormatAgent(), fsiEvaluator = getFsiEvaluator()) let html2 = Literate.WriteHtml(doc2) html2.Contains("42") |> shouldEqual false @@ -156,7 +157,7 @@ printfn "%d" FsLab.Demo.test (*** include-output:t ***)""".Replace("[PATH]", path) let fsie = getFsiEvaluator() fsie.EvaluationFailed.Add(printfn "%A") - let doc1 = Literate.ParseScriptString(content, "." @@ "A.fsx", getFormatAgent(), fsiEvaluator = fsie) + let doc1 = Literate.ParseScriptString(content, "." "A.fsx", getFormatAgent(), fsiEvaluator = fsie) let html1 = Literate.WriteHtml(doc1) html1.Contains("42") |> shouldEqual true File.Delete(path) @@ -183,7 +184,7 @@ module Demo = FsLab.Demo.test (*** include-it:t2 ***)""".Replace("[PATH]", path) let fsie = FSharp.Literate.FsiEvaluator(fsiObj = FsiEvaluatorConfig.CreateNoOpFsiObject()) - let doc1 = Literate.ParseScriptString(content, "." @@ "A.fsx", getFormatAgent(), fsiEvaluator = fsie) + let doc1 = Literate.ParseScriptString(content, "." "A.fsx", getFormatAgent(), fsiEvaluator = fsie) let html1 = Literate.WriteHtml(doc1) html1.Contains("Not executed") |> shouldEqual true html1.Contains("Executed") |> shouldEqual false diff --git a/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj b/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj index 318e2749d..d5647589c 100644 --- a/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj +++ b/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj @@ -44,6 +44,7 @@ bin\Release\FSharp.Literate.Tests.xml + 14.0 11 @@ -68,16 +69,13 @@ - + - - Common\FsUnit.fs - Common\MarkdownUnit.fs @@ -90,15 +88,6 @@ - - ..\..\bin\CSharpFormat.dll - - - ..\..\bin\FSharp.CodeFormat.dll - - - False - @@ -113,6 +102,11 @@ --> + + CSharpFormat + {9ab3650b-cc24-4404-a175-a573da928475} + True + FSharp.CodeFormat {341ebf32-d470-4c55-99e9-55f14f7ffbb1} @@ -123,6 +117,11 @@ {91bad90e-bf3b-4646-a1a7-1568f8f25075} True + + FSharp.Formatting.Razor + {c6b3c274-71a8-4239-ba9a-1af7b2f7c736} + True + FSharp.Literate {65e6d541-0486-4383-b619-5cfc5d2ba2f0} @@ -133,11 +132,72 @@ {c44c1c05-599a-40dd-9590-465eab8960c5} True - - FSharp.Formatting.Razor.fsproj - {c6b3c274-71a8-4239-ba9a-1af7b2f7c736} - + + + + + ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll + True + True + + + + + + + ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll + True + True + + + + @@ -149,18 +209,65 @@ - - - ..\..\packages\NUnit\lib\nunit.framework.dll - True - True - - - + - ..\..\packages\RazorEngine\lib\net40\RazorEngine.dll + ..\..\packages\RazorEngine\lib\net45\RazorEngine.dll + True + True + + + + + + + + + ..\..\packages\test\FsUnit\lib\net45\FsUnit.NUnit.dll + True + True + + + + + + + + + ..\..\packages\test\NUnit\lib\MonoAndroid\nunit.framework.dll + True + True + + + + + + + ..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll + True + True + + + ..\..\packages\test\NUnit\lib\net20\nunit.framework.dll + True + True + + + + + + + ..\..\packages\test\NUnit\lib\net35\nunit.framework.dll + True + True + + + + + + + ..\..\packages\test\NUnit\lib\net40\nunit.framework.dll True True @@ -168,8 +275,35 @@ - - ..\..\packages\RazorEngine\lib\net45\RazorEngine.dll + + ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll + True + True + + + + + + + ..\..\packages\test\NUnit\lib\netstandard1.6\nunit.framework.dll + True + True + + + + + + + ..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81\nunit.framework.dll + True + True + + + + + + + ..\..\packages\test\NUnit\lib\Xamarin.iOS10\nunit.framework.dll True True diff --git a/tests/FSharp.Literate.Tests/Setup.fs b/tests/FSharp.Literate.Tests/Setup.fs index 35e0dc717..23f333613 100644 --- a/tests/FSharp.Literate.Tests/Setup.fs +++ b/tests/FSharp.Literate.Tests/Setup.fs @@ -8,7 +8,7 @@ open System.Reflection // Setup - find the compiler assembly etc. // -------------------------------------------------------------------------------------- -let (@@) a b = Path.Combine(a, b) +let () a b = Path.Combine(a, b) type TempFile() = let file = Path.GetTempFileName() diff --git a/tests/FSharp.Literate.Tests/Tests.fs b/tests/FSharp.Literate.Tests/Tests.fs index 7e567ecab..859089b3c 100644 --- a/tests/FSharp.Literate.Tests/Tests.fs +++ b/tests/FSharp.Literate.Tests/Tests.fs @@ -4,8 +4,8 @@ #r "FSharp.CodeFormat.dll" #r "FSharp.Markdown.dll" #r "CSharpFormat.dll" -#r "../../packages/NUnit/lib/nunit.framework.dll" -#load "../Common/FsUnit.fs" +#r "../../packages/test/NUnit/lib/net45/nunit.framework.dll" +#r "../../packages/test/FsUnit/lib/net45/FsUnit.NUnit.dll" #load "../Common/MarkdownUnit.fs" #load "Setup.fs" #else @@ -19,6 +19,7 @@ open FSharp.Markdown.Unit open NUnit.Framework open FSharp.Literate.Tests.Setup open FSharp.Formatting.Razor +open FsUnitTyped module Logging = FSharp.Formatting.Common.Log @@ -60,7 +61,7 @@ a [lang=csharp,file=Tests.fs,key=test] -b""", __SOURCE_DIRECTORY__ @@ "Test.fsx") +b""", __SOURCE_DIRECTORY__ "Test.fsx") //[/test] doc.Paragraphs |> shouldMatchPar (function Paragraph([Literal("a", Some({ StartLine = 2 }))], Some({ StartLine = 2 })) -> true | _ -> false) doc.Paragraphs |> shouldMatchPar (function Paragraph([Literal("b", Some({ StartLine = 6 }))], Some({ StartLine = 6 })) -> true | _ -> false) @@ -78,7 +79,7 @@ let ``Can parse and format literate F# script`` () = let content = """ (** **hello** *) let test = 42""" - let doc = Literate.ParseScriptString(content, "C" @@ "A.fsx", getFormatAgent()) + let doc = Literate.ParseScriptString(content, "C" "A.fsx", getFormatAgent()) doc.Errors |> Seq.length |> shouldEqual 0 doc.Paragraphs |> shouldMatchPar (function | Matching.LiterateParagraph(FormattedCode(_)) -> true | _ -> false) @@ -91,7 +92,7 @@ let ``Can parse heading on the same line as opnening comment (#147)`` () = (** ## Heading content *) let test = 42""" - let doc = Literate.ParseScriptString(content, "C" @@ "A.fsx", getFormatAgent()) + let doc = Literate.ParseScriptString(content, "C" "A.fsx", getFormatAgent()) doc.Paragraphs |> shouldMatchPar (function | Heading(2, [Literal("Heading", Some({ StartLine = 1 }))], Some({ StartLine = 1 })) -> true | _ -> false) @@ -144,7 +145,7 @@ some [link][ref] to [ref]: http://there "Author: Article" *)""" - let doc = Literate.ParseScriptString(content, "C" @@ "A.fsx", getFormatAgent(), references=true) + let doc = Literate.ParseScriptString(content, "C" "A.fsx", getFormatAgent(), references=true) doc.Paragraphs |> shouldMatchPar (function ListBlock(_, _, _) -> true | _ -> false) doc.Paragraphs |> shouldMatchSpan (function Literal("Article", None) -> true | _ -> false) doc.Paragraphs |> shouldMatchSpan (function Literal(" - Author", None) -> true | _ -> false) @@ -163,7 +164,7 @@ let ``Can report errors in F# code snippets (in Markdown document)`` () = let content = """ (** **hello** *) let test = 4 + 1.0""" - let doc = Literate.ParseScriptString(content, "C" @@ "A.fsx", getFormatAgent()) + let doc = Literate.ParseScriptString(content, "C" "A.fsx", getFormatAgent()) doc.Errors |> Seq.length |> should be (greaterThan 0) // -------------------------------------------------------------------------------------- @@ -291,7 +292,7 @@ let ``Path to network share should not be recognized as comments in Paket code b cache //hive/dependencies""" let doc = Literate.ParseMarkdownString(content, formatAgent=getFormatAgent()) let html = Literate.WriteHtml(doc) - html |> should notContain "//hive/dependencies" + html |> shouldNotContainText "//hive/dependencies" [] let ``Correctly handles Paket coloring`` () = @@ -351,8 +352,8 @@ let ``Correctly handles Paket coloring`` () = html |> should contain "strategy" html |> should contain "version_in_path" - html |> should notContain "https" - html |> should notContain ".git" + html |> shouldNotContainText "https" + html |> shouldNotContainText ".git" html |> should contain "~>" html |> should contain ">=" @@ -366,7 +367,7 @@ let ``Correctly handles Paket coloring`` () = html |> should contain "// NuGet packages" html |> should contain "// nuget.org" - html |> should notContain "//hive/dependencies" + html |> shouldNotContainText "//hive/dependencies" html |> should contain @"https://nuget.org/api/v2" html |> should contain @"http://www.fssnip.net/1n" @@ -385,7 +386,7 @@ let a2 = 2""" html |> should contain "

Hello

" html |> should contain "1:" html |> should contain "2:" - html |> should notContain "3:" + html |> shouldNotContainText "3:" [] let ``Generates line numbers for non-F# code snippets`` () = @@ -401,7 +402,7 @@ var a2 = 2; html |> should contain "

Hello

" html |> should contain "1:" html |> should contain "2:" - html |> should notContain "3:" + html |> shouldNotContainText "3:" [] let ``HTML for line numbers generated for F# and non-F# is the same``() = @@ -451,12 +452,12 @@ let ``Parsing simple script and markdown produces the same result`` () = // Test processing simple files using simple templates // -------------------------------------------------------------------------------------- -let templateHtml = __SOURCE_DIRECTORY__ @@ "files/template.html" -let templateCsHtml = __SOURCE_DIRECTORY__ @@ "files/template.cshtml" +let templateHtml = __SOURCE_DIRECTORY__ "files/template.html" +let templateCsHtml = __SOURCE_DIRECTORY__ "files/template.cshtml" [] let ``Code and HTML is formatted with a tooltip in Markdown file using HTML template``() = - let simpleMd = __SOURCE_DIRECTORY__ @@ "files/simple.md" + let simpleMd = __SOURCE_DIRECTORY__ "files/simple.md" use temp = new TempFile() RazorLiterate.ProcessMarkdown(simpleMd, templateHtml, temp.File) temp.Content |> should contain "" @@ -464,7 +465,7 @@ let ``Code and HTML is formatted with a tooltip in Markdown file using HTML temp [] let ``Code and HTML is formatted with a tooltip in F# Script file using HTML template``() = - let simpleFsx = __SOURCE_DIRECTORY__ @@ "files/simple.fsx" + let simpleFsx = __SOURCE_DIRECTORY__ "files/simple.fsx" use temp = new TempFile() RazorLiterate.ProcessScriptFile(simpleFsx, templateHtml, temp.File) temp.Content |> should contain "" @@ -472,11 +473,11 @@ let ``Code and HTML is formatted with a tooltip in F# Script file using HTML tem [] let ``Code and HTML is formatted with a tooltip in F# Script file using Razor template``() = - let simpleFsx = __SOURCE_DIRECTORY__ @@ "files/simple.fsx" + let simpleFsx = __SOURCE_DIRECTORY__ "files/simple.fsx" use temp = new TempFile() RazorLiterate.ProcessScriptFile ( simpleFsx, templateCsHtml, temp.File, - layoutRoots = [__SOURCE_DIRECTORY__ @@ "files"] ) + layoutRoots = [__SOURCE_DIRECTORY__ "files"] ) temp.Content |> should contain "" temp.Content |> should contain "val hello : string" temp.Content |> should contain "Heading" @@ -493,25 +494,25 @@ let info = "project-nuget", "http://nuget.com/packages/FSharp.ProjectScaffold" "root", "http://tpetricek.github.io/FSharp.FSharp.ProjectScaffold" ] -let docPageTemplate = __SOURCE_DIRECTORY__ @@ "../../misc/templates/docpage.cshtml" +let docPageTemplate = __SOURCE_DIRECTORY__ </> "../../misc/templates/docpage.cshtml" [<Test>] let ``Can process fsx file using the template included in NuGet package``() = - let simpleFsx = __SOURCE_DIRECTORY__ @@ "files/simple.fsx" + let simpleFsx = __SOURCE_DIRECTORY__ </> "files/simple.fsx" use temp = new TempFile() RazorLiterate.ProcessScriptFile ( simpleFsx, docPageTemplate, temp.File, - layoutRoots = [__SOURCE_DIRECTORY__ @@ "../../misc/templates"], replacements = info) + layoutRoots = [__SOURCE_DIRECTORY__ </> "../../misc/templates"], replacements = info) temp.Content |> should contain "val hello : string" temp.Content |> should contain "<title>Heading" [<Test>] let ``Can process md file using the template included in NuGet package``() = - let simpleMd = __SOURCE_DIRECTORY__ @@ "files/simple.md" + let simpleMd = __SOURCE_DIRECTORY__ </> "files/simple.md" use temp = new TempFile() RazorLiterate.ProcessMarkdown ( simpleMd, docPageTemplate, temp.File, - layoutRoots = [__SOURCE_DIRECTORY__ @@ "../../misc/templates"], replacements = info) + layoutRoots = [__SOURCE_DIRECTORY__ </> "../../misc/templates"], replacements = info) temp.Content |> should contain "val hello : string" temp.Content |> should contain "<title>Heading" @@ -522,7 +523,7 @@ let ``Gives nice error when parsing unclosed comment`` () = (** **hello** let test = 42""" try - Literate.ParseScriptString(content, "C" @@ "A.fsx", getFormatAgent()) |> ignore + Literate.ParseScriptString(content, "C" </> "A.fsx", getFormatAgent()) |> ignore failwith "" with | e when e.Message.Contains("comment was not closed") -> () @@ -566,12 +567,12 @@ hello *) let test = 42 """ - let doc = Literate.ParseScriptString(content, "." @@ "A.fsx", getFormatAgent()) + let doc = Literate.ParseScriptString(content, "." </> "A.fsx", getFormatAgent()) let doc2 = Literate.FormatLiterateNodes(doc,format=OutputKind.Html) let html = Literate.WriteHtml(doc2.With(formattedTips="")) let tips = doc2.FormattedTips tips |> should contain "test : int" - html |> should notContain "test : int" + html |> shouldNotContainText "test : int" html |> should contain "hello" diff --git a/tests/FSharp.Literate.Tests/paket.references b/tests/FSharp.Literate.Tests/paket.references index 99552bb38..582963fe6 100644 --- a/tests/FSharp.Literate.Tests/paket.references +++ b/tests/FSharp.Literate.Tests/paket.references @@ -1,3 +1,7 @@ +FSharp.Core Microsoft.AspNet.Razor +RazorEngine + +group Test +FsUnit NUnit -RazorEngine \ No newline at end of file diff --git a/tests/FSharp.Markdown.Tests/App.config b/tests/FSharp.Markdown.Tests/App.config index 016441f87..782c7196a 100644 --- a/tests/FSharp.Markdown.Tests/App.config +++ b/tests/FSharp.Markdown.Tests/App.config @@ -4,35 +4,37 @@ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> </startup> <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="4.0.0.0" newVersion="12.0.0.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="4.0.0.0" newVersion="12.0.0.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="CommandLine" publicKeyToken="de6f01bd326f8c32" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-1.9.71.2" newVersion="1.9.71.2" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-2.6.4.14350" newVersion="2.6.4.14350" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="RazorEngine" publicKeyToken="9ee697374c7e744a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-3.7.5.0" newVersion="3.7.5.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="2.0.0.0-4.4.0.0" newVersion="4.4.0.0" /> - </dependentAssembly> - </assemblyBinding> - </runtime> + + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> + <bindingRedirect oldVersion="4.0.0.0" newVersion="12.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> + <bindingRedirect oldVersion="4.0.0.0" newVersion="12.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="CommandLine" publicKeyToken="de6f01bd326f8c32" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-1.9.71.2" newVersion="1.9.71.2" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="RazorEngine" publicKeyToken="9ee697374c7e744a" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-3.7.5.0" newVersion="3.7.5.0" /> + </dependentAssembly> + <dependentAssembly> + <Paket>True</Paket> + <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.0.0" /> + </dependentAssembly> + <dependentAssembly> + <Paket>True</Paket> + <assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="3.6.1.0" /> + </dependentAssembly> +</assemblyBinding></runtime> </configuration> \ No newline at end of file diff --git a/tests/FSharp.Markdown.Tests/CommonMarkSpecTest.fs b/tests/FSharp.Markdown.Tests/CommonMarkSpecTest.fs index 0895020bf..3fc9ab319 100644 --- a/tests/FSharp.Markdown.Tests/CommonMarkSpecTest.fs +++ b/tests/FSharp.Markdown.Tests/CommonMarkSpecTest.fs @@ -2,8 +2,8 @@ open System.IO open System.Diagnostics -let (++) a b = Path.Combine(a, b) -let testdir = __SOURCE_DIRECTORY__ ++ Path.Combine("..", "..", "tests") +let (</>) a b = Path.Combine(a, b) +let testdir = __SOURCE_DIRECTORY__ </> Path.Combine("..", "..", "tests") open FSharp.Data type CommonMarkSpecJson = JsonProvider<"../../tests/commonmark_spec.json"> diff --git a/tests/FSharp.Markdown.Tests/Externals.fs b/tests/FSharp.Markdown.Tests/Externals.fs index b8c391d94..2dfd46b80 100644 --- a/tests/FSharp.Markdown.Tests/Externals.fs +++ b/tests/FSharp.Markdown.Tests/Externals.fs @@ -1,8 +1,9 @@ #if INTERACTIVE #r "../../bin/FSharp.Markdown.dll" -#r "../../packages/NUnit/lib/nunit.framework.dll" -#load "../Common/FsUnit.fs" +#r "../../packages/test/NUnit/lib/net45/nunit.framework.dll" +#r "../../packages/test/FsUnit/lib/net45/FsUnit.NUnit.dll" #else +[<NUnit.Framework.TestFixture >] module FSharp.Markdown.Tests.Externals #endif diff --git a/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj b/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj index 06e3a3ad8..f5d064f6b 100644 --- a/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj +++ b/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj @@ -40,6 +40,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> </PropertyGroup> <PropertyGroup> + <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">14.0</VisualStudioVersion> <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion> </PropertyGroup> <Choose> @@ -64,11 +65,8 @@ </PropertyGroup> </When> </Choose> - <Import Project="$(FSharpTargetsPath)" /> + <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" /> <ItemGroup> - <Compile Include="..\Common\FsUnit.fs"> - <Link>FsUnit.fs</Link> - </Compile> <Compile Include="TestFiles.fs" /> <Compile Include="Markdown.fs" /> <Compile Include="Externals.fs" /> @@ -79,9 +77,6 @@ <None Include="paket.references" /> </ItemGroup> <ItemGroup> - <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <Private>False</Private> - </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Numerics" /> @@ -106,6 +101,71 @@ <Private>True</Private> </ProjectReference> </ItemGroup> + <Choose> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v3.0' Or $(TargetFrameworkVersion) == 'v3.5')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + </Choose> <Choose> <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> <ItemGroup> @@ -119,23 +179,34 @@ </Reference> </ItemGroup> </When> - <When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile158')"> + <When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')"> + <ItemGroup> + <Reference Include="FSharp.Data"> + <HintPath>..\..\packages\FSharp.Data\lib\portable-net45+netcore45\FSharp.Data.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')"> + <ItemGroup> + <Reference Include="FSharp.Data"> + <HintPath>..\..\packages\FSharp.Data\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Data.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')"> <ItemGroup> <Reference Include="FSharp.Data"> - <HintPath>..\..\packages\FSharp.Data\lib\portable-net40+sl5+wp8+win8\FSharp.Data.dll</HintPath> + <HintPath>..\..\packages\FSharp.Data\lib\portable-net45+sl50+netcore45\FSharp.Data.dll</HintPath> <Private>True</Private> <Paket>True</Paket> </Reference> </ItemGroup> </When> </Choose> - <ItemGroup> - <Reference Include="nunit.framework"> - <HintPath>..\..\packages\NUnit\lib\nunit.framework.dll</HintPath> - <Private>True</Private> - <Paket>True</Paket> - </Reference> - </ItemGroup> <Choose> <When Condition="($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile92') Or ($(TargetFrameworkProfile) == 'Profile102') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile136') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile158') Or ($(TargetFrameworkProfile) == 'Profile225') Or ($(TargetFrameworkProfile) == 'Profile240') Or ($(TargetFrameworkProfile) == 'Profile255') Or ($(TargetFrameworkProfile) == 'Profile259') Or ($(TargetFrameworkProfile) == 'Profile328') Or ($(TargetFrameworkProfile) == 'Profile336') Or ($(TargetFrameworkProfile) == 'Profile344')"> <ItemGroup> @@ -147,4 +218,26 @@ </ItemGroup> </When> </Choose> + <Choose> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'"> + <ItemGroup> + <Reference Include="FsUnit.NUnit"> + <HintPath>..\..\packages\test\FsUnit\lib\net45\FsUnit.NUnit.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + </Choose> + <Choose> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'"> + <ItemGroup> + <Reference Include="nunit.framework"> + <HintPath>..\..\packages\test\NUnit\lib\net45\nunit.framework.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + </Choose> </Project> \ No newline at end of file diff --git a/tests/FSharp.Markdown.Tests/Markdown.fs b/tests/FSharp.Markdown.Tests/Markdown.fs index 8d90faf69..de8475bbf 100644 --- a/tests/FSharp.Markdown.Tests/Markdown.fs +++ b/tests/FSharp.Markdown.Tests/Markdown.fs @@ -3,6 +3,7 @@ #r "../../packages/NUnit/lib/nunit.framework.dll" #load "../Common/FsUnit.fs" #else +[<NUnit.Framework.TestFixture >] module FSharp.Markdown.Tests.Parsing #endif @@ -10,6 +11,7 @@ open FsUnit open NUnit.Framework open FSharp.Markdown open FSharp.Formatting.Common +open FsUnitTyped let properNewLines (text: string) = text.Replace("\r\n", System.Environment.NewLine) diff --git a/tests/FSharp.Markdown.Tests/TestFiles.fs b/tests/FSharp.Markdown.Tests/TestFiles.fs index db7c43bf9..7133d8675 100644 --- a/tests/FSharp.Markdown.Tests/TestFiles.fs +++ b/tests/FSharp.Markdown.Tests/TestFiles.fs @@ -7,15 +7,15 @@ open FSharp.Markdown open System.IO open System.Diagnostics -let (++) a b = Path.Combine(a, b) -let testdir = __SOURCE_DIRECTORY__ ++ Path.Combine("..","..","tests") +let (</>) a b = Path.Combine(a, b) +let testdir = __SOURCE_DIRECTORY__ </> Path.Combine("..","..","tests") // -------------------------------------------------------------------------------------- // Run performance benchmarks // -------------------------------------------------------------------------------------- let benchmark file count = - let text = File.ReadAllText(testdir ++ "benchmark" ++ file) + let text = File.ReadAllText(testdir </> "benchmark" </> file) let sw = new Stopwatch() sw.Start() @@ -68,5 +68,5 @@ let rec runTests dir = // -------------------------------------------------------------------------------------- let runAll () = - runTests (testdir ++ "testfiles") + runTests (testdir </> "testfiles") benchmarks () diff --git a/tests/FSharp.Markdown.Tests/paket.references b/tests/FSharp.Markdown.Tests/paket.references index 112f82367..3d9223558 100644 --- a/tests/FSharp.Markdown.Tests/paket.references +++ b/tests/FSharp.Markdown.Tests/paket.references @@ -1,2 +1,6 @@ -NUnit -FSharp.Data \ No newline at end of file +FSharp.Core +FSharp.Data + +group Test +FsUnit +group Test \ No newline at end of file diff --git a/tests/FSharp.MetadataFormat.Tests/App.config b/tests/FSharp.MetadataFormat.Tests/App.config index 248f19a69..19ea03904 100644 --- a/tests/FSharp.MetadataFormat.Tests/App.config +++ b/tests/FSharp.MetadataFormat.Tests/App.config @@ -42,10 +42,6 @@ <assemblyIdentity name="CommandLine" publicKeyToken="de6f01bd326f8c32" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-1.9.71.2" newVersion="1.9.71.2" /> </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-2.6.4.14350" newVersion="2.6.4.14350" /> - </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" /> @@ -55,8 +51,14 @@ <bindingRedirect oldVersion="0.0.0.0-3.7.5.0" newVersion="3.7.5.0" /> </dependentAssembly> <dependentAssembly> + <Paket>True</Paket> <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="2.0.0.0-4.4.0.0" newVersion="4.4.0.0" /> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.0.0" /> + </dependentAssembly> + <dependentAssembly> + <Paket>True</Paket> + <assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="3.6.1.0" /> </dependentAssembly> </assemblyBinding></runtime> </configuration> diff --git a/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj b/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj index 66216f4b4..ea654a060 100644 --- a/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj @@ -42,23 +42,18 @@ <Prefer32Bit>true</Prefer32Bit> </PropertyGroup> <ItemGroup> - <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <Private>False</Private> - </Reference> <Reference Include="mscorlib" /> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Numerics" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Common\FsUnit.fs"> - <Link>FsUnit.fs</Link> - </Compile> <Compile Include="Tests.fs" /> <None Include="App.config" /> <None Include="paket.references" /> </ItemGroup> <PropertyGroup> + <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">14.0</VisualStudioVersion> <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion> </PropertyGroup> <Choose> @@ -83,7 +78,7 @@ </PropertyGroup> </When> </Choose> - <Import Project="$(FSharpTargetsPath)" /> + <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> @@ -93,27 +88,30 @@ --> <Import Project="$(SolutionDir)\.paket\paket.targets" /> <ItemGroup> + <ProjectReference Include="..\..\src\FSharp.CodeFormat\FSharp.CodeFormat.fsproj"> + <Name>FSharp.CodeFormat</Name> + <Project>{341ebf32-d470-4c55-99e9-55f14f7ffbb1}</Project> + <Private>True</Private> + </ProjectReference> <ProjectReference Include="..\..\src\FSharp.Formatting.Common\FSharp.Formatting.Common.fsproj"> <Name>FSharp.Formatting.Common</Name> <Project>{91bad90e-bf3b-4646-a1a7-1568f8f25075}</Project> <Private>True</Private> </ProjectReference> - <ProjectReference Include="..\..\src\FSharp.MetadataFormat\FSharp.MetadataFormat.fsproj"> - <Name>FSharp.MetadataFormat</Name> - <Project>{bc4946ba-2724-4524-ac50-dfc49ee154a1}</Project> - <Private>True</Private> - </ProjectReference> <ProjectReference Include="..\..\src\FSharp.Formatting.Razor\FSharp.Formatting.Razor.fsproj"> - <Name>FSharp.Formatting.Razor.fsproj</Name> + <Name>FSharp.Formatting.Razor</Name> <Project>{c6b3c274-71a8-4239-ba9a-1af7b2f7c736}</Project> + <Private>True</Private> </ProjectReference> <ProjectReference Include="..\..\src\FSharp.Literate\FSharp.Literate.fsproj"> - <Name>FSharp.Literate.fsproj</Name> + <Name>FSharp.Literate</Name> <Project>{65e6d541-0486-4383-b619-5cfc5d2ba2f0}</Project> + <Private>True</Private> </ProjectReference> - <ProjectReference Include="..\..\src\FSharp.CodeFormat\FSharp.CodeFormat.fsproj"> - <Name>FSharp.CodeFormat.fsproj</Name> - <Project>{341ebf32-d470-4c55-99e9-55f14f7ffbb1}</Project> + <ProjectReference Include="..\..\src\FSharp.MetadataFormat\FSharp.MetadataFormat.fsproj"> + <Name>FSharp.MetadataFormat</Name> + <Project>{bc4946ba-2724-4524-ac50-dfc49ee154a1}</Project> + <Private>True</Private> </ProjectReference> </ItemGroup> <Choose> @@ -136,6 +134,71 @@ </ItemGroup> </When> </Choose> + <Choose> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v3.0' Or $(TargetFrameworkVersion) == 'v3.5')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + </Choose> <Choose> <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> <ItemGroup> @@ -147,18 +210,65 @@ </ItemGroup> </When> </Choose> - <ItemGroup> - <Reference Include="nunit.framework"> - <HintPath>..\..\packages\NUnit\lib\nunit.framework.dll</HintPath> - <Private>True</Private> - <Paket>True</Paket> - </Reference> - </ItemGroup> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'"> <ItemGroup> <Reference Include="RazorEngine"> - <HintPath>..\..\packages\RazorEngine\lib\net40\RazorEngine.dll</HintPath> + <HintPath>..\..\packages\RazorEngine\lib\net45\RazorEngine.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + </Choose> + <Choose> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'"> + <ItemGroup> + <Reference Include="FsUnit.NUnit"> + <HintPath>..\..\packages\test\FsUnit\lib\net45\FsUnit.NUnit.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + </Choose> + <Choose> + <When Condition="$(TargetFrameworkIdentifier) == 'MonoAndroid'"> + <ItemGroup> + <Reference Include="nunit.framework"> + <HintPath>..\..\packages\test\NUnit\lib\MonoAndroid\nunit.framework.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v3.0')"> + <ItemGroup> + <Reference Include="NUnit.System.Linq"> + <HintPath>..\..\packages\test\NUnit\lib\net20\NUnit.System.Linq.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + <Reference Include="nunit.framework"> + <HintPath>..\..\packages\test\NUnit\lib\net20\nunit.framework.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'"> + <ItemGroup> + <Reference Include="nunit.framework"> + <HintPath>..\..\packages\test\NUnit\lib\net35\nunit.framework.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'"> + <ItemGroup> + <Reference Include="nunit.framework"> + <HintPath>..\..\packages\test\NUnit\lib\net40\nunit.framework.dll</HintPath> <Private>True</Private> <Paket>True</Paket> </Reference> @@ -166,8 +276,35 @@ </When> <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> <ItemGroup> - <Reference Include="RazorEngine"> - <HintPath>..\..\packages\RazorEngine\lib\net45\RazorEngine.dll</HintPath> + <Reference Include="nunit.framework"> + <HintPath>..\..\packages\test\NUnit\lib\net45\nunit.framework.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.6') Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0')"> + <ItemGroup> + <Reference Include="nunit.framework"> + <HintPath>..\..\packages\test\NUnit\lib\netstandard1.6\nunit.framework.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5')) Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')"> + <ItemGroup> + <Reference Include="nunit.framework"> + <HintPath>..\..\packages\test\NUnit\lib\portable-net45+win8+wp8+wpa81\nunit.framework.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="$(TargetFrameworkIdentifier) == 'Xamarin.iOS'"> + <ItemGroup> + <Reference Include="nunit.framework"> + <HintPath>..\..\packages\test\NUnit\lib\Xamarin.iOS10\nunit.framework.dll</HintPath> <Private>True</Private> <Paket>True</Paket> </Reference> diff --git a/tests/FSharp.MetadataFormat.Tests/Tests.fs b/tests/FSharp.MetadataFormat.Tests/Tests.fs index a3424ed8f..d10afc7ad 100755 --- a/tests/FSharp.MetadataFormat.Tests/Tests.fs +++ b/tests/FSharp.MetadataFormat.Tests/Tests.fs @@ -1,10 +1,13 @@ #if INTERACTIVE #I "../../bin" +#r "FSharp.Formatting.Common.dll" #r "FSharp.MetadataFormat.dll" +#r "FSharp.Formatting.Razor.dll" #r "FSharp.Compiler.Service.dll" #r "RazorEngine.dll" -#r "../../packages/NUnit/lib/nunit.framework.dll" -#load "../Common/FsUnit.fs" +#r "../../packages/test/NUnit/lib/net45/nunit.framework.dll" +#r "../../packages/test/FsUnit/lib/net45/FsUnit.NUnit.dll" + #else module FSharp.MetadataFormat.Tests #endif @@ -14,12 +17,13 @@ open System.IO open NUnit.Framework open FSharp.MetadataFormat open FSharp.Formatting.Razor +open FsUnitTyped // -------------------------------------------------------------------------------------- // Run the metadata formatter on sample project // -------------------------------------------------------------------------------------- -let (@@) a b = Path.Combine(a, b) +let (</>) a b = Path.Combine(a, b) let root = __SOURCE_DIRECTORY__ @@ -28,9 +32,13 @@ let getOutputDir() = File.Delete(tempFile) Directory.CreateDirectory(tempFile).FullName +let removeWhiteSpace (str:string) = + str.Replace("\n", "").Replace("\r", "").Replace(" ", "") + + let layoutRoots = - [ root @@ "../../misc/templates" - root @@ "../../misc/templates/reference" ] + [ root </> "../../misc/templates" + root </> "../../misc/templates/reference" ] let info = [ "project-name", "FSharp.ProjectScaffold" @@ -42,10 +50,10 @@ let info = [<Test>] let ``MetadataFormat works on sample Deedle assembly``() = - let library = root @@ "files" @@ "Deedle.dll" + let library = root </> "files" </> "Deedle.dll" let output = getOutputDir() RazorMetadataFormat.Generate - ( library, output, layoutRoots, info, libDirs = [root @@ "../../lib"], + ( library, output, layoutRoots, info, libDirs = [root </> "../../lib"], sourceRepo = "https://github.com/BlueMountainCapital/Deedle/tree/master/", sourceFolder = "c:/dev/FSharp.DataFrame") let files = Directory.GetFiles(output) @@ -60,26 +68,24 @@ let ``MetadataFormat works on sample Deedle assembly``() = System.Diagnostics.Process.Start(output) #endif -// Ignore by default to make tests run reasonably fast -[<Test; Ignore>] + +[<Test; Ignore "Ignore by default to make tests run reasonably fast">] let ``MetadataFormat works on sample FAKE assembly``() = - let library = root @@ "files" @@ "FAKE" @@ "FakeLib.dll" + let library = root </> "files" </> "FAKE" </> "FakeLib.dll" let output = getOutputDir() RazorMetadataFormat.Generate(library, output, layoutRoots, info) let files = Directory.GetFiles(output) files |> Seq.length |> shouldEqual 166 -let removeWhiteSpace (str:string) = - str.Replace("\n", "").Replace("\r", "").Replace(" ", "") [<Test>] let ``MetadataFormat works on two sample F# assemblies``() = - let binDir = root @@ "files" @@ "FsLib" @@ "bin" @@ "Debug" + let binDir = root </> "files" </> "FsLib" </> "bin" </> "Debug" let libraries = - [ binDir @@ "FsLib1.dll" - binDir @@ "FsLib2.dll" ] + [ binDir </> "FsLib1.dll" + binDir </> "FsLib2.dll" ] let output = getOutputDir() - RazorMetadataFormat.Generate(libraries, output, layoutRoots, info, libDirs = [binDir; root @@ "../../lib"]) + RazorMetadataFormat.Generate(libraries, output, layoutRoots, info, libDirs = [binDir; root </> "../../lib"]) let fileNames = Directory.GetFiles(output) let files = dict [ for f in fileNames -> Path.GetFileName(f), File.ReadAllText(f) ] @@ -103,17 +109,17 @@ let ``MetadataFormat works on two sample F# assemblies``() = #endif // Check that methods with no arguments are correctly generated (#113) - files.["fslib-record.html"] |> should notContain "Foo2(arg1)" + files.["fslib-record.html"] |> shouldNotContainText "Foo2(arg1)" files.["fslib-record.html"] |> should contain "Foo2()" files.["fslib-record.html"] |> should contain "<strong>Signature:</strong> unit -> int" files.["fslib-class.html"] |> should contain "new()" files.["fslib-class.html"] |> should contain "<strong>Signature:</strong> unit -> Class" // Check that properties are correctly generated (#114) - files.["fslib-class.html"] |> removeWhiteSpace |> should notContain ">Member(arg1)<" - files.["fslib-class.html"] |> removeWhiteSpace |> should notContain ">Member()<" - files.["fslib-class.html"] |> removeWhiteSpace |> should contain ">Member<" - files.["fslib-class.html"] |> should notContain "<strong>Signature:</strong> unit -> int" + files.["fslib-class.html"] |> removeWhiteSpace |> shouldNotContainText ">Member(arg1)<" + files.["fslib-class.html"] |> removeWhiteSpace |> shouldNotContainText ">Member()<" + files.["fslib-class.html"] |> removeWhiteSpace |> shouldContainText ">Member<" + files.["fslib-class.html"] |> shouldNotContainText "<strong>Signature:</strong> unit -> int" files.["fslib-class.html"] |> should contain "<strong>Signature:</strong> int" #if INTERACTIVE @@ -122,16 +128,16 @@ let ``MetadataFormat works on two sample F# assemblies``() = [<Test>] let ``MetadataFormat generates Go to GitHub source links``() = - let binDir = root @@ "files" @@ "FsLib" @@ "bin" @@ "Debug" + let binDir = root </> "files" </> "FsLib" </> "bin" </> "Debug" let libraries = - [ binDir @@ "FsLib1.dll" - binDir @@ "FsLib2.dll" ] + [ binDir </> "FsLib1.dll" + binDir </> "FsLib2.dll" ] let output = getOutputDir() printfn "Output: %s" output RazorMetadataFormat.Generate - ( libraries, output, layoutRoots, info, libDirs = [binDir; root @@ "../../lib"], + ( libraries, output, layoutRoots, info, libDirs = [binDir; root </> "../../lib"], sourceRepo = "https://github.com/tpetricek/FSharp.Formatting/tree/master", - sourceFolder = root @@ "../.." ) + sourceFolder = (root </> "../..") ) let fileNames = Directory.GetFiles(output) let files = dict [ for f in fileNames -> Path.GetFileName(f), File.ReadAllText(f) ] files.["fslib-class.html"] |> should contain "github-link" @@ -148,16 +154,16 @@ let ``MetadataFormat generates Go to GitHub source links``() = [<Test>] let ``MetadataFormat test that cref generation works``() = let libraries = - [ root @@ "files/crefLib/bin/Debug" @@ "crefLib1.dll" - root @@ "files/crefLib/bin/Debug" @@ "crefLib2.dll" - root @@ "files/crefLib/bin/Debug" @@ "crefLib3.dll" - root @@ "files/crefLib/bin/Debug" @@ "crefLib4.dll" ] + [ root </> "files/crefLib/bin/Debug" </> "crefLib1.dll" + root </> "files/crefLib/bin/Debug" </> "crefLib2.dll" + root </> "files/crefLib/bin/Debug" </> "crefLib3.dll" + root </> "files/crefLib/bin/Debug" </> "crefLib4.dll" ] let output = getOutputDir() printfn "Output: %s" output RazorMetadataFormat.Generate - ( libraries, output, layoutRoots, info, libDirs = [root @@ "../../lib"], + ( libraries, output, layoutRoots, info, libDirs = [root </> "../../lib"], sourceRepo = "https://github.com/tpetricek/FSharp.Formatting/tree/master", - sourceFolder = __SOURCE_DIRECTORY__ @@ "../..", + sourceFolder = (__SOURCE_DIRECTORY__ </> "../.."), markDownComments = false ) let fileNames = Directory.GetFiles(output) let files = dict [ for f in fileNames -> Path.GetFileName(f), File.ReadAllText(f) ] @@ -221,13 +227,13 @@ let ``MetadataFormat test that cref generation works``() = [<Test>] let ``MetadataFormat test that csharp (publiconly) support works``() = let libraries = - [ root @@ "files/csharpSupport/bin/Debug" @@ "csharpSupport.dll" ] + [ root </> "files/csharpSupport/bin/Debug" </> "csharpSupport.dll" ] let output = getOutputDir() printfn "Output: %s" output RazorMetadataFormat.Generate - ( libraries, output, layoutRoots, info, libDirs = [root @@ "../../lib"], + ( libraries, output, layoutRoots, info, libDirs = [root </> "../../lib"], sourceRepo = "https://github.com/tpetricek/FSharp.Formatting/tree/master", - sourceFolder = __SOURCE_DIRECTORY__ @@ "../..", + sourceFolder = (__SOURCE_DIRECTORY__ </> "../.."), publicOnly = true, markDownComments = false ) let fileNames = Directory.GetFiles(output) @@ -271,17 +277,17 @@ let ``MetadataFormat test that csharp (publiconly) support works``() = #endif -[<Ignore>] // Ignored because publicOnly=false is currently not working, see https://github.com/tpetricek/FSharp.Formatting/pull/259 +[<Ignore "Ignored because publicOnly=false is currently not working, see https://github.com/tpetricek/FSharp.Formatting/pull/259" >] [<Test>] let ``MetadataFormat test that csharp support works``() = let libraries = - [ root @@ "files/csharpSupport/bin/Debug" @@ "csharpSupport.dll" ] + [ root </> "files/csharpSupport/bin/Debug" </> "csharpSupport.dll" ] let output = getOutputDir() printfn "Output: %s" output RazorMetadataFormat.Generate - ( libraries, output, layoutRoots, info, libDirs = [root @@ "../../lib"], + ( libraries, output, layoutRoots, info, libDirs = [root </> "../../lib"], sourceRepo = "https://github.com/tpetricek/FSharp.Formatting/tree/master", - sourceFolder = __SOURCE_DIRECTORY__ @@ "../..", + sourceFolder = (__SOURCE_DIRECTORY__ </> "../.."), publicOnly = false, markDownComments = false ) let fileNames = Directory.GetFiles(output) @@ -327,10 +333,10 @@ let ``MetadataFormat test that csharp support works``() = [<Test>] let ``MetadataFormat process XML comments in two sample F# assemblies``() = let libraries = - [ root @@ "files/TestLib/bin/Debug" @@ "TestLib1.dll" - root @@ "files/TestLib/bin/Debug" @@ "TestLib2.dll" ] + [ root </> "files/TestLib/bin/Debug" </> "TestLib1.dll" + root </> "files/TestLib/bin/Debug" </> "TestLib2.dll" ] let output = getOutputDir() - RazorMetadataFormat.Generate(libraries, output, layoutRoots, info, libDirs = [root @@ "../../lib"], markDownComments = false) + RazorMetadataFormat.Generate(libraries, output, layoutRoots, info, libDirs = [root </> "../../lib"], markDownComments = false) let fileNames = Directory.GetFiles(output) let files = dict [ for f in fileNames -> Path.GetFileName(f), File.ReadAllText(f) ] files.["fslib-class.html"] |> should contain "Readonly int property" @@ -347,9 +353,9 @@ let ``MetadataFormat process XML comments in two sample F# assemblies``() = [<Test>] let ``MetadataFormat highlights code snippets in Markdown comments``() = - let library = root @@ "files/TestLib/bin/Debug" @@ "TestLib1.dll" + let library = root </> "files/TestLib/bin/Debug" </> "TestLib1.dll" let output = getOutputDir() - RazorMetadataFormat.Generate([library], output, layoutRoots, info, libDirs = [root @@ "../../lib"], markDownComments = true) + RazorMetadataFormat.Generate([library], output, layoutRoots, info, libDirs = [root </> "../../lib"], markDownComments = true) let fileNames = Directory.GetFiles(output) let files = dict [ for f in fileNames -> Path.GetFileName(f), File.ReadAllText(f) ] files.["fslib-myclass.html"] |> should contain """<span class="k">let</span>""" @@ -358,10 +364,10 @@ let ``MetadataFormat highlights code snippets in Markdown comments``() = [<Test>] let ``MetadataFormat handles c# dlls`` () = - let library = root @@ "files" @@ "CSharpFormat.dll" + let library = root </> "files" </> "CSharpFormat.dll" let output = getOutputDir() RazorMetadataFormat.Generate - ( library, output, layoutRoots, info, libDirs = [root @@ "../../lib"]) + ( library, output, layoutRoots, info, libDirs = [root </> "../../lib"]) let files = Directory.GetFiles(output) let optIndex = files |> Seq.tryFind (fun s -> s.EndsWith "index.html") @@ -373,10 +379,10 @@ let ``MetadataFormat handles c# dlls`` () = [<Test>] let ``MetadataFormat processes C# types and includes xml comments in docs`` () = - let library = root @@ "files" @@ "CSharpFormat.dll" + let library = root </> "files" </> "CSharpFormat.dll" let output = getOutputDir() RazorMetadataFormat.Generate - ( library, output, layoutRoots, info, libDirs = [root @@ "../../lib"]) + ( library, output, layoutRoots, info, libDirs = [root </> "../../lib"]) let fileNames = Directory.GetFiles(output) let files = dict [ for f in fileNames -> Path.GetFileName(f), File.ReadAllText(f) ] files.["index.html"] |> should contain "CLikeFormat" @@ -384,10 +390,10 @@ let ``MetadataFormat processes C# types and includes xml comments in docs`` () = [<Test>] let ``MetadataFormat processes C# properties on types and includes xml comments in docs`` () = - let library = root @@ "files" @@ "CSharpFormat.dll" + let library = root </> "files" </> "CSharpFormat.dll" let output = getOutputDir() RazorMetadataFormat.Generate - ( library, output, layoutRoots, info, libDirs = [root @@ "../../lib"]) + ( library, output, layoutRoots, info, libDirs = [root </> "../../lib"]) let fileNames = Directory.GetFiles(output) let files = dict [ for f in fileNames -> Path.GetFileName(f), File.ReadAllText(f) ] @@ -396,10 +402,10 @@ let ``MetadataFormat processes C# properties on types and includes xml comments [<Test>] let ``MetadataFormat generates module link in nested types``() = - let binDir = root @@ "files/FsLib/bin/Debug" - let library = binDir @@ "FsLib2.dll" + let binDir = root </> "files/FsLib/bin/Debug" + let library = binDir </> "FsLib2.dll" let output = getOutputDir() - RazorMetadataFormat.Generate([library], output, layoutRoots, info, libDirs = [binDir; root @@ "../../lib"], markDownComments = true) + RazorMetadataFormat.Generate([library], output, layoutRoots, info, libDirs = [binDir; root </> "../../lib"], markDownComments = true) let fileNames = Directory.GetFiles(output) let files = dict [ for f in fileNames -> Path.GetFileName(f), File.ReadAllText(f) ] @@ -415,7 +421,7 @@ let ``MetadataFormat generates module link in nested types``() = files.["fslib-nested-nestedtype.html"] |> should contain "<a href=\"fslib-nested.html\">Nested</a>" // Only for nested types - files.["fslib-class.html"] |> should notContain "Parent Module:" + files.["fslib-class.html"] |> shouldNotContainText "Parent Module:" // Check that the link to the module is correctly generated for types in nested modules files.["fslib-nested-submodule-verynestedtype.html"] |> should contain "Parent Module:" @@ -430,11 +436,11 @@ open FSharp.Formatting.Common [<Test>] let ``MetadataFormat omit works without markdown``() = - let binDir = root @@ "files/FsLib/bin/Debug" - let library = binDir @@ "FsLib2.dll" + let binDir = root </> "files/FsLib/bin/Debug" + let library = binDir </> "FsLib2.dll" let output = getOutputDir() RazorMetadataFormat.Generate - ([library], output, layoutRoots, info, libDirs = [binDir; root @@ "../../lib"], + ([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) ] @@ -443,11 +449,11 @@ let ``MetadataFormat omit works without markdown``() = [<Test>] let ``MetadataFormat test FsLib1``() = - let binDir = root @@ "files/FsLib/bin/Debug" - let library = binDir @@ "FsLib1.dll" + let binDir = root </> "files/FsLib/bin/Debug" + let library = binDir </> "FsLib1.dll" let output = getOutputDir() RazorMetadataFormat.Generate - ([ library ], output, layoutRoots, info, libDirs = [ binDir; root @@ "../../lib" ], + ([ library ], output, layoutRoots, info, libDirs = [ binDir; root </> "../../lib" ], markDownComments = false) let fileNames = Directory.GetFiles(output) @@ -458,9 +464,9 @@ let ``MetadataFormat test FsLib1``() = // -------------------Indirect links---------------------------------- [<Test>] let ``Metadata generates cross-type links for Indirect Links``() = - let library = root @@ "files/FsLib/bin/Debug" @@ "FsLib2.dll" + let library = root </> "files/FsLib/bin/Debug" </> "FsLib2.dll" let output = getOutputDir() - RazorMetadataFormat.Generate([library], output, layoutRoots, info, libDirs = [root @@ "../../lib"], markDownComments = true) + RazorMetadataFormat.Generate([library], output, layoutRoots, info, libDirs = [root </> "../../lib"], markDownComments = true) let fileNames = Directory.GetFiles(output) let files = dict [ for f in fileNames -> Path.GetFileName(f), File.ReadAllText(f) ] @@ -485,9 +491,9 @@ let ``Metadata generates cross-type links for Indirect Links``() = // -------------------Inline code---------------------------------- [<Test>] let ``Metadata generates cross-type links for Inline Code``() = - let library = root @@ "files/FsLib/bin/Debug" @@ "FsLib2.dll" + let library = root </> "files/FsLib/bin/Debug" </> "FsLib2.dll" let output = getOutputDir() - RazorMetadataFormat.Generate([library], output, layoutRoots, info, libDirs = [root @@ "../../lib"], markDownComments = true) + RazorMetadataFormat.Generate([library], output, layoutRoots, info, libDirs = [root </> "../../lib"], markDownComments = true) let fileNames = Directory.GetFiles(output) let files = dict [ for f in fileNames -> Path.GetFileName(f), File.ReadAllText(f) ] diff --git a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.fsproj b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.fsproj index 14ed6d95b..a29006e8f 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.fsproj @@ -8,9 +8,10 @@ <OutputType>Library</OutputType> <RootNamespace>FsLib</RootNamespace> <AssemblyName>FsLib1</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion> <Name>FsLib1</Name> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -33,9 +34,6 @@ </PropertyGroup> <ItemGroup> <Reference Include="mscorlib" /> - <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <Private>False</Private> - </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Numerics" /> @@ -44,6 +42,7 @@ <Compile Include="Library1.fs" /> </ItemGroup> <PropertyGroup> + <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">14.0</VisualStudioVersion> <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion> </PropertyGroup> <Choose> @@ -52,6 +51,11 @@ <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath> </PropertyGroup> </When> + <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets')"> + <PropertyGroup> + <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath> + </PropertyGroup> + </When> <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')"> <PropertyGroup> <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath> @@ -63,7 +67,7 @@ </PropertyGroup> </When> </Choose> - <Import Project="$(FSharpTargetsPath)" /> + <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> @@ -92,10 +96,64 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v3.0' Or $(TargetFrameworkVersion) == 'v3.5')"> <ItemGroup> - <Reference Include="System.Web.Razor"> - <HintPath>..\..\..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll</HintPath> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath> <Private>True</Private> <Paket>True</Paket> </Reference> @@ -103,16 +161,18 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> <ItemGroup> - <Reference Include="RazorEngine"> - <HintPath>..\..\..\..\packages\RazorEngine\lib\net40\RazorEngine.dll</HintPath> + <Reference Include="System.Web.Razor"> + <HintPath>..\..\..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll</HintPath> <Private>True</Private> <Paket>True</Paket> </Reference> </ItemGroup> </When> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> + </Choose> + <Choose> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'"> <ItemGroup> <Reference Include="RazorEngine"> <HintPath>..\..\..\..\packages\RazorEngine\lib\net45\RazorEngine.dll</HintPath> diff --git a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.paket.references b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.paket.references new file mode 100644 index 000000000..640cf9145 --- /dev/null +++ b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.paket.references @@ -0,0 +1 @@ +FSharp.Core \ 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 7d4412e2e..18254bacd 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj @@ -8,7 +8,7 @@ <OutputType>Library</OutputType> <RootNamespace>FsLib</RootNamespace> <AssemblyName>FsLib2</AssemblyName> - <TargetFrameworkVersion>v4.6</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion> <Name>FsLib1</Name> <TargetFrameworkProfile /> @@ -33,6 +33,7 @@ <DocumentationFile>bin\Release\FsLib.XML</DocumentationFile> </PropertyGroup> <PropertyGroup> + <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">14.0</VisualStudioVersion> <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion> </PropertyGroup> <Choose> @@ -41,6 +42,11 @@ <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath> </PropertyGroup> </When> + <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets')"> + <PropertyGroup> + <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath> + </PropertyGroup> + </When> <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')"> <PropertyGroup> <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath> @@ -52,7 +58,7 @@ </PropertyGroup> </When> </Choose> - <Import Project="$(FSharpTargetsPath)" /> + <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> @@ -66,9 +72,6 @@ </ItemGroup> <ItemGroup> <Reference Include="mscorlib" /> - <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <Private>False</Private> - </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Numerics" /> @@ -94,10 +97,64 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v3.0' Or $(TargetFrameworkVersion) == 'v3.5')"> <ItemGroup> - <Reference Include="System.Web.Razor"> - <HintPath>..\..\..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll</HintPath> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath> + <Private>True</Private> + <Paket>True</Paket> + </Reference> + </ItemGroup> + </When> + <When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')"> + <ItemGroup> + <Reference Include="FSharp.Core"> + <HintPath>..\..\..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath> <Private>True</Private> <Paket>True</Paket> </Reference> @@ -105,16 +162,18 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> <ItemGroup> - <Reference Include="RazorEngine"> - <HintPath>..\..\..\..\packages\RazorEngine\lib\net40\RazorEngine.dll</HintPath> + <Reference Include="System.Web.Razor"> + <HintPath>..\..\..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll</HintPath> <Private>True</Private> <Paket>True</Paket> </Reference> </ItemGroup> </When> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> + </Choose> + <Choose> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'"> <ItemGroup> <Reference Include="RazorEngine"> <HintPath>..\..\..\..\packages\RazorEngine\lib\net45\RazorEngine.dll</HintPath> diff --git a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.paket.references b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.paket.references new file mode 100644 index 000000000..640cf9145 --- /dev/null +++ b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.paket.references @@ -0,0 +1 @@ +FSharp.Core \ No newline at end of file diff --git a/tests/FSharp.MetadataFormat.Tests/files/FsLib/app.config b/tests/FSharp.MetadataFormat.Tests/files/FsLib/app.config new file mode 100644 index 000000000..a4daf5445 --- /dev/null +++ b/tests/FSharp.MetadataFormat.Tests/files/FsLib/app.config @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> +<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <Paket>True</Paket> + <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.0.0" /> + </dependentAssembly> +</assemblyBinding></runtime></configuration> diff --git a/tests/FSharp.MetadataFormat.Tests/files/FsLib/paket.references b/tests/FSharp.MetadataFormat.Tests/files/FsLib/paket.references index 1570c9dec..c954cff01 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/FsLib/paket.references +++ b/tests/FSharp.MetadataFormat.Tests/files/FsLib/paket.references @@ -1,3 +1,4 @@ FSharp.Compiler.Service Microsoft.AspNet.Razor RazorEngine +FSharp.Core \ No newline at end of file diff --git a/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib1.fsproj b/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib1.fsproj index 655dfc1bf..ba24156e0 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib1.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib1.fsproj @@ -8,9 +8,10 @@ <OutputType>Library</OutputType> <RootNamespace>TestLib</RootNamespace> <AssemblyName>TestLib1</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion> <Name>TestLib1</Name> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -32,6 +33,7 @@ <DocumentationFile>bin\Release\TestLib1.XML</DocumentationFile> </PropertyGroup> <PropertyGroup> + <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">14.0</VisualStudioVersion> <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion> </PropertyGroup> <Choose> @@ -40,6 +42,11 @@ <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath> </PropertyGroup> </When> + <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets')"> + <PropertyGroup> + <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath> + </PropertyGroup> + </When> <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')"> <PropertyGroup> <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath> @@ -51,10 +58,11 @@ </PropertyGroup> </When> </Choose> - <Import Project="$(FSharpTargetsPath)" /> + <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" /> <ItemGroup> <Compile Include="Library1.fs" /> <None Include="paket.references" /> + <Content Include="app.config" /> </ItemGroup> <ItemGroup> <Reference Include="mscorlib" /> @@ -104,16 +112,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'"> - <ItemGroup> - <Reference Include="RazorEngine"> - <HintPath>..\..\..\..\packages\RazorEngine\lib\net40\RazorEngine.dll</HintPath> - <Private>True</Private> - <Paket>True</Paket> - </Reference> - </ItemGroup> - </When> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'"> <ItemGroup> <Reference Include="RazorEngine"> <HintPath>..\..\..\..\packages\RazorEngine\lib\net45\RazorEngine.dll</HintPath> diff --git a/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib2.fsproj b/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib2.fsproj index d119aa3f5..ae09ed2b1 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib2.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib2.fsproj @@ -8,9 +8,10 @@ <OutputType>Library</OutputType> <RootNamespace>TestLib</RootNamespace> <AssemblyName>TestLib2</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion> <Name>TestLib1</Name> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -43,12 +44,21 @@ <ItemGroup> <Compile Include="Library2.fs" /> </ItemGroup> + <PropertyGroup> + <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">14.0</VisualStudioVersion> + <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion> + </PropertyGroup> <Choose> <When Condition="'$(VisualStudioVersion)' != '11.0' and Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')"> <PropertyGroup> <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath> </PropertyGroup> </When> + <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets')"> + <PropertyGroup> + <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath> + </PropertyGroup> + </When> <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')"> <PropertyGroup> <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath> @@ -60,7 +70,7 @@ </PropertyGroup> </When> </Choose> - <Import Project="$(FSharpTargetsPath)" /> + <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> @@ -100,16 +110,7 @@ </When> </Choose> <Choose> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'"> - <ItemGroup> - <Reference Include="RazorEngine"> - <HintPath>..\..\..\..\packages\RazorEngine\lib\net40\RazorEngine.dll</HintPath> - <Private>True</Private> - <Paket>True</Paket> - </Reference> - </ItemGroup> - </When> - <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')"> + <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'"> <ItemGroup> <Reference Include="RazorEngine"> <HintPath>..\..\..\..\packages\RazorEngine\lib\net45\RazorEngine.dll</HintPath> diff --git a/tests/FSharp.MetadataFormat.Tests/files/TestLib/app.config b/tests/FSharp.MetadataFormat.Tests/files/TestLib/app.config new file mode 100644 index 000000000..a4daf5445 --- /dev/null +++ b/tests/FSharp.MetadataFormat.Tests/files/TestLib/app.config @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> +<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <Paket>True</Paket> + <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.0.0" /> + </dependentAssembly> +</assemblyBinding></runtime></configuration> diff --git a/tests/FSharp.MetadataFormat.Tests/files/TestLib/paket.references b/tests/FSharp.MetadataFormat.Tests/files/TestLib/paket.references index 1570c9dec..c954cff01 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/TestLib/paket.references +++ b/tests/FSharp.MetadataFormat.Tests/files/TestLib/paket.references @@ -1,3 +1,4 @@ FSharp.Compiler.Service Microsoft.AspNet.Razor RazorEngine +FSharp.Core \ No newline at end of file diff --git a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.fsproj b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.fsproj index 8ac31c269..8304053c2 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.fsproj @@ -8,9 +8,10 @@ <OutputType>Library</OutputType> <RootNamespace>crefLib1</RootNamespace> <AssemblyName>crefLib1</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion> <Name>crefLib1</Name> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -33,9 +34,6 @@ </PropertyGroup> <ItemGroup> <Reference Include="mscorlib" /> - <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <Private>False</Private> - </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Numerics" /> @@ -44,6 +42,7 @@ <Compile Include="Library1.fs" /> </ItemGroup> <PropertyGroup> + <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">14.0</VisualStudioVersion> <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion> </PropertyGroup> <Choose> @@ -52,6 +51,11 @@ <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath> </PropertyGroup> </When> + <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets')"> + <PropertyGroup> + <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath> + </PropertyGroup> + </When> <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')"> <PropertyGroup> <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath> @@ -63,7 +67,7 @@ </PropertyGroup> </When> </Choose> - <Import Project="$(FSharpTargetsPath)" /> + <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> diff --git a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.paket.references b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.paket.references new file mode 100644 index 000000000..640cf9145 --- /dev/null +++ b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.paket.references @@ -0,0 +1 @@ +FSharp.Core \ No newline at end of file diff --git a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.fsproj b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.fsproj index 6773167ff..ee4ba481c 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.fsproj +++ b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.fsproj @@ -9,9 +9,10 @@ <OutputType>Library</OutputType> <RootNamespace>crefLib2</RootNamespace> <AssemblyName>crefLib2</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion> <Name>crefLib2</Name> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -34,9 +35,6 @@ </PropertyGroup> <ItemGroup> <Reference Include="mscorlib" /> - <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <Private>False</Private> - </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Numerics" /> @@ -52,6 +50,7 @@ </ProjectReference> </ItemGroup> <PropertyGroup> + <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">14.0</VisualStudioVersion> <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion> </PropertyGroup> <Choose> @@ -60,6 +59,11 @@ <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath> </PropertyGroup> </When> + <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets')"> + <PropertyGroup> + <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath> + </PropertyGroup> + </When> <When Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')"> <PropertyGroup> <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath> @@ -71,7 +75,7 @@ </PropertyGroup> </When> </Choose> - <Import Project="$(FSharpTargetsPath)" /> + <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> diff --git a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.paket.references b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.paket.references new file mode 100644 index 000000000..640cf9145 --- /dev/null +++ b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.paket.references @@ -0,0 +1 @@ +FSharp.Core \ No newline at end of file diff --git a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib3.csproj b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib3.csproj index b836e5e6b..0b3865235 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib3.csproj +++ b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib3.csproj @@ -9,8 +9,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>crefLib3</RootNamespace> <AssemblyName>crefLib3</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -21,6 +22,7 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <DocumentationFile>bin\Debug\crefLib3.XML</DocumentationFile> + <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -29,6 +31,7 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <ItemGroup> <Reference Include="System" /> diff --git a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib4.csproj b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib4.csproj index 5e2a9253c..219c4121c 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib4.csproj +++ b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib4.csproj @@ -4,13 +4,15 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <BuildInParallel Condition="'$(BuildInParallel)' == '' ">false</BuildInParallel> <ProjectGuid>{98624699-1B2F-4636-A3F7-EC72343CB2FD}</ProjectGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>crefLib4</RootNamespace> <AssemblyName>crefLib4</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -21,6 +23,7 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <DocumentationFile>bin\Debug\crefLib4.XML</DocumentationFile> + <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -29,6 +32,7 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <ItemGroup> <Reference Include="System" /> diff --git a/tests/FSharp.MetadataFormat.Tests/files/csharpSupport/csharpSupport.csproj b/tests/FSharp.MetadataFormat.Tests/files/csharpSupport/csharpSupport.csproj index 886bf316e..bcc196310 100644 --- a/tests/FSharp.MetadataFormat.Tests/files/csharpSupport/csharpSupport.csproj +++ b/tests/FSharp.MetadataFormat.Tests/files/csharpSupport/csharpSupport.csproj @@ -9,8 +9,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>csharpSupport</RootNamespace> <AssemblyName>csharpSupport</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -21,6 +22,7 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>0</WarningLevel> <DocumentationFile>bin\Debug\csharpSupport.xml</DocumentationFile> + <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -29,6 +31,7 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <ItemGroup> <Reference Include="System" /> diff --git a/tests/FSharp.MetadataFormat.Tests/paket.references b/tests/FSharp.MetadataFormat.Tests/paket.references index 513714db7..56c21b9b8 100644 --- a/tests/FSharp.MetadataFormat.Tests/paket.references +++ b/tests/FSharp.MetadataFormat.Tests/paket.references @@ -1,4 +1,7 @@ +FSharp.Core FSharp.Compiler.Service Microsoft.AspNet.Razor -NUnit RazorEngine +group Test +FsUnit +NUnit