diff --git a/.gitignore b/.gitignore index 93a235811..13b12dff3 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,5 @@ release.cmd *.svclog .paket/paket.exe -fsbuild.targets \ No newline at end of file +fsbuild.targets +*.sln.tddstud10.user diff --git a/FSharp.Formatting.TestHelpers/AssemblyInfo.fs b/FSharp.Formatting.TestHelpers/AssemblyInfo.fs new file mode 100644 index 000000000..13043cde8 --- /dev/null +++ b/FSharp.Formatting.TestHelpers/AssemblyInfo.fs @@ -0,0 +1,41 @@ +namespace FSharp.Formatting.AssemblyInfo + +open System.Reflection +open System.Runtime.CompilerServices +open System.Runtime.InteropServices + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[] +[] +[] +[] +[] +[] +[] +[] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [] +[] +[] + +do + () \ No newline at end of file diff --git a/FSharp.Formatting.TestHelpers/FSharp.Formatting.TestHelpers.fsproj b/FSharp.Formatting.TestHelpers/FSharp.Formatting.TestHelpers.fsproj new file mode 100644 index 000000000..0df820b60 --- /dev/null +++ b/FSharp.Formatting.TestHelpers/FSharp.Formatting.TestHelpers.fsproj @@ -0,0 +1,86 @@ + + + + + Debug + AnyCPU + 2.0 + 0b552f94-33fe-4037-9c17-1eb2a885f263 + Library + FSharp.Formatting.TestHelpers + FSharp.Formatting.TestHelpers + v4.6.1 + 4.4.1.0 + true + FSharp.Formatting.TestHelpers + + + true + full + false + false + bin\$(Configuration)\ + DEBUG;TRACE + 3 + bin\$(Configuration)\$(AssemblyName).XML + + + pdbonly + true + true + bin\$(Configuration)\ + TRACE + 3 + bin\$(Configuration)\$(AssemblyName).XML + + + 11 + + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + + + + + + + + + + + + FSharp.Core + FSharp.Core.dll + $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + + + + + ..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll + + + + + FSharp.Formatting.Common + {91bad90e-bf3b-4646-a1a7-1568f8f25075} + True + + + + \ No newline at end of file diff --git a/FSharp.Formatting.TestHelpers/Script.fsx b/FSharp.Formatting.TestHelpers/Script.fsx new file mode 100644 index 000000000..66fc6a65e --- /dev/null +++ b/FSharp.Formatting.TestHelpers/Script.fsx @@ -0,0 +1,8 @@ +// Learn more about F# at http://fsharp.org. See the 'F# Tutorial' project +// for more guidance on F# programming. + +#load "Library1.fs" +open FSharp.Formatting.TestHelpers + +// Define your library scripting code here + diff --git a/FSharp.Formatting.TestHelpers/TestHelpers.fs b/FSharp.Formatting.TestHelpers/TestHelpers.fs new file mode 100644 index 000000000..fb723ec9b --- /dev/null +++ b/FSharp.Formatting.TestHelpers/TestHelpers.fs @@ -0,0 +1,41 @@ +module FSharp.Formatting.TestHelpers + +open System.Diagnostics +open FSharp.Formatting +module Logging = FSharp.Formatting.Common.Log + +// This controlls logging within the test suite ... +let enableLogging() = + let logToConsole = true + let logToFile = false + try + let allTraceOptions = + TraceOptions.Callstack ||| TraceOptions.DateTime ||| TraceOptions.LogicalOperationStack ||| + TraceOptions.ProcessId ||| TraceOptions.ThreadId ||| TraceOptions.Timestamp + let noTraceOptions = TraceOptions.None + let svclogFile = "FSharp.Formatting.svclog" + System.Diagnostics.Trace.AutoFlush <- true + + let setupListener listener = + [ FSharp.Formatting.Common.Log.source + Yaaf.FSharp.Scripting.Log.source ] + |> Seq.iter (fun source -> + source.Switch.Level <- System.Diagnostics.SourceLevels.All + Logging.AddListener listener source) + + if logToConsole then + Logging.ConsoleListener() + |> Logging.SetupListener noTraceOptions System.Diagnostics.SourceLevels.Verbose + |> setupListener + + if logToFile then + if System.IO.File.Exists svclogFile then System.IO.File.Delete svclogFile + Logging.SvclogListener svclogFile + |> Logging.SetupListener allTraceOptions System.Diagnostics.SourceLevels.All + |> setupListener + + // Test that everything works + Logging.infof "FSharp.Formatting Logging setup!" + Yaaf.FSharp.Scripting.Log.infof "Yaaf.FSharp.Scripting Logging setup!" + with e -> + printfn "FSharp.Formatting Logging setup failed: %A" e diff --git a/FSharp.Formatting.TestHelpers/packages.config b/FSharp.Formatting.TestHelpers/packages.config new file mode 100644 index 000000000..8c56e0c54 --- /dev/null +++ b/FSharp.Formatting.TestHelpers/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/FSharp.Formatting.sln b/FSharp.Formatting.sln index 638e76e59..64ed04ed6 100644 --- a/FSharp.Formatting.sln +++ b/FSharp.Formatting.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26403.3 +VisualStudioVersion = 15.0.26403.0 MinimumVisualStudioVersion = 12.0.31101.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{194BD478-0DB5-44F3-A6C2-1FC75D3F3294}" ProjectSection(SolutionItems) = preProject @@ -124,6 +124,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{DE45ED .paket\paket.targets = .paket\paket.targets EndProjectSection EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Formatting.TestHelpers", "FSharp.Formatting.TestHelpers\FSharp.Formatting.TestHelpers.fsproj", "{0B552F94-33FE-4037-9C17-1EB2A885F263}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -214,6 +216,10 @@ Global {C6B3C274-71A8-4239-BA9A-1AF7B2F7C736}.Debug|Any CPU.Build.0 = Debug|Any CPU {C6B3C274-71A8-4239-BA9A-1AF7B2F7C736}.Release|Any CPU.ActiveCfg = Release|Any CPU {C6B3C274-71A8-4239-BA9A-1AF7B2F7C736}.Release|Any CPU.Build.0 = Release|Any CPU + {0B552F94-33FE-4037-9C17-1EB2A885F263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0B552F94-33FE-4037-9C17-1EB2A885F263}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0B552F94-33FE-4037-9C17-1EB2A885F263}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0B552F94-33FE-4037-9C17-1EB2A885F263}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -237,5 +243,6 @@ Global {55728B9D-1EDE-4A40-B439-1EB0B3F77B72} = {4AE0198D-EDE5-40B0-A5CD-FC7B6F891D94} {08029B28-A5EA-42DB-AB4E-9C6BA9EF9441} = {4AE0198D-EDE5-40B0-A5CD-FC7B6F891D94} {98624699-1B2F-4636-A3F7-EC72343CB2FD} = {4AE0198D-EDE5-40B0-A5CD-FC7B6F891D94} + {0B552F94-33FE-4037-9C17-1EB2A885F263} = {8D44B659-E9F7-4CE4-B5DA-D37CDDCD2525} EndGlobalSection EndGlobal diff --git a/README.md b/README.md index 5cfe83ba3..d9218af82 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ documentation and might be a useful inspiration: The library is available under Apache 2.0. For more information see the [License file][1] in the GitHub repository. - [1]: https://github.com/tpetricek/FSharp.Formatting/blob/master/LICENSE.md - [2]: https://github.com/tpetricek/FSharp.Formatting/tree/master/docs - [3]: http://tpetricek.github.com/FSharp.Formatting/ - [4]: http://tpetricek.github.com/FSharp.Formatting/literate.html + [1]: https://github.com/fsprojects/FSharp.Formatting/blob/master/LICENSE.md + [2]: https://github.com/fsprojects/FSharp.Formatting/tree/master/docs + [3]: http://fsprojects.github.io/FSharp.Formatting/ + [4]: http://fsprojects.github.io/FSharp.Formatting/literate.html diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 3924512fd..ed14c20c7 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,7 +1,8 @@ ## 3.0.0-beta01 (1 August, 2016) - MarkdownSpan and MarkdownParagraph now use named DUs - - Add range to MarkdownParagraph and MarkdownSpan (#411) - + - Add range to MarkdownParagraph and MarkdownSpan (https://github.com/tpetricek/FSharp.Formatting/pull/411) + - FSharp.Formatting no longer has a strong dependency on Razor (https://github.com/tpetricek/FSharp.Formatting/pull/425) + - FSharp.Formatting no longer depends on VFPT.Core (https://github.com/tpetricek/FSharp.Formatting/pull/432) ## 2.14.4 (3 June, 2016) - Use `#I __SOURCE_DIRECTORY__` in the loads script (more reliable) @@ -39,28 +40,28 @@ ## 2.13.0 (30 December, 2015) - Be compatible with the common-mark spec for 'Fenced code blocks' and 'Indented code blocks'. - See https://github.com/tpetricek/FSharp.Formatting/pull/343. + See https://github.com/fsprojects/FSharp.Formatting/pull/343. Please follow-up by adding support for more sections of the spec! - Just add the section to https://github.com/tpetricek/FSharp.Formatting/blob/master/tests/FSharp.Markdown.Tests/CommonMarkSpecTest.fs#L20 + Just add the section to https://github.com/fsprojects/FSharp.Formatting/blob/master/tests/FSharp.Markdown.Tests/CommonMarkSpecTest.fs#L20 and fix the newly enabled tests. - - Add CompiledName to members with F# specific naming (https://github.com/tpetricek/FSharp.Formatting/pull/372) + - Add CompiledName to members with F# specific naming (https://github.com/fsprojects/FSharp.Formatting/pull/372) ## 2.12.1 (24 December, 2015) - update dependencies - Upgrade the CommandTool to F# 4 and bundle FSharp.Core with sigdata and optdata. - - Fix crash when a fenced code block starts with an empty line (https://github.com/tpetricek/FSharp.Formatting/pull/361) - - Support for all known xml elements (https://github.com/tpetricek/FSharp.Formatting/pull/331) + - Fix crash when a fenced code block starts with an empty line (https://github.com/fsprojects/FSharp.Formatting/pull/361) + - Support for all known xml elements (https://github.com/fsprojects/FSharp.Formatting/pull/331) ## 2.12.0 (18 October, 2015) - Update dependencies to be compatible with FSharp.Compiler.Service >=1.4.0.3 ## 2.11.1-alpha1 (14 October, 2015) - - Adds methods for cross-type links #330 (https://github.com/tpetricek/FSharp.Formatting/pull/330) + - Adds methods for cross-type links #330 (https://github.com/fsprojects/FSharp.Formatting/pull/330) ## 2.11.0 (28 September, 2015) - - Fix https://github.com/tpetricek/FSharp.Formatting/issues/271 + - Fix https://github.com/fsprojects/FSharp.Formatting/issues/271 - Don't fail as long as we can recover / continue. - - Fix https://github.com/tpetricek/FSharp.Formatting/issues/201 + - Fix https://github.com/fsprojects/FSharp.Formatting/issues/201 ## 2.10.3 (12 September, 2015) - Require compatible F# Compiler Service in Nuspec (fix #337) diff --git a/appveyor.yml b/appveyor.yml index fb6d0032a..5abb70dba 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,19 @@ +image: Visual Studio 2017 init: - git config --global core.autocrlf input +install: + - cinst fake -pre + build_script: - cmd: build.cmd +on_finish: + - ps: (New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\TestResult.xml)) + test: off -version: 0.0.1.{build} artifacts: - path: bin name: bin +nuget: + account_feed: false + project_feed: true diff --git a/build.fsx b/build.fsx index 6ef6bb463..bdd2fdc36 100644 --- a/build.fsx +++ b/build.fsx @@ -380,11 +380,11 @@ Target "DogFoodCommandTool" (fun _ -> [ "page-author", "Matthias Dittrich" "project-author", "Matthias Dittrich" "page-description", "desc" - "github-link", "https://github.com/tpetricek/FSharp.Formatting" + "github-link", "https://github.com/fsprojects/FSharp.Formatting" "project-name", "FSharp.Formatting" - "root", "https://tpetricek.github.io/FSharp.Formatting" + "root", "https://fsprojects.github.io/FSharp.Formatting" "project-nuget", "https://www.nuget.org/packages/FSharp.Formatting/" - "project-github", "https://github.com/tpetricek/FSharp.Formatting" ] + "project-github", "https://github.com/fsprojects/FSharp.Formatting" ] CleanDir "temp/api_docs" let metadataReferenceArgs = commandToolMetadataFormatArgument diff --git a/docs/content/commandline.md b/docs/content/commandline.md index 73afafb3a..51c46e2ea 100644 --- a/docs/content/commandline.md +++ b/docs/content/commandline.md @@ -19,8 +19,7 @@ process, e.g. for resource management reasons.
-Alternatively, you can download the [source as a ZIP file](https://github.com/tpetricek/FSharp.Formatting/zipball/master) -or download the [compiled binaries](https://github.com/tpetricek/FSharp.Formatting/archive/release.zip) as a ZIP. +Alternatively, you can download the [source as a ZIP file](https://github.com/fsprojects/FSharp.Formatting/zipball/master). Using the tool -------------- @@ -84,7 +83,7 @@ according to the concept of [Literate Programming](literate.html). Library documentation command ----------------------------- -The `FSharp.MetadataFormat.Generate` method builds the [library documentation](http://tpetricek.github.io/FSharp.Formatting/metadata.html) by reading +The `FSharp.MetadataFormat.Generate` method builds the [library documentation](http://fsprojects.github.io/FSharp.Formatting/metadata.html) by reading the meta-data from the `*.dll` files of the package and using the XML comments from matching `*.xml` files produced by the F# compiler. [lang=text] @@ -146,9 +145,9 @@ corresponding meta-data files `lib1.xml` and `lib 2.xml`, which are the result o 5. The example assumes that the necessary `template.html` file (and in case, those files it draws in as dependencies) reside in the subdirectory `templates` of your working directory. It is implicitely also assumed that this template does not contain substitution parameters. If you want to use this feature, you need to add the desired parameter list. -For example, if you want to experiment with the [template file of the FSharp.Formatting project](https://github.com/tpetricek/FSharp.Formatting/blob/master/docs/tools/template.html), +For example, if you want to experiment with the [template file of the FSharp.Formatting project](https://github.com/fsprojects/FSharp.Formatting/blob/master/docs/tools/template.html), you copy this file into the subdirectory `templates` of your working directory and specify the -[necessary substitution parameters](https://github.com/tpetricek/FSharp.Formatting/blob/master/docs/tools/generate.fsx#L24) as follows: +[necessary substitution parameters](https://github.com/fsprojects/FSharp.Formatting/blob/master/docs/tools/generate.fsx#L24) as follows:
@@ -176,5 +175,5 @@ As template for the `generate.fsx` file, you should refer to the recommended [te If you already use [FAKE](http://fsharp.github.io) in your project, it is recommended to apply the predefined [FAKE commands](http://fsharp.github.io/FAKE/apidocs/fake-fsharpformatting.html) for the document creation process. FAKE will install the FSharp.Formatting commandline tool as a dependency. Hence, a separate installation should be omitted in order to avoid -a cluttered environment on your system. Alternatively, you can also use a [FAKE target definition](https://github.com/tpetricek/FSharp.Formatting/blob/master/build.fsx#L176), +a cluttered environment on your system. Alternatively, you can also use a [FAKE target definition](https://github.com/fsprojects/FSharp.Formatting/blob/master/build.fsx#L176), that invokes the recommended [template file](https://github.com/fsprojects/ProjectScaffold/blob/master/docs/tools/generate.template) as in the previous configuration option. diff --git a/docs/content/development.md b/docs/content/development.md index d18542fd1..96bbb3bf1 100644 --- a/docs/content/development.md +++ b/docs/content/development.md @@ -3,7 +3,7 @@ Improve Common-Mark Test Coverage ---------------- -See https://github.com/tpetricek/FSharp.Formatting/pull/343 +See https://github.com/fsprojects/FSharp.Formatting/pull/343 Update Common-Mark Test Suite ---------------- @@ -15,9 +15,9 @@ Update Common-Mark Test Suite More information ---------------- -The project is hosted on [GitHub](https://github.com/tpetricek/FSharp.Formatting) where you can -[report issues](https://github.com/tpetricek/FSharp.Formatting/issues), fork the project and submit pull requests. +The project is hosted on [GitHub](https://github.com/fsprojects/FSharp.Formatting) where you can +[report issues](https://github.com/fsprojects/FSharp.Formatting/issues), fork the project and submit pull requests. Thanks to [Gustavo Guerra](https://github.com/ovatsus) for a great build script and [Steffen Forkmann](https://github.com/forki) for the great build tool [FAKE](https://github.com/fsharp/FAKE). The library is available under Apache 2.0. For more information see the -[License file](https://github.com/tpetricek/FSharp.Formatting/blob/master/LICENSE.md) in the GitHub repository. +[License file](https://github.com/fsprojects/FSharp.Formatting/blob/master/LICENSE.md) in the GitHub repository. diff --git a/docs/content/diagnostics.md b/docs/content/diagnostics.md index b0677a323..29dbf7450 100644 --- a/docs/content/diagnostics.md +++ b/docs/content/diagnostics.md @@ -6,14 +6,14 @@ potential issues. If you encounter any issues with F# Formatting, this page gives you all the information you need to create a log file with detailed trace of what is going one. This may give you some hints on what is wrong & a detailed report that you can send when [submitting an -issue](https://github.com/tpetricek/FSharp.Formatting/issues). +issue](https://github.com/fsprojects/FSharp.Formatting/issues). Setting up logging ------------------ Logging is enabled when you reference F# Formatting using the `FSharp.Formatting.fsx` load script. If you're not using the load script, you can enable logging manually -(just see [how this is done in the load script](https://github.com/tpetricek/FSharp.Formatting/blob/master/packages/FSharp.Formatting/FSharp.Formatting.fsx)). +(just see [how this is done in the load script](https://github.com/fsprojects/FSharp.Formatting/blob/master/packages/FSharp.Formatting/FSharp.Formatting.fsx)). By default, F# Formatting logs some information to the console output. Detailed logging is enabled by setting an environment variable `FSHARP_FORMATTING_LOG` to diff --git a/docs/content/index.md b/docs/content/index.md index cb05fd66c..46ed003c6 100644 --- a/docs/content/index.md +++ b/docs/content/index.md @@ -19,8 +19,8 @@ with type information. The package also comes with a sample that implements lite and paths. If you are calling F# Formatting from a script file, then it is recommended to use `#load "FSharp.Formatting.fsx"` as a future-proof way of referencing the library. -You can download the [source as a ZIP file](https://github.com/tpetricek/FSharp.Formatting/zipball/master) -or download the [compiled binaries](https://github.com/tpetricek/FSharp.Formatting/archive/release.zip) as a ZIP. +You can download the [source as a ZIP file](https://github.com/fsprojects/FSharp.Formatting/zipball/master) +or download the [compiled binaries](https://github.com/fsprojects/FSharp.Formatting/archive/release.zip) as a ZIP. Documentation ------------- @@ -28,7 +28,7 @@ Documentation The documentation for this library is generated automatically using the literate programming tools that are built on top of it and are described in the [literate programming page](literate.html). If you spot a typo, please submit a pull request! The source Markdown and F# script files are -available in the [docs folder on GitHub](https://github.com/tpetricek/FSharp.Formatting/tree/master/docs). +available in the [docs folder on GitHub](https://github.com/fsprojects/FSharp.Formatting/tree/master/docs). I hope it is also a good sample showing how to write documentation for F# projects. - [Literate programming](literate.html) - if you want to use the library to generate documentation @@ -54,9 +54,9 @@ I hope it is also a good sample showing how to write documentation for F# projec More information ---------------- -The project is hosted on [GitHub](https://github.com/tpetricek/FSharp.Formatting) where you can -[report issues](https://github.com/tpetricek/FSharp.Formatting/issues), fork the project and submit pull requests. +The project is hosted on [GitHub](https://github.com/fsprojects/FSharp.Formatting) where you can +[report issues](https://github.com/fsprojects/FSharp.Formatting/issues), fork the project and submit pull requests. Thanks to [Gustavo Guerra](https://github.com/ovatsus) for a great build script and [Steffen Forkmann](https://github.com/forki) for the great build tool [FAKE](https://github.com/fsharp/FAKE). The library is available under Apache 2.0. For more information see the -[License file](https://github.com/tpetricek/FSharp.Formatting/blob/master/LICENSE.md) in the GitHub repository. +[License file](https://github.com/fsprojects/FSharp.Formatting/blob/master/LICENSE.md) in the GitHub repository. diff --git a/docs/content/literate.fsx b/docs/content/literate.fsx index 1cfa45b6d..acaa02f19 100644 --- a/docs/content/literate.fsx +++ b/docs/content/literate.fsx @@ -113,7 +113,7 @@ Typical literate setup (** For literate programming support in your project, install the `FSharp.Formatting` nuget package. -HTML (or LaTeX) is generated by including a simple script file similar to [`build.fsx`](https://github.com/tpetricek/FSharp.Formatting/blob/master/misc/literate/build.fsx) in your project. +HTML (or LaTeX) is generated by including a simple script file similar to [`build.fsx`](https://github.com/fsprojects/FSharp.Formatting/blob/master/misc/literate/build.fsx) in your project. You can find this file in the installed nuget package folder: `/packages/FSharp.Formatting/literate/` @@ -137,8 +137,8 @@ documents or entire directories. The `Literate` type has two static methods `ProcessScriptFile` and `ProcessMarkdown` that turn an F# script file and Markdown document, respectively, into an HTML file. If you wish to specify the HTML file structure, you can provide a template. Two sample templates -are included: for a [single file](https://github.com/tpetricek/FSharp.Formatting/blob/master/misc/literate/templates/template-file.html) -and for a [project](https://github.com/tpetricek/FSharp.Formatting/blob/master/misc/literate/templates/template-project.html), +are included: for a [single file](https://github.com/fsprojects/FSharp.Formatting/blob/master/misc/literate/templates/template-file.html) +and for a [project](https://github.com/fsprojects/FSharp.Formatting/blob/master/misc/literate/templates/template-project.html), but you can use your own. If no template is provided, the result is simply the HTML body of the document with HTML for tool tips appended to the end. @@ -148,8 +148,8 @@ replaced with (hidden) `
` elements containing code for tool tips that appea when you place mouse pointer over an identifier. Optionally, you can also use `{page-title}` which will be replaced with the text in a first-level heading. The template should also reference `style.css` and `tips.js` that define CSS style -and JavaScript functions used by the generated HTML (see sample [stylesheet](https://github.com/tpetricek/FSharp.Formatting/blob/master/src/FSharp.CodeFormat/files/style.css) -and [script](https://github.com/tpetricek/FSharp.Formatting/blob/master/src/FSharp.CodeFormat/files/tips.js) on GitHub). +and JavaScript functions used by the generated HTML (see sample [stylesheet](https://github.com/fsprojects/FSharp.Formatting/blob/master/src/FSharp.CodeFormat/files/style.css) +and [script](https://github.com/fsprojects/FSharp.Formatting/blob/master/src/FSharp.CodeFormat/files/tips.js) on GitHub). Assuming you have `template.html` in the current directory, you can write: *) @@ -190,7 +190,7 @@ let projTemplate = source + "template-project.html" let projInfo = [ "page-description", "F# Literate programming" "page-author", "Tomas Petricek" - "github-link", "https://github.com/tpetricek/FSharp.Formatting" + "github-link", "https://github.com/fsprojects/FSharp.Formatting" "project-name", "F# Formatting" ] // Process all files and save results to 'output' directory @@ -229,12 +229,12 @@ of the document is placed (this differs from `{document}` used in the HTML forma collision with standard Latex `{document}` tag). The project comes with two samples (also available as part of the NuGet package). The sample Latex (and HTML) outputs look as follows: - * [Sample Markdown file](https://github.com/tpetricek/FSharp.Formatting/blob/master/misc/literate/demo.md) - produces the following [LaTeX output](https://github.com/tpetricek/FSharp.Formatting/blob/master/misc/literate/output/demo-doc.tex) - and [HTML output](https://github.com/tpetricek/FSharp.Formatting/blob/master/misc/literate/output/demo-doc.html) - * [Sample F# script file](https://github.com/tpetricek/FSharp.Formatting/blob/master/misc/literate/demo.fsx) - produces the following [LaTeX output](https://github.com/tpetricek/FSharp.Formatting/blob/master/misc/literate/output/demo-script.tex) - and [HTML output](https://github.com/tpetricek/FSharp.Formatting/blob/master/misc/literate/output/demo-script.html) + * [Sample Markdown file](https://github.com/fsprojects/FSharp.Formatting/blob/master/misc/literate/demo.md) + produces the following [LaTeX output](https://github.com/fsprojects/FSharp.Formatting/blob/master/misc/literate/output/demo-doc.tex) + and [HTML output](https://github.com/fsprojects/FSharp.Formatting/blob/master/misc/literate/output/demo-doc.html) + * [Sample F# script file](https://github.com/fsprojects/FSharp.Formatting/blob/master/misc/literate/demo.fsx) + produces the following [LaTeX output](https://github.com/fsprojects/FSharp.Formatting/blob/master/misc/literate/output/demo-script.tex) + and [HTML output](https://github.com/fsprojects/FSharp.Formatting/blob/master/misc/literate/output/demo-script.html) ## Optional parameters diff --git a/docs/content/metadata.fsx b/docs/content/metadata.fsx index 591ca6139..93b23ede3 100644 --- a/docs/content/metadata.fsx +++ b/docs/content/metadata.fsx @@ -49,7 +49,7 @@ MetadataFormat.Generate ( Path.Combine(root, "bin/YourLibrary.dll"), Path.Combine(root, "output"), [ Path.Combine(root, "templates") ], - sourceRepo = "https://github.com/tpetricek/FSharp.Formatting/tree/master", + sourceRepo = "https://github.com/fsprojects/FSharp.Formatting/tree/master", sourceFolder = "/path/to/FSharp.Formatting" ) @@ -125,7 +125,7 @@ MetadataFormat.Generate ( Path.Combine(root, "bin/YourLibrary.dll"), Path.Combine(root, "output"), [ Path.Combine(root, "templates") ], - sourceRepo = "https://github.com/tpetricek/FSharp.Formatting/tree/master", + sourceRepo = "https://github.com/fsprojects/FSharp.Formatting/tree/master", sourceFolder = "/path/to/FSharp.Formatting", markDownComments = false ) (** An example of an XML documentation comment: diff --git a/docs/content/sidebyside/sidemarkdown.md b/docs/content/sidebyside/sidemarkdown.md index 46d516e48..ca200c5da 100644 --- a/docs/content/sidebyside/sidemarkdown.md +++ b/docs/content/sidebyside/sidemarkdown.md @@ -4,7 +4,7 @@ This file demonstrates how to write Markdown document with embedded F# snippets that can be transformed into nice HTML using the `literate.fsx` script from the [F# Formatting -package](http://tpetricek.github.com/FSharp.Formatting). +package](http://fsprojects.github.io/FSharp.Formatting). In this case, the document itself is a valid Markdown and you can use standard Markdown features to format the text: diff --git a/docs/content/sidebyside/sidescript.fsx b/docs/content/sidebyside/sidescript.fsx index 78e00a123..edcb13cb2 100644 --- a/docs/content/sidebyside/sidescript.fsx +++ b/docs/content/sidebyside/sidescript.fsx @@ -5,7 +5,7 @@ Literate script This file demonstrates how to write literate F# script files (`*.fsx`) that can be transformed into nice HTML using the `literate.fsx` script from the [F# Formatting -package](http://tpetricek.github.com/FSharp.Formatting). +package](http://fsprojects.github.io/FSharp.Formatting). As you can see, a comment starting with double asterisk is treated as part of the document and is transformed @@ -81,7 +81,7 @@ currently implemented in `literate.fsx`, but feel free to [fork the project on GitHub][fs] and add more features or report bugs! - [fs]: https://github.com/tpetricek/FSharp.Formatting + [fs]: https://github.com/fsprojects/FSharp.Formatting *) diff --git a/docs/tools/generate.fsx b/docs/tools/generate.fsx index d22173e6e..f6524e369 100644 --- a/docs/tools/generate.fsx +++ b/docs/tools/generate.fsx @@ -10,7 +10,7 @@ let website = __SOURCE_DIRECTORY__ + "../output" let website = "/FSharp.Formatting" #endif -let githubLink = "http://github.com/tpetricek/FSharp.Formatting" +let githubLink = "http://github.com/fsprojects/FSharp.Formatting" // Specify more information about your project let info = diff --git a/misc/literate/demo.fsx b/misc/literate/demo.fsx index c1dc2b6b0..6c117c8c3 100644 --- a/misc/literate/demo.fsx +++ b/misc/literate/demo.fsx @@ -5,7 +5,7 @@ Literate sample This file demonstrates how to write literate F# script files (`*.fsx`) that can be transformed into nice HTML using the `literate.fsx` script from the [F# Formatting -package](http://tpetricek.github.com/FSharp.Formatting). +package](http://fsprojects.github.io/FSharp.Formatting). As you can see, a comment starting with double asterisk is treated as part of the document and is transformed @@ -81,7 +81,7 @@ currently implemented in `literate.fsx`, but feel free to [fork the project on GitHub][fs] and add more features or report bugs! - [fs]: https://github.com/tpetricek/FSharp.Formatting + [fs]: https://github.com/fsprojects/FSharp.Formatting *) diff --git a/misc/literate/demo.md b/misc/literate/demo.md index be110fbdc..3fd3374b8 100644 --- a/misc/literate/demo.md +++ b/misc/literate/demo.md @@ -4,7 +4,7 @@ This file demonstrates how to write Markdown document with embedded F# snippets that can be transformed into nice HTML using the `literate.fsx` script from the [F# Formatting -package](http://tpetricek.github.com/FSharp.Formatting). +package](http://fsprojects.github.io/FSharp.Formatting). In this case, the document itself is a valid Markdown and you can use standard Markdown features to format the text: diff --git a/misc/literate/output/demo-doc.html b/misc/literate/output/demo-doc.html index fd512dc1c..50e3cd512 100644 --- a/misc/literate/output/demo-doc.html +++ b/misc/literate/output/demo-doc.html @@ -31,7 +31,7 @@

Literate sample

This file demonstrates how to write Markdown document with embedded F# snippets that can be transformed into nice HTML -using the literate.fsx script from the F# Formatting +using the literate.fsx script from the F# Formatting package.

In this case, the document itself is a valid Markdown and diff --git a/misc/literate/output/demo-doc.tex b/misc/literate/output/demo-doc.tex index 6441b7869..6749bf385 100644 --- a/misc/literate/output/demo-doc.tex +++ b/misc/literate/output/demo-doc.tex @@ -93,7 +93,7 @@ \section*{Literate sample} This file demonstrates how to write Markdown document with embedded F\# snippets that can be transformed into nice HTML -using the \texttt{literate.fsx} script from the \href{http://tpetricek.github.com/FSharp.Formatting}{F\# Formatting +using the \texttt{literate.fsx} script from the \href{http://fsprojects.github.io/FSharp.Formatting}{F\# Formatting package}. diff --git a/misc/literate/output/demo-script.html b/misc/literate/output/demo-script.html index b6f459be6..847aeb6df 100644 --- a/misc/literate/output/demo-script.html +++ b/misc/literate/output/demo-script.html @@ -31,7 +31,7 @@

Literate sample

This file demonstrates how to write literate F# script files (*.fsx) that can be transformed into nice HTML -using the literate.fsx script from the F# Formatting +using the literate.fsx script from the F# Formatting package.

As you can see, a comment starting with double asterisk @@ -135,7 +135,7 @@

Moving code around

This example covers pretty much all features that are currently implemented in literate.fsx, but feel free -to fork the project on GitHub and add more +to fork the project on GitHub and add more features or report bugs!

Other features

diff --git a/misc/literate/output/demo-script.tex b/misc/literate/output/demo-script.tex index f457620be..727fbbf6c 100644 --- a/misc/literate/output/demo-script.tex +++ b/misc/literate/output/demo-script.tex @@ -93,7 +93,7 @@ \section*{Literate sample} This file demonstrates how to write literate F\# script files (\texttt{*.fsx}) that can be transformed into nice HTML -using the \texttt{literate.fsx} script from the \href{http://tpetricek.github.com/FSharp.Formatting}{F\# Formatting +using the \texttt{literate.fsx} script from the \href{http://fsprojects.github.io/FSharp.Formatting}{F\# Formatting package}. @@ -172,7 +172,7 @@ \subsection*{Moving code around} This example covers pretty much all features that are currently implemented in \texttt{literate.fsx}, but feel free -to \href{https://github.com/tpetricek/FSharp.Formatting}{fork the project on GitHub} and add more +to \href{https://github.com/fsprojects/FSharp.Formatting}{fork the project on GitHub} and add more features or report bugs! \subsection*{Other features} diff --git a/misc/templates/template.cshtml b/misc/templates/template.cshtml index 0e1536898..9d48936b8 100644 --- a/misc/templates/template.cshtml +++ b/misc/templates/template.cshtml @@ -24,7 +24,7 @@

@Properties["project-name"]

diff --git a/nuget/FSharp.Formatting.CommandTool.nuspec b/nuget/FSharp.Formatting.CommandTool.nuspec index 9191b68b1..903e2cf23 100644 --- a/nuget/FSharp.Formatting.CommandTool.nuspec +++ b/nuget/FSharp.Formatting.CommandTool.nuspec @@ -5,9 +5,9 @@ @build.number@ @authors@ @authors@ - http://github.com/tpetricek/FSharp.Formatting/blob/master/LICENSE.md - http://github.com/tpetricek/FSharp.Formatting - https://raw.github.com/tpetricek/FSharp.Formatting/master/docs/files/misc/logo.png + http://github.com/fsprojects/FSharp.Formatting/blob/master/LICENSE.md + http://github.com/fsprojects/FSharp.Formatting + https://raw.github.com/fsprojects/FSharp.Formatting/master/docs/files/misc/logo.png false @summary@ @description@ diff --git a/nuget/FSharp.Formatting.nuspec b/nuget/FSharp.Formatting.nuspec index 0b939b9c2..da285a99b 100644 --- a/nuget/FSharp.Formatting.nuspec +++ b/nuget/FSharp.Formatting.nuspec @@ -5,9 +5,9 @@ @build.number@ @authors@ @authors@ - http://github.com/tpetricek/FSharp.Formatting/blob/master/LICENSE.md - http://github.com/tpetricek/FSharp.Formatting - https://raw.github.com/tpetricek/FSharp.Formatting/master/docs/files/misc/logo.png + http://github.com/fsprojects/FSharp.Formatting/blob/master/LICENSE.md + http://github.com/fsprojects/FSharp.Formatting + https://raw.github.com/fsprojects/FSharp.Formatting/master/docs/files/misc/logo.png false @summary@ @description@ diff --git a/packages/FSharp.Formatting/FSharp.Formatting.fsx b/packages/FSharp.Formatting/FSharp.Formatting.fsx index f5a88b49e..dba9bf3fe 100644 --- a/packages/FSharp.Formatting/FSharp.Formatting.fsx +++ b/packages/FSharp.Formatting/FSharp.Formatting.fsx @@ -1,4 +1,4 @@ -#nowarn "211" +#nowarn "211" // Standard NuGet or Paket location #I __SOURCE_DIRECTORY__ #I "lib/net40" @@ -10,7 +10,7 @@ if (typeof.Assembly.GetName().Version.Major <= 2 #r "../System.ValueTuple/lib/portable-net40+sl4+win8+wp8/System.ValueTuple.dll" // Standard NuGet locations -//#I "../FSharp.Compiler.Service.12.0.2/lib/net45" +//#I "../FSharp.Compiler.Service.12.0.5/lib/net45" // Standard Paket locations #I "../FSharp.Compiler.Service/lib/net45" @@ -60,7 +60,7 @@ try if logToConsole then Logging.ConsoleListener() - |> Logging.SetupListener noTraceOptions System.Diagnostics.SourceLevels.Information + |> Logging.SetupListener noTraceOptions System.Diagnostics.SourceLevels.Verbose |> setupListener if logToFile then diff --git a/src/Common/Scripting.fs b/paket-files/matthid/Yaaf.FSharp.Scripting/src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs similarity index 58% rename from src/Common/Scripting.fs rename to paket-files/matthid/Yaaf.FSharp.Scripting/src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs index a5d93706d..34488b425 100644 --- a/src/Common/Scripting.fs +++ b/paket-files/matthid/Yaaf.FSharp.Scripting/src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs @@ -1,59 +1,87 @@ -module internal FSharp.Formatting.Scripting +namespace Yaaf.FSharp.Scripting -open System -open System.Diagnostics -open System.Reflection -open Microsoft.FSharp.Compiler -open Microsoft.FSharp.Compiler.SourceCodeServices -open System.IO -open System.Text -open Microsoft.FSharp.Compiler.Interactive.Shell +#nowarn "25" // Binding incomplete: let [ t ] = list -let isMono = try System.Type.GetType "Mono.Runtime" |> isNull |> not with _ -> false - -let formatPaths paths = - System.String.Join("\n ", paths |> Seq.map (sprintf "\"%s\"")) |> sprintf "\n[ %s ]" - -let formatArgs (args:_ seq) = - System.String.Join("\n ", args) |> sprintf "\n %s" +module internal Env = + let inline isNull o = obj.ReferenceEquals(null, o) + let isMono = try System.Type.GetType("Mono.Runtime") |> isNull |> not with _ -> false + let (++) a b = System.IO.Path.Combine(a,b) +#if NETSTANDARD1_5 + let (=?) s1 s2 = System.String.Equals(s1, s2, System.StringComparison.OrdinalIgnoreCase) +#else + let (=?) s1 s2 = System.String.Equals(s1, s2, System.StringComparison.InvariantCultureIgnoreCase) +#endif + let (<>?) s1 s2 = not (s1 =? s2) +#if NET40 + open System.Reflection + type CustomAttributeData with + member x.AttributeType = x.Constructor.DeclaringType +#endif -let () p1 p2 = System.IO.Path.Combine(p1,p2) +open System +open System.Diagnostics +module Log = + let source = new TraceSource("Yaaf.FSharp.Scripting") -let (=?) s1 s2 = System.String.Equals(s1, s2, System.StringComparison.InvariantCultureIgnoreCase) +#if !NETSTANDARD1_5 + let LogConsole levels = + let consoleListener = new ConsoleTraceListener(); + consoleListener.TraceOutputOptions <- TraceOptions.DateTime + consoleListener.Filter <- new EventTypeFilter(levels) + source.Listeners.Add consoleListener |> ignore +#endif -let (<>?) s1 s2 = not (s1 =? s2) + let traceEventf t f = + Printf.kprintf (fun s -> source.TraceEvent(t, 0, s)) f -let (|StartsWith|_|) start (s:string) = - if s.StartsWith (start) then StartsWith (s.Substring start.Length)|> Some - else None + let infof f = traceEventf TraceEventType.Information f + let errorf f = traceEventf TraceEventType.Error f + let warnf f = traceEventf TraceEventType.Warning f + let critf f = traceEventf TraceEventType.Critical f + let verbf f = traceEventf TraceEventType.Verbose f -let (|FsiBoolArg|_|) argName s = - match s with - | StartsWith argName rest -> - match rest with - | null | "" | "+" -> Some true - | "-" -> Some false - | _ -> None - | _ -> None + let formatArgs (args:_ seq) = + System.String.Join("\n ", args) + |> sprintf "\n %s" + let formatPaths paths = + System.String.Join("\n ", paths |> Seq.map (sprintf "\"%s\"")) + |> sprintf "\n[ %s ]" -let checker = FSharpChecker.Create(msbuildEnabled=false) +open Env +[] +#if YAAF_FSHARP_SCRIPTING_PUBLIC +module CompilerServiceExtensions = +#else +module internal CompilerServiceExtensions = +#endif + open System + open System.Reflection + open Microsoft.FSharp.Compiler + open Microsoft.FSharp.Compiler.SourceCodeServices + open System.IO -module FSharpAssemblyHelper = +#if YAAF_FSHARP_SCRIPTING_PUBLIC + module FSharpCheckerFuncs = +#else + module internal FSharpCheckerFuncs = +#endif open System.IO - + let checker = FSharpChecker.Create() #if NET40 let defaultFrameworkVersion = "4.0" -#endif +#else #if NET45 let defaultFrameworkVersion = "4.5" -#endif -#if NET461 +#else +//#if NET461 let defaultFrameworkVersion = "4.6.1" +#endif #endif let getLib dir nm = - dir nm + ".dll" + dir ++ nm + ".dll" +#if !NETSTANDARD1_5 let referenceAssemblyDirectory frameworkVersion = let isWindows = System.Environment.OSVersion.Platform = System.PlatformID.Win32NT let baseDir = @@ -83,23 +111,27 @@ module FSharpAssemblyHelper = let fsCore4300Dir = fsCore "4.0" "4.3.0.0" let fsCore4310Dir = fsCore "4.0" "4.3.1.0" let fsCore4400Dir = fsCore "4.0" "4.4.0.0" - let fsCore4410Dir = fsCore "4.0" "4.4.1.0" + //let fsCore4410Dir = fsCore "4.0" "4.4.1.0" let loadedFsCoreVersion = - let ass = typeof.Assembly + let ass = typedefof.Assembly let name = ass.GetName() name.Version.ToString() +#endif let fscoreResolveDirs libDirs = - [ + [ +#if !NETSTANDARD1_5 yield System.AppDomain.CurrentDomain.BaseDirectory yield referenceAssemblyDirectory defaultFrameworkVersion yield System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory() +#else yield System.AppContext.BaseDirectory +#endif yield! libDirs yield System.IO.Directory.GetCurrentDirectory() +#if !NETSTANDARD1_5 // Prefer the currently loaded version yield fsCore "4.0" loadedFsCoreVersion - //yield fsCore4410Dir yield fsCore4400Dir yield fsCore4310Dir yield fsCore4300Dir @@ -107,12 +139,14 @@ module FSharpAssemblyHelper = |> Seq.singleton with :? NotSupportedException -> Seq.empty yield! try Path.GetDirectoryName - (typeof.Assembly.Location) + (typeof.Assembly.Location) |> Seq.singleton with :? NotSupportedException -> Seq.empty if isMono then // See https://github.com/fsharp/FSharp.Compiler.Service/issues/317 yield referenceAssemblyDirectory "4.0" +#endif ] let tryCheckFsCore fscorePath = @@ -126,13 +160,13 @@ module FSharpAssemblyHelper = let findFSCore dllFiles libDirs = // lets find ourself some FSharp.Core.dll let tried = - dllFiles @ (fscoreResolveDirs libDirs |> List.map (fun (l:string) -> getLib l "FSharp.Core")) - + dllFiles @ (fscoreResolveDirs libDirs + |> List.map (fun (l:string) -> getLib l "FSharp.Core")) match tried |> Seq.tryPick tryCheckFsCore with | Some s -> s | None -> - let paths = formatPaths tried - printfn "Could not find a FSharp.Core.dll (with bundled .optdata and .sigdata) in %s" paths + let paths = Log.formatPaths tried + Log.critf "Could not find a FSharp.Core.dll (with bundled .optdata and .sigdata) in %s" paths failwithf "Could not find a FSharp.Core.dll (with bundled .optdata and .sigdata) in %s" paths let hasAssembly asm l = l |> Seq.exists (fun a -> Path.GetFileNameWithoutExtension a =? asm) @@ -140,23 +174,29 @@ module FSharpAssemblyHelper = [ "FSharp.Core" "System.EnterpriseServices.Thunk" // See #4 "System.EnterpriseServices.Wrapper" ] // See #4 - +#if !NETSTANDARD1_5 let getDefaultSystemReferences frameworkVersion = Directory.EnumerateFiles(referenceAssemblyDirectory frameworkVersion) |> Seq.filter (fun file -> Path.GetExtension file =? ".dll") |> Seq.map Path.GetFileNameWithoutExtension |> Seq.filter (fun f -> sysLibBlackList |> Seq.forall (fun backListed -> f <>? backListed)) - - let getCheckerArguments frameworkVersion defaultReferences (fsCoreLib: _ option) dllFiles libDirs otherFlags = +#endif + let getCheckerArguments file frameworkVersion defaultReferences (fsCoreLib: _ option) dllFiles libDirs otherFlags = ignore frameworkVersion ignore defaultReferences - let base1 = Path.GetTempFileName() - let dllName = Path.ChangeExtension(base1, ".dll") - let xmlName = Path.ChangeExtension(base1, ".xml") - let fileName1 = Path.ChangeExtension(base1, ".fs") - let projFileName = Path.ChangeExtension(base1, ".fsproj") - File.WriteAllText(fileName1, """module M""") + let fileName1 = + match file with + | Some f -> f + | None -> + let f = Path.ChangeExtension(Path.GetTempFileName(), ".fs") + File.WriteAllText(f, """module M""") + f + + let dllName = Path.ChangeExtension(fileName1, ".dll") + let xmlName = Path.ChangeExtension(fileName1, ".xml") + //let fileName1 = Path.ChangeExtension(base1, ".fs") + let projFileName = Path.ChangeExtension(fileName1, ".fsproj") let args = [| //yield "--debug:full" @@ -164,9 +204,11 @@ module FSharpAssemblyHelper = //yield "--optimize-" yield "--nooptimizationdata" yield "--noframework" +#if !NETSTANDARD1_5 yield sprintf "-I:%s" (referenceAssemblyDirectory frameworkVersion) for ref in defaultReferences do yield sprintf "-r:%s" (referenceAssembly frameworkVersion ref) +#endif if fsCoreLib.IsSome then yield sprintf "-r:%s" fsCoreLib.Value yield "--out:" + dllName @@ -201,7 +243,7 @@ module FSharpAssemblyHelper = | Some fName -> let splits = fName.Split([|','|]) if splits.Length <> 2 then - printfn "Expected a target framework formatted string and got: %s" fName + Log.warnf "Expected a target framework formatted string and got: %s" fName None else let framework = splits.[0] @@ -216,7 +258,6 @@ module FSharpAssemblyHelper = #endif let getProjectReferences frameworkVersion otherFlags libDirs dllFiles = - let otherFlags = defaultArg otherFlags Seq.empty let libDirs = defaultArg libDirs Seq.empty |> Seq.toList let dllFiles = dllFiles |> Seq.toList @@ -236,17 +277,17 @@ module FSharpAssemblyHelper = if not hasFsCoreLib then Some (findFSCore dllFiles libDirs) else None - + #if !NETSTANDARD1_5 let defaultReferences = getDefaultSystemReferences frameworkVersion |> Seq.filter (not << hasAssembly) - let projFileName, args = getCheckerArguments frameworkVersion defaultReferences (fsCoreLib: _ option) dllFiles libDirs otherFlags + let projFileName, args = getCheckerArguments None frameworkVersion defaultReferences (fsCoreLib: _ option) dllFiles libDirs otherFlags #else - let projFileName, args = getCheckerArguments frameworkVersion ignore (fsCoreLib: _ option) dllFiles libDirs otherFlags + let projFileName, args = getCheckerArguments None frameworkVersion ignore (fsCoreLib: _ option) dllFiles libDirs otherFlags #endif - printfn "Checker Arguments: %O" (formatArgs args) + Log.verbf "Checker Arguments: %O" (Log.formatArgs args) let options = checker.GetProjectOptionsFromCommandLineArgs(projFileName, args) @@ -256,12 +297,12 @@ module FSharpAssemblyHelper = if results.HasCriticalErrors then let errors = results.Errors |> Seq.map mapError let errorMsg = sprintf "Parsing and checking project failed: \n\t%s" (System.String.Join("\n\t", errors)) - printfn "%s" errorMsg + Log.errorf "%s" errorMsg failwith errorMsg else if results.Errors.Length > 0 then let warnings = results.Errors |> Seq.map mapError - printfn "Parsing and checking warnings: \n\t%s" (System.String.Join("\n\t", warnings)) + Log.warnf "Parsing and checking warnings: \n\t%s" (System.String.Join("\n\t", warnings)) let references = results.ProjectContext.GetReferencedAssemblies() references let referenceMap references = @@ -289,454 +330,12 @@ module FSharpAssemblyHelper = yield! e.NestedEntities |> Seq.collect enumerateEntities ] - - -module String = - module Assert = - let notNull argName arg = if arg = null then nullArg argName - - let notNullOrEmpty argName arg = - notNull argName arg - if Seq.isEmpty arg then invalidArg argName "Value cannot be empty." - - type private Token = - | Esc of Count:int - | Sep - | Val of Content:string - - [] - module private Tokenizer = - /// Returns a function who can convert a given source string to a token stream. - let create esc sep = - let sepName = "sep" - let sepLen = String.length sep - - // Validate parameters - Assert.notNullOrEmpty sepName sep - if sep.[0] = esc then invalidArg sepName "Separator cannot start with escape char." - if sepLen > 1 then - let iMax = sepLen - 1 - for i in 0 .. iMax / 2 do - if sep.[0 .. i] = sep.[sepLen - i - 1 .. iMax] then - invalidArg sepName "Separator cannot have same beginning and ending." - - // Return the tokenizer function - fun source -> - match String.length source - 1 with - | -1 -> Val String.Empty |> Seq.singleton - | iMax -> - let (|Esc|_|) = - let rec aux acc i = - if i <= iMax && source.[i] = esc then aux (acc + 1) (i + 1) else acc - aux 0 >> function 0 -> None | count -> Some count - - let (|Sep|_|) i = - if i <= iMax - sepLen + 1 - && String.CompareOrdinal(source, i, sep, 0, sepLen) = 0 then Some() - else None - - let rec read valLen i = - seq { let wrapVal() = - if valLen > 0 - then source.Substring(i - valLen, valLen) |> Val |> Seq.singleton - else Seq.empty - if i <= iMax then - match i with - | Esc count -> - yield! wrapVal(); yield Esc count; yield! read 0 (i + count) - | Sep -> yield! wrapVal(); yield Sep; yield! read 0 (i + sepLen) - | _ -> yield! read (valLen + 1) (i + 1) - else yield! wrapVal() } - read 0 0 - - - /// Returns a new string by connecting the given strings with the given separator. - let concatEscape (esc:char) sep (strings:seq<_>) = - Assert.notNull "strings" strings - let sb = StringBuilder() - - let appendTokens areLast ts = - let appendEsc count = sb.Append(esc, count) |> ignore - let appendVal (v: string) = sb.Append v |> ignore - let appendSep() = appendVal sep - - let rec aux = function - | [] -> () - | Esc count :: [] -> appendEsc <| if areLast then count else count * 2 - | Esc count :: (Sep :: _ as ts) -> appendEsc (count * 2); aux ts - | Esc count :: ts -> appendEsc count; aux ts - | Sep :: ts -> appendEsc 1; appendSep(); aux ts - | Val v :: ts -> appendVal v; aux ts - - aux ts - if not areLast then appendSep() - - strings - |> Seq.map (Tokenizer.create esc sep >> List.ofSeq) - |> Seq.fold (fun ts1 ts2 -> Option.iter (appendTokens false) ts1; Some ts2) None - |> Option.iter (appendTokens true) - - sb.ToString() - - /// Reproduces the original substrings from a string created with concatEscape. - let splitUnescape esc sep string = - Assert.notNull "string" string - let emptyVal = Val String.Empty - let sepVal = Val sep - let flipAppend x1 x2 = Seq.append x2 x1 - - // Produce token stream - string - |> Tokenizer.create esc sep - - // Convert token stream to StringBuilder stream - |> flipAppend [emptyVal] - |> Seq.scan - (fun (sb:StringBuilder, t1) t2 -> - match t1, t2 with - | Esc count, Sep when count % 2 = 1 -> sb.Append(esc, count / 2), sepVal - | Esc count, Sep -> sb.Append(esc, count / 2), Sep - | Esc count, _ -> sb.Append(esc, count), t2 - | Sep, _ -> StringBuilder(), t2 - | Val v, _ -> sb.Append v, t2) - (StringBuilder(), emptyVal) - |> Seq.map fst - - // Of each series of repeated StringBuilder references, keep only the last - // reference (which points to the StringBuilder's completed state). - // Convert the remaining StringBuilder references to strings. - |> flipAppend [null] - |> Seq.pairwise - |> Seq.filter (fun (sb1, sb2) -> sb1 <> sb2) - |> Seq.map (fst >> sprintf "%O") - - - -type DebugMode = - | Full - | PdbOnly - | Portable - | NoDebug - - -type OptimizationType = - | NoJitOptimize - | NoJitTracking - | NoLocalOptimize - | NoCrossOptimize - | NoTailCalls - - - - -type FsiOptions = { - Checked : bool option - Codepage : int option - CrossOptimize : bool option - Debug : DebugMode option - Defines : string list - Exec : bool - FullPaths : bool - Gui : bool option - LibDirs : string list - Loads : string list - NoFramework : bool - NoLogo : bool - NonInteractive : bool - NoWarns : int list - Optimize : (bool * OptimizationType list) list - Quiet : bool - QuotationsDebug : bool - ReadLine : bool option - References : string list - TailCalls : bool option - Uses : string list - Utf8Output : bool - /// Sets a warning level (0 to 5). The default level is 3. Each warning is given a level based on its severity. Level 5 gives more, but less severe, warnings than level 1. - /// Level 5 warnings are: 21 (recursive use checked at runtime), 22 (let rec evaluated out of order), 45 (full abstraction), and 52 (defensive copy). All other warnings are level 2. - WarnLevel : int option - WarnAsError : bool option - WarnAsErrorList : (bool * int list) list - ScriptArgs : string list -} with - static member Empty = { - Checked = None - Codepage = None - CrossOptimize = None - Debug = None - Defines = [] - Exec = false - FullPaths = false - Gui = None - LibDirs = [] - Loads = [] - NoFramework = false - NoLogo = false - NonInteractive = false - NoWarns = [] - Optimize = [] - Quiet = false - QuotationsDebug = false - ReadLine = None - References = [] - TailCalls = None - Uses = [] - Utf8Output = false - /// Sets a warning level (0 to 5). The default level is 3. Each warning is given a level based on its severity. Level 5 gives more, but less severe, warnings than level 1. - /// Level 5 warnings are: 21 (recursive use checked at runtime), 22 (let rec evaluated out of order), 45 (full abstraction), and 52 (defensive copy). All other warnings are level 2. - WarnLevel= None - WarnAsError = None - WarnAsErrorList = [] - ScriptArgs = [] - } - static member Default = - // find a FSharp.Core.dll with optdata and sigdata - let runtimeDir = System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory() - let includes = - if isMono then - // Workaround that FSC doesn't find a FSharp.Core.dll - let monoDir = System.IO.Path.GetDirectoryName runtimeDir - // prefer current runtime (which FSC would find anyway, but fallback to 4.0 if nothing is found in 4.5 or higher) - // See also https://github.com/fsharp/fsharp/pull/389, https://github.com/fsharp/fsharp/pull/388 - [ runtimeDir; System.IO.Path.Combine (monoDir, "4.0") ] - else [ runtimeDir ] - let includes = [] - let fsCore = FSharpAssemblyHelper.findFSCore [] includes - printfn "Using FSharp.Core: %s" fsCore - { FsiOptions.Empty with - LibDirs = includes - NoFramework = true - References = [ fsCore ] - NonInteractive = true - } - - static member ofArgs args = - ((FsiOptions.Empty, (false, None)), args) - ||> Seq.fold (fun (parsed, state) (arg:string) -> - match state, arg with - | (false, Some cont), _ when not (arg.StartsWith ("--")) -> - let parsed, (userArgs, newCont) = cont arg - parsed, (userArgs, unbox newCont) - | _, "--" -> parsed, (true, None) - | (true, _), a -> { parsed with ScriptArgs = a :: parsed.ScriptArgs }, state - | _, FsiBoolArg "--checked" enabled -> - { parsed with Checked = Some enabled }, state - | _, StartsWith "--codepage:" res -> - { parsed with Codepage = Some (int res) }, state - | _, FsiBoolArg "--crossoptimize" enabled -> - { parsed with CrossOptimize = Some enabled }, state - | _, StartsWith "--debug:" "pdbonly" - | _, StartsWith "-g:" "pdbonly" -> - { parsed with Debug = Some DebugMode.PdbOnly }, state - | _, StartsWith "--debug:" "portable" - | _, StartsWith "-g:" "portable" -> - { parsed with Debug = Some DebugMode.Portable }, state - | _, StartsWith "--debug:" "full" - | _, StartsWith "-g:" "full" - | _, FsiBoolArg "--debug" true - | _, FsiBoolArg "-g" true -> - { parsed with Debug = Some DebugMode.Full }, state - | _, FsiBoolArg "--debug" false - | _, FsiBoolArg "-g" false -> - { parsed with Debug = Some DebugMode.NoDebug }, state - | _, StartsWith "-d:" def - | _, StartsWith "--define:" def -> - { parsed with Defines = def :: parsed.Defines }, state - | _, "--exec" -> - { parsed with Exec = true }, state - | _, "--noninteractive" -> - { parsed with NonInteractive = true }, state - | _, "--fullpaths" -> - { parsed with FullPaths = true }, state - | _, FsiBoolArg "--gui" enabled -> - { parsed with Gui = Some enabled }, state - | _, StartsWith "-I:" lib - | _, StartsWith "--lib:" lib -> - { parsed with LibDirs = lib :: parsed.LibDirs }, state - | _, StartsWith "--load:" load -> - { parsed with Loads = load :: parsed.Loads }, state - | _, "--noframework" -> - { parsed with NoFramework = true }, state - | _, "--nologo" -> - { parsed with NoLogo = true }, state - | _, StartsWith "--nowarn:" warns -> - let noWarns = - warns.Split([|','|]) - |> Seq.map int - |> Seq.toList - { parsed with NoWarns = noWarns @ parsed.NoWarns }, state - | _, FsiBoolArg "--optimize" enabled -> - let cont (arg:string) = - let optList = - arg.Split([|','|]) - |> Seq.map (function - | "nojitoptimize" -> NoJitOptimize - | "nojittracking" -> NoJitTracking - | "nolocaloptimize" -> NoLocalOptimize - | "nocrossoptimize" -> NoCrossOptimize - | "notailcalls" -> NoTailCalls - | unknown -> failwithf "Unknown optimization option %s" unknown) - |> Seq.toList - { parsed with Optimize = (enabled, optList) :: parsed.Optimize}, (false, box None) - { parsed with Optimize = (enabled, []) :: parsed.Optimize}, (false, Some cont) - | _, "--quiet" -> - { parsed with Quiet = true }, state - | _, "--quotations-debug" -> - { parsed with QuotationsDebug = true }, state - | _, FsiBoolArg "--readline" enabled -> - { parsed with ReadLine = Some enabled }, state - | _, StartsWith "-r:" ref - | _, StartsWith "--reference:" ref -> - { parsed with References = ref :: parsed.References }, state - | _, FsiBoolArg "--tailcalls" enabled -> - { parsed with TailCalls = Some enabled }, state - | _, StartsWith "--use:" useFile -> - { parsed with Uses = useFile :: parsed.Uses }, state - | _, "--utf8output" -> - { parsed with Utf8Output = true }, state - | _, StartsWith "--warn:" warn -> - { parsed with WarnLevel = Some (int warn) }, state - | _, FsiBoolArg "--warnaserror" enabled -> - { parsed with WarnAsError = Some enabled }, state - | _, StartsWith "--warnaserror" warnOpts -> - let parseList (l:string) = - l.Split [|','|] - |> Seq.map int - |> Seq.toList - match warnOpts.[0], if warnOpts.Length > 1 then Some warnOpts.[1] else None with - | ':', _ -> - { parsed with WarnAsErrorList = (true, parseList (warnOpts.Substring 1)) :: parsed.WarnAsErrorList }, state - | '+', Some ':' -> - { parsed with WarnAsErrorList = (true, parseList (warnOpts.Substring 2)) :: parsed.WarnAsErrorList }, state - | '-', Some ':' -> - { parsed with WarnAsErrorList = (false, parseList (warnOpts.Substring 2)) :: parsed.WarnAsErrorList }, state - | _ -> - failwithf "invalid --warnaserror argument: %s" arg - | _, unknown -> - { parsed with ScriptArgs = unknown :: parsed.ScriptArgs }, (true, None) - ) - |> fst - |> (fun p -> - { p with - ScriptArgs = p.ScriptArgs |> List.rev - Defines = p.Defines |> List.rev - References = p.References |> List.rev - LibDirs = p.LibDirs |> List.rev - Loads = p.Loads |> List.rev - Uses = p.Uses |> List.rev - }) - - member x.AsArgs = - let maybeArg opt = - match opt with - | Some a -> Seq.singleton a - | None -> Seq.empty - let maybeArgMap opt f = - opt - |> Option.map f - |> maybeArg - let getMinusPlus b = if b then "+" else "-" - let getFsiBoolArg name opt = - maybeArgMap opt (getMinusPlus >> sprintf "%s%s" name) - let getSimpleBoolArg name b = - if b then - Some name - else None - |> maybeArg - [| - yield! getFsiBoolArg "--checked" x.Checked - yield! maybeArgMap x.Codepage (fun i -> sprintf "--codepage:%d" i) - yield! getFsiBoolArg "--crossoptimize" x.CrossOptimize - // ! -g[+|-|:full|:pdbonly] is not working, see https://github.com/Microsoft/visualfsharp/issues/311 - yield! maybeArgMap x.Debug (function - | Full -> "--debug:full" - | PdbOnly -> "--debug:pdbonly" - | Portable -> "--debug:portable" - | NoDebug -> "--debug-") - yield! x.Defines - |> Seq.map (sprintf "--define:%s") - yield! getSimpleBoolArg "--exec" x.Exec - yield! getSimpleBoolArg "--fullpaths" x.FullPaths - yield! getFsiBoolArg "--gui" x.Gui - yield! x.LibDirs - |> Seq.map (sprintf "-I:%s") - yield! x.Loads - |> Seq.map (sprintf "--load:%s") - yield! getSimpleBoolArg "--noframework" x.NoFramework - yield! getSimpleBoolArg "--nologo" x.NoLogo - yield! getSimpleBoolArg "--noninteractive" x.NonInteractive - - yield! (match x.NoWarns with - | [] -> None - | l -> - l - |> Seq.map string - |> String.concat "," - |> sprintf "--nowarn:%s" - |> Some) - |> maybeArg - yield! - match x.Optimize with - | [] -> Seq.empty - | opts -> - opts - |> Seq.map (fun (enable, types) -> - seq { - yield sprintf "--optimize%s" (getMinusPlus enable) - match types with - | [] -> () - | _ -> - yield - types - |> Seq.map (function - | NoJitOptimize -> "nojitoptimize" - | NoJitTracking -> "nojittracking" - | NoLocalOptimize -> "nolocaloptimize" - | NoCrossOptimize -> "nocrossoptimize" - | NoTailCalls -> "notailcalls") - |> String.concat "," - } - ) - |> Seq.concat - - yield! getSimpleBoolArg "--quiet" x.Quiet - yield! getSimpleBoolArg "--quotations-debug" x.QuotationsDebug - yield! getFsiBoolArg "--readline" x.ReadLine - - yield! x.References - |> Seq.map (sprintf "-r:%s") - - yield! getFsiBoolArg "--tailcalls" x.TailCalls - yield! x.Uses - |> Seq.map (sprintf "--use:%s") - - yield! getSimpleBoolArg "--utf8output" x.Utf8Output - - yield! maybeArgMap x.WarnLevel (fun i -> sprintf "--warn:%d" i) - - yield! getFsiBoolArg "--warnaserror" x.WarnAsError - - yield! x.WarnAsErrorList - |> Seq.map (fun (enable, warnNums) -> - warnNums - |> Seq.map string - |> String.concat "," - |> sprintf "--warnaserror%s:%s" (getMinusPlus enable)) - - match x.ScriptArgs with - | [] -> () - | l -> - yield "--" - yield! l - |] - - -type Type with + type Type with /// The FullName but without any generic parameter types. member x.NamespaceName = x.FullName.Substring(0, match x.FullName.IndexOf("[") with | -1 -> x.FullName.Length | _ as i -> i) -type FSharpAssembly with + type FSharpAssembly with static member LoadFiles (dllFiles, ?libDirs, ?otherFlags, ?manualResolve) = let resolveDirs = defaultArg manualResolve true let libDirs = defaultArg libDirs Seq.empty @@ -749,7 +348,7 @@ type FSharpAssembly with // Filter FSharp.Core.dll when there is no sigdata and optdata |> Seq.filter (fun file -> if Path.GetFileName file =? "FSharp.Core.dll" then - FSharpAssemblyHelper.tryCheckFsCore file |> Option.isSome + FSharpCheckerFuncs.tryCheckFsCore file |> Option.isSome else true) // See https://github.com/tpetricek/FSharp.Formatting/commit/22ffb8ec3c743ceaf069893a46a7521667c6fc9d @@ -765,27 +364,27 @@ type FSharpAssembly with //|> Seq.filter (fun file -> blacklist |> List.exists ((=?) (Path.GetFileName file)) |> not), Seq.empty else dllFiles |> List.toSeq, libDirs |> Seq.map (fun l -> Path.GetFullPath (l)) - let frameworkVersion = FSharpAssemblyHelper.defaultFrameworkVersion - FSharpAssemblyHelper.getProjectReferences frameworkVersion otherFlags (Some _libDirs) _dllFiles - |> FSharpAssemblyHelper.resolve dllFiles + let frameworkVersion = FSharpCheckerFuncs.defaultFrameworkVersion + FSharpCheckerFuncs.getProjectReferences frameworkVersion otherFlags (Some _libDirs) _dllFiles + |> FSharpCheckerFuncs.resolve dllFiles static member FromAssembly (assembly:Assembly) = let loc = if assembly.GetName().Name =? "FSharp.Core" then - FSharpAssemblyHelper.findFSCore [assembly.Location] [] + FSharpCheckerFuncs.findFSCore [assembly.Location] [] else assembly.Location if isNull loc then None else let frameworkVersion = - match FSharpAssemblyHelper.findAssemblyVersion assembly with + match FSharpCheckerFuncs.findAssemblyVersion assembly with | Some (_, ver) -> ver - | _ -> FSharpAssemblyHelper.defaultFrameworkVersion - FSharpAssemblyHelper.getProjectReferenceFromFile frameworkVersion loc + | _ -> FSharpCheckerFuncs.defaultFrameworkVersion + FSharpCheckerFuncs.getProjectReferenceFromFile frameworkVersion loc member x.FindType (t:Type) = x.Contents.Entities - |> Seq.collect FSharpAssemblyHelper.enumerateEntities + |> Seq.collect FSharpCheckerFuncs.enumerateEntities |> Seq.tryPick (fun entity -> let namespaceName = t.NamespaceName.Replace("+", ".") match entity.TryFullName with @@ -793,41 +392,38 @@ type FSharpAssembly with Some entity | _ -> None) -module TypeNameHelper = + module internal TypeNameHelper = let rec fallbackName (t:System.Type) = t.Name and getFSharpTypeName (t:System.Type) = - try - let optFsharpName = - match FSharpAssembly.FromAssembly (t.GetTypeInfo().Assembly) with - | Some fsAssembly -> - match fsAssembly.FindType t with - | Some entity -> Some entity.DisplayName - | None -> None + let optFsharpName = +#if !NETSTANDARD1_5 + match FSharpAssembly.FromAssembly t.Assembly with +#else + match FSharpAssembly.FromAssembly (t.GetTypeInfo().Assembly) with +#endif + | Some fsAssembly -> + match fsAssembly.FindType t with + | Some entity -> Some entity.DisplayName | None -> None - match optFsharpName with - | Some fsharpName -> fsharpName - | None -> fallbackName t - with e -> - sprintf "Couldn't get FSharpName from Assembly\n%s\n%s\n" e.Message e.StackTrace - |> Debug.WriteLine - fallbackName t + | None -> None + match optFsharpName with + | Some fsharpName -> fsharpName + | None -> fallbackName t type Type with /// The name of the current type instance in F# source code. member x.FSharpName = TypeNameHelper.getFSharpTypeName x /// Gets the FullName of the current type in F# source code. - member x.FSharpFullName = - if x.IsGenericType then - let gt = x.GetGenericTypeDefinition() - gt.Namespace + "." + gt.FSharpName - else - x.Namespace + "." + x.FSharpName - - module TypeParamHelper = + member x.FSharpFullName = x.Namespace + "." + x.FSharpName + module internal TypeParamHelper = +#if !NETSTANDARD1_5 + let rec getFSharpTypeParameterList (t:System.Type) = +#else let rec getFSharpTypeParameterList (tk:System.Type) = let t = tk.GetTypeInfo() +#endif let builder = new System.Text.StringBuilder() if t.IsGenericType then let args = t.GetGenericArguments() @@ -846,22 +442,150 @@ module TypeNameHelper = /// Gets a string that can be used in F# source code to reference the current type instance. member x.FSharpFullNameWithTypeArgs = x.FSharpFullName + x.FSharpParamList +type OutputData = + { FsiOutput : string; ScriptOutput : string; Merged : string } +#if YAAF_FSHARP_SCRIPTING_PUBLIC +type InteractionResult = +#else +type internal InteractionResult = +#endif + { Output : OutputData; Error : OutputData } + +#if !NETSTANDARD1_5 +// Thank you for http://www.blogs.sigristsoftware.com/marcsigrist/post/F-for-C-developers-Creating-escaped-concatsplit-functions-in-F.aspx +module internal StringHelpers = + [] + module Assert = + let notNull argName arg = if arg = null then nullArg argName + + let notNullOrEmpty argName arg = + notNull argName arg + if Seq.isEmpty arg then invalidArg argName "Value cannot be empty." + + type private Token = + | Esc of Count:int + | Sep + | Val of Content:string + + [] + module private Tokenizer = + /// Returns a function who can convert a given source string to a token stream. + let create esc sep = + let sepName = "sep" + let sepLen = String.length sep + + // Validate parameters + Assert.notNullOrEmpty sepName sep + if sep.[0] = esc then invalidArg sepName "Separator cannot start with escape char." + if sepLen > 1 then + let iMax = sepLen - 1 + for i in 0 .. iMax / 2 do + if sep.[0 .. i] = sep.[sepLen - i - 1 .. iMax] then + invalidArg sepName "Separator cannot have same beginning and ending." + + // Return the tokenizer function + fun source -> + match String.length source - 1 with + | -1 -> Val String.Empty |> Seq.singleton + | iMax -> + let (|Esc|_|) = + let rec aux acc i = + if i <= iMax && source.[i] = esc then aux (acc + 1) (i + 1) else acc + aux 0 >> function 0 -> None | count -> Some count + + let (|Sep|_|) i = + if i <= iMax - sepLen + 1 + && String.CompareOrdinal(source, i, sep, 0, sepLen) = 0 then Some() + else None + + let rec read valLen i = + seq { let wrapVal() = + if valLen > 0 + then source.Substring(i - valLen, valLen) |> Val |> Seq.singleton + else Seq.empty + if i <= iMax then + match i with + | Esc count -> + yield! wrapVal(); yield Esc count; yield! read 0 (i + count) + | Sep -> yield! wrapVal(); yield Sep; yield! read 0 (i + sepLen) + | _ -> yield! read (valLen + 1) (i + 1) + else yield! wrapVal() } + read 0 0 + open System.Text + [] + module String = + /// Returns a new string by connecting the given strings with the given separator. + let concatEscape (esc:char) sep (strings:seq<_>) = + Assert.notNull "strings" strings + let sb = StringBuilder() + + let appendTokens areLast ts = + let appendEsc count = sb.Append(esc, count) |> ignore + let appendVal (v: string) = sb.Append v |> ignore + let appendSep() = appendVal sep + + let rec aux = function + | [] -> () + | Esc count :: [] -> appendEsc <| if areLast then count else count * 2 + | Esc count :: (Sep :: _ as ts) -> appendEsc (count * 2); aux ts + | Esc count :: ts -> appendEsc count; aux ts + | Sep :: ts -> appendEsc 1; appendSep(); aux ts + | Val v :: ts -> appendVal v; aux ts + + aux ts + if not areLast then appendSep() + + strings + |> Seq.map (Tokenizer.create esc sep >> List.ofSeq) + |> Seq.fold (fun ts1 ts2 -> Option.iter (appendTokens false) ts1; Some ts2) None + |> Option.iter (appendTokens true) + + sb.ToString() + + /// Reproduces the original substrings from a string created with concatEscape. + let splitUnescape esc sep string = + Assert.notNull "string" string + let emptyVal = Val String.Empty + let sepVal = Val sep + let flipAppend x1 x2 = Seq.append x2 x1 + + // Produce token stream + string + |> Tokenizer.create esc sep + + // Convert token stream to StringBuilder stream + |> flipAppend [emptyVal] + |> Seq.scan + (fun (sb:StringBuilder, t1) t2 -> + match t1, t2 with + | Esc count, Sep when count % 2 = 1 -> sb.Append(esc, count / 2), sepVal + | Esc count, Sep -> sb.Append(esc, count / 2), Sep + | Esc count, _ -> sb.Append(esc, count), t2 + | Sep, _ -> StringBuilder(), t2 + | Val v, _ -> sb.Append v, t2) + (StringBuilder(), emptyVal) + |> Seq.map fst + + // Of each series of repeated StringBuilder references, keep only the last + // reference (which points to the StringBuilder's completed state). + // Convert the remaining StringBuilder references to strings. + |> flipAppend [null] + |> Seq.pairwise + |> Seq.filter (fun (sb1, sb2) -> sb1 <> sb2) + |> Seq.map (fst >> sprintf "%O") +open StringHelpers +#endif -type OutputData = { - FsiOutput : string - ScriptOutput : string - Merged : string -} - - -type InteractionResult = { - Output : OutputData - Error : OutputData -} - - +/// This exception indicates that an exception happened while compiling or executing given F# code. +#if !NETSTANDARD1_5 +[] +#endif +#if YAAF_FSHARP_SCRIPTING_PUBLIC type FsiEvaluationException = +#else +type internal FsiEvaluationException = +#endif inherit System.Exception val private result : InteractionResult val private input : string @@ -870,8 +594,7 @@ type FsiEvaluationException = inherit System.Exception(msg, inner) input = input result = result - arguments = args - } + arguments = args } #if !NETSTANDARD1_5 new (info:System.Runtime.Serialization.SerializationInfo, context:System.Runtime.Serialization.StreamingContext) = { inherit System.Exception(info, context) @@ -916,22 +639,18 @@ type FsiEvaluationException = | Some args -> sprintf "FsiEvaluationException:\n\nError: %s\n\nOutput: %s\n\nInput: %s\n\Arguments: %s\n\nException: %s" - (nl x.Result.Error.Merged) (nl x.Result.Output.Merged) (nl x.Input) (formatArgs args) (base.ToString()) - - -type IFsiSession = - inherit IDisposable - /// Evaluate the given interaction. - abstract member EvalInteractionWithOutput : string -> InteractionResult - /// Try to evaluate the given expression and return its result. - abstract member TryEvalExpressionWithOutput : string -> InteractionResult * ((obj * System.Type) option) - /// Evaluate the given script. - abstract member EvalScriptWithOutput : string -> InteractionResult - /// Gets the currently build dynamic assembly. - abstract member DynamicAssembly : System.Reflection.Assembly + (nl x.Result.Error.Merged) (nl x.Result.Output.Merged) (nl x.Input) (Log.formatArgs args) (base.ToString()) + +/// Exception for invalid expression types +#if !NETSTANDARD1_5 [] +#endif +#if YAAF_FSHARP_SCRIPTING_PUBLIC type FsiExpressionTypeException = +#else +type internal FsiExpressionTypeException = +#endif val private value : obj option val private expected : System.Type inherit FsiEvaluationException @@ -939,22 +658,47 @@ type FsiExpressionTypeException = inherit FsiEvaluationException(msg, input, None, result, null) expected = expect value = value } +#if !NETSTANDARD1_5 new (info:System.Runtime.Serialization.SerializationInfo, context:System.Runtime.Serialization.StreamingContext) = { inherit FsiEvaluationException(info, context) expected = null value = None } +#endif member x.Value with get () = x.value member x.ExpectedType with get () = x.expected +#if YAAF_FSHARP_SCRIPTING_PUBLIC type HandledResult<'a> = +#else +type internal HandledResult<'a> = +#endif | InvalidExpressionType of FsiExpressionTypeException | InvalidCode of FsiEvaluationException | Result of 'a +/// Represents a simple F# interactive session. +#if YAAF_FSHARP_SCRIPTING_PUBLIC +type IFsiSession = +#else +type internal IFsiSession = +#endif + inherit IDisposable + /// Evaluate the given interaction. + abstract member EvalInteractionWithOutput : string -> InteractionResult + /// Try to evaluate the given expression and return its result. + abstract member TryEvalExpressionWithOutput : string -> InteractionResult * ((obj * System.Type) option) + /// Evaluate the given script. + abstract member EvalScriptWithOutput : string -> InteractionResult + /// Gets the currently build dynamic assembly. + abstract member DynamicAssembly : System.Reflection.Assembly [] +#if YAAF_FSHARP_SCRIPTING_PUBLIC module Extensions = +#else +module internal Extensions = +#endif type IFsiSession with member x.EvalInteraction s = x.EvalInteractionWithOutput s |> ignore member x.TryEvalExpression s = x.TryEvalExpressionWithOutput s |> snd @@ -1035,20 +779,399 @@ module Extensions = | :? System.Reflection.Emit.AssemblyBuilder as builder -> builder | _ -> failwith "The DynamicAssembly property is no AssemblyBuilder!" +#if YAAF_FSHARP_SCRIPTING_PUBLIC +module Shell = +#else +module internal Shell = +#endif + /// Represents a simple (fake) event loop for the 'fsi' object + type SimpleEventLoop () = + member __.Run () = () + member __.Invoke<'T>(f:unit -> 'T) = f() + member __.ScheduleRestart() = () + + /// Implements a simple 'fsi' object to be passed to the FSI evaluator + [] + type InteractiveSettings() = + let mutable evLoop = (new SimpleEventLoop()) + let mutable showIDictionary = true + let mutable showDeclarationValues = true + let mutable args = System.Environment.GetCommandLineArgs() + let mutable fpfmt = "g10" + let mutable fp = (System.Globalization.CultureInfo.InvariantCulture :> System.IFormatProvider) + let mutable printWidth = 78 + let mutable printDepth = 100 + let mutable printLength = 100 + let mutable printSize = 10000 + let mutable showIEnumerable = true + let mutable showProperties = true + let mutable addedPrinters = [] + + member __.FloatingPointFormat with get() = fpfmt and set v = fpfmt <- v + member __.FormatProvider with get() = fp and set v = fp <- v + member __.PrintWidth with get() = printWidth and set v = printWidth <- v + member __.PrintDepth with get() = printDepth and set v = printDepth <- v + member __.PrintLength with get() = printLength and set v = printLength <- v + member __.PrintSize with get() = printSize and set v = printSize <- v + member __.ShowDeclarationValues with get() = showDeclarationValues and set v = showDeclarationValues <- v + member __.ShowProperties with get() = showProperties and set v = showProperties <- v + member __.ShowIEnumerable with get() = showIEnumerable and set v = showIEnumerable <- v + member __.ShowIDictionary with get() = showIDictionary and set v = showIDictionary <- v + member __.AddedPrinters with get() = addedPrinters and set v = addedPrinters <- v + member __.CommandLineArgs with get() = args and set v = args <- v + member __.AddPrinter(printer : 'T -> string) = + addedPrinters <- Choice1Of2 (typeof<'T>, unbox >> printer) :: addedPrinters + + member __.EventLoop + with get () = evLoop + and set (_:SimpleEventLoop) = () + + member __.AddPrintTransformer(printer : 'T -> obj) = + addedPrinters <- Choice2Of2 (typeof<'T>, unbox >> printer) :: addedPrinters + +module internal ArgParser = + let (|StartsWith|_|) start (s:string) = + if s.StartsWith (start) then + StartsWith(s.Substring(start.Length)) + |> Some + else + None + let (|FsiBoolArg|_|) argName s = + match s with + | StartsWith argName rest -> + match rest with + | null | "" | "+" -> Some true + | "-" -> Some false + | _ -> None + | _ -> None +open ArgParser +#if YAAF_FSHARP_SCRIPTING_PUBLIC +type DebugMode = +#else +type internal DebugMode = +#endif + | Full + | PdbOnly + | Portable + | NoDebug - -let consoleCapture out err f = - let defOut = Console.Out - let defErr = Console.Error - try - Console.SetOut out - Console.SetError err - f () - finally - Console.SetOut defOut - Console.SetError defErr - -type ForwardTextWriter (f) = +#if YAAF_FSHARP_SCRIPTING_PUBLIC +type OptimizationType = +#else +type internal OptimizationType = +#endif + | NoJitOptimize + | NoJitTracking + | NoLocalOptimize + | NoCrossOptimize + | NoTailCalls + +/// See https://msdn.microsoft.com/en-us/library/dd233172.aspx +#if YAAF_FSHARP_SCRIPTING_PUBLIC +type FsiOptions = +#else +type internal FsiOptions = +#endif + { Checked : bool option + Codepage : int option + CrossOptimize : bool option + Debug : DebugMode option + Defines : string list + Exec : bool + FullPaths : bool + Gui : bool option + LibDirs : string list + Loads : string list + NoFramework : bool + NoLogo : bool + NonInteractive : bool + NoWarns : int list + Optimize : (bool * OptimizationType list) list + Quiet : bool + QuotationsDebug : bool + ReadLine : bool option + References : string list + TailCalls : bool option + Uses : string list + Utf8Output : bool + /// Sets a warning level (0 to 5). The default level is 3. Each warning is given a level based on its severity. Level 5 gives more, but less severe, warnings than level 1. + /// Level 5 warnings are: 21 (recursive use checked at runtime), 22 (let rec evaluated out of order), 45 (full abstraction), and 52 (defensive copy). All other warnings are level 2. + WarnLevel : int option + WarnAsError : bool option + WarnAsErrorList : (bool * int list) list + ScriptArgs : string list } + static member Empty = + { Checked = None + Codepage = None + CrossOptimize = None + Debug = None + Defines = [] + Exec = false + FullPaths = false + Gui = None + LibDirs = [] + Loads = [] + NoFramework = false + NoLogo = false + NonInteractive = false + NoWarns = [] + Optimize = [] + Quiet = false + QuotationsDebug = false + ReadLine = None + References = [] + TailCalls = None + Uses = [] + Utf8Output = false + /// Sets a warning level (0 to 5). The default level is 3. Each warning is given a level based on its severity. Level 5 gives more, but less severe, warnings than level 1. + /// Level 5 warnings are: 21 (recursive use checked at runtime), 22 (let rec evaluated out of order), 45 (full abstraction), and 52 (defensive copy). All other warnings are level 2. + WarnLevel= None + WarnAsError = None + WarnAsErrorList = [] + ScriptArgs = [] } + static member Default = +#if !NETSTANDARD1_5 + // find a FSharp.Core.dll with optdata and sigdata + let runtimeDir = System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory() + let includes = + if isMono then + // Workaround that FSC doesn't find a FSharp.Core.dll + let monoDir = System.IO.Path.GetDirectoryName runtimeDir + // prefer current runtime (which FSC would find anyway, but fallback to 4.0 if nothing is found in 4.5 or higher) + // See also https://github.com/fsharp/fsharp/pull/389, https://github.com/fsharp/fsharp/pull/388 + [ runtimeDir; System.IO.Path.Combine (monoDir, "4.0") ] + else [ runtimeDir ] +#else + let includes = [] +#endif + let fsCore = FSharpCheckerFuncs.findFSCore [] includes + Log.verbf "Using FSharp.Core: %s" fsCore + { FsiOptions.Empty with + LibDirs = includes + NoFramework = true + References = [ fsCore ] + NonInteractive = true } + static member ofArgs args = + args + |> Seq.fold (fun (parsed, state) (arg:string) -> + match state, arg with + | (false, Some cont), _ when not (arg.StartsWith ("--")) -> + let parsed, (userArgs, newCont) = cont arg + parsed, (userArgs, unbox newCont) + | _, "--" -> parsed, (true, None) + | (true, _), a -> { parsed with ScriptArgs = a :: parsed.ScriptArgs }, state + | _, FsiBoolArg "--checked" enabled -> + { parsed with Checked = Some enabled }, state + | _, StartsWith "--codepage:" res -> { parsed with Codepage = Some (int res) }, state + | _, FsiBoolArg "--crossoptimize" enabled -> + { parsed with CrossOptimize = Some enabled }, state + | _, StartsWith "--debug:" "pdbonly" + | _, StartsWith "-g:" "pdbonly" -> + { parsed with Debug = Some DebugMode.PdbOnly }, state + | _, StartsWith "--debug:" "portable" + | _, StartsWith "-g:" "portable" -> + { parsed with Debug = Some DebugMode.Portable }, state + | _, StartsWith "--debug:" "full" + | _, StartsWith "-g:" "full" + | _, FsiBoolArg "--debug" true + | _, FsiBoolArg "-g" true -> + { parsed with Debug = Some DebugMode.Full }, state + | _, FsiBoolArg "--debug" false + | _, FsiBoolArg "-g" false -> + { parsed with Debug = Some DebugMode.NoDebug }, state + | _, StartsWith "-d:" def + | _, StartsWith "--define:" def -> + { parsed with Defines = def :: parsed.Defines }, state + | _, "--exec" -> + { parsed with Exec = true }, state + | _, "--noninteractive" -> + { parsed with NonInteractive = true }, state + | _, "--fullpaths" -> + { parsed with FullPaths = true }, state + | _, FsiBoolArg "--gui" enabled -> + { parsed with Gui = Some enabled }, state + | _, StartsWith "-I:" lib + | _, StartsWith "--lib:" lib -> + { parsed with LibDirs = lib :: parsed.LibDirs }, state + | _, StartsWith "--load:" load -> + { parsed with Loads = load :: parsed.Loads }, state + | _, "--noframework" -> + { parsed with NoFramework = true }, state + | _, "--nologo" -> + { parsed with NoLogo = true }, state + | _, StartsWith "--nowarn:" warns -> + let noWarns = + warns.Split([|','|]) + |> Seq.map int + |> Seq.toList + { parsed with NoWarns = noWarns @ parsed.NoWarns }, state + | _, FsiBoolArg "--optimize" enabled -> + let cont (arg:string) = + let optList = + arg.Split([|','|]) + |> Seq.map (function + | "nojitoptimize" -> NoJitOptimize + | "nojittracking" -> NoJitTracking + | "nolocaloptimize" -> NoLocalOptimize + | "nocrossoptimize" -> NoCrossOptimize + | "notailcalls" -> NoTailCalls + | unknown -> failwithf "Unknown optimization option %s" unknown) + |> Seq.toList + { parsed with Optimize = (enabled, optList) :: parsed.Optimize}, (false, box None) + { parsed with Optimize = (enabled, []) :: parsed.Optimize}, (false, Some cont) + | _, "--quiet" -> + { parsed with Quiet = true }, state + | _, "--quotations-debug" -> + { parsed with QuotationsDebug = true }, state + | _, FsiBoolArg "--readline" enabled -> + { parsed with ReadLine = Some enabled }, state + | _, StartsWith "-r:" ref + | _, StartsWith "--reference:" ref -> + { parsed with References = ref :: parsed.References }, state + | _, FsiBoolArg "--tailcalls" enabled -> + { parsed with TailCalls = Some enabled }, state + | _, StartsWith "--use:" useFile -> + { parsed with Uses = useFile :: parsed.Uses }, state + | _, "--utf8output" -> + { parsed with Utf8Output = true }, state + | _, StartsWith "--warn:" warn -> + { parsed with WarnLevel = Some (int warn) }, state + | _, FsiBoolArg "--warnaserror" enabled -> + { parsed with WarnAsError = Some enabled }, state + | _, StartsWith "--warnaserror" warnOpts -> + let parseList (l:string) = + l.Split [|','|] + |> Seq.map int + |> Seq.toList + match warnOpts.[0], if warnOpts.Length > 1 then Some warnOpts.[1] else None with + | ':', _ -> + { parsed with WarnAsErrorList = (true, parseList (warnOpts.Substring 1)) :: parsed.WarnAsErrorList }, state + | '+', Some ':' -> + { parsed with WarnAsErrorList = (true, parseList (warnOpts.Substring 2)) :: parsed.WarnAsErrorList }, state + | '-', Some ':' -> + { parsed with WarnAsErrorList = (false, parseList (warnOpts.Substring 2)) :: parsed.WarnAsErrorList }, state + | _ -> failwithf "invalid --warnaserror argument: %s" arg + | _, unknown -> { parsed with ScriptArgs = unknown :: parsed.ScriptArgs }, (true, None) + ) (FsiOptions.Empty, (false, None)) + |> fst + |> (fun p -> + { p with + ScriptArgs = p.ScriptArgs |> List.rev + Defines = p.Defines |> List.rev + References = p.References |> List.rev + LibDirs = p.LibDirs |> List.rev + Loads = p.Loads |> List.rev + Uses = p.Uses |> List.rev }) + member x.AsArgs = + let maybeArg opt = + match opt with + | Some a -> Seq.singleton a + | None -> Seq.empty + let maybeArgMap opt f = + opt + |> Option.map f + |> maybeArg + let getMinusPlus b = if b then "+" else "-" + let getFsiBoolArg name opt = + maybeArgMap opt (getMinusPlus >> sprintf "%s%s" name) + let getSimpleBoolArg name b = + if b then + Some name + else None + |> maybeArg + [| + yield! getFsiBoolArg "--checked" x.Checked + yield! maybeArgMap x.Codepage (fun i -> sprintf "--codepage:%d" i) + yield! getFsiBoolArg "--crossoptimize" x.CrossOptimize + // ! -g[+|-|:full|:pdbonly] is not working, see https://github.com/Microsoft/visualfsharp/issues/311 + yield! maybeArgMap x.Debug (function + | Full -> "--debug:full" + | PdbOnly -> "--debug:pdbonly" + | Portable -> "--debug:portable" + | NoDebug -> "--debug-") + yield! x.Defines + |> Seq.map (sprintf "--define:%s") + yield! getSimpleBoolArg "--exec" x.Exec + yield! getSimpleBoolArg "--fullpaths" x.FullPaths + yield! getFsiBoolArg "--gui" x.Gui + yield! x.LibDirs + |> Seq.map (sprintf "-I:%s") + yield! x.Loads + |> Seq.map (sprintf "--load:%s") + yield! getSimpleBoolArg "--noframework" x.NoFramework + yield! getSimpleBoolArg "--nologo" x.NoLogo + yield! getSimpleBoolArg "--noninteractive" x.NonInteractive + + yield! (match x.NoWarns with + | [] -> None + | l -> + l + |> Seq.map string + |> String.concat "," + |> sprintf "--nowarn:%s" + |> Some) + |> maybeArg + yield! + match x.Optimize with + | [] -> Seq.empty + | opts -> + opts + |> Seq.map (fun (enable, types) -> + seq { + yield sprintf "--optimize%s" (getMinusPlus enable) + match types with + | [] -> () + | _ -> + yield + types + |> Seq.map (function + | NoJitOptimize -> "nojitoptimize" + | NoJitTracking -> "nojittracking" + | NoLocalOptimize -> "nolocaloptimize" + | NoCrossOptimize -> "nocrossoptimize" + | NoTailCalls -> "notailcalls") + |> String.concat "," + } + ) + |> Seq.concat + + yield! getSimpleBoolArg "--quiet" x.Quiet + yield! getSimpleBoolArg "--quotations-debug" x.QuotationsDebug + yield! getFsiBoolArg "--readline" x.ReadLine + + yield! x.References + |> Seq.map (sprintf "-r:%s") + + yield! getFsiBoolArg "--tailcalls" x.TailCalls + yield! x.Uses + |> Seq.map (sprintf "--use:%s") + + yield! getSimpleBoolArg "--utf8output" x.Utf8Output + + yield! maybeArgMap x.WarnLevel (fun i -> sprintf "--warn:%d" i) + + yield! getFsiBoolArg "--warnaserror" x.WarnAsError + + yield! x.WarnAsErrorList + |> Seq.map (fun (enable, warnNums) -> + warnNums + |> Seq.map string + |> String.concat "," + |> sprintf "--warnaserror%s:%s" (getMinusPlus enable)) + + match x.ScriptArgs with + | [] -> () + | l -> + yield "--" + yield! l + |] + +module internal Helper = + open System + open Microsoft.FSharp.Compiler.Interactive.Shell + open System.IO + open System.Text + type ForwardTextWriter (f) = inherit TextWriter() override __.Flush() = () override __.Write(c:char) = f (string c) @@ -1060,8 +1183,7 @@ type ForwardTextWriter (f) = if r then f null override __.Encoding = Encoding.UTF8 static member Create f = new ForwardTextWriter (f) :> TextWriter - -type CombineTextWriter (l : TextWriter list) = + type CombineTextWriter (l : TextWriter list) = inherit TextWriter() do assert (l.Length > 0) let doAll f = @@ -1076,8 +1198,7 @@ type CombineTextWriter (l : TextWriter list) = if r then doAll (fun t -> t.Dispose()) override __.Encoding = Encoding.UTF8 static member Create l = new CombineTextWriter (l) :> TextWriter - -type OutStreamHelper (saveGlobal, liveOutWriter : _ option, liveFsiWriter : _ option) = + type OutStreamHelper (saveGlobal, liveOutWriter : _ option, liveFsiWriter : _ option) = let globalFsiOut = new StringBuilder() let globalStdOut = new StringBuilder() let globalMergedOut = new StringBuilder() @@ -1101,14 +1222,24 @@ type OutStreamHelper (saveGlobal, liveOutWriter : _ option, liveFsiWriter : _ op let [ fsi; std; merged ] = all |> List.map (fun (global', local) -> - let data = local.ToString() - if saveGlobal then global'.Append(data) |> ignore - local.Clear() |> ignore - data - ) + let data = local.ToString() + if saveGlobal then global'.Append(data) |> ignore + local.Clear() |> ignore + data) { FsiOutput = fsi; ScriptOutput = std; Merged = merged} -let getSession (fsi : obj, options : FsiOptions, reportGlobal, liveOut, liveOutFsi, liveErr, liveErrFsi, preventStdOut) = + let consoleCapture out err f = + let defOut = Console.Out + let defErr = Console.Error + try + Console.SetOut out + Console.SetError err + f () + finally + Console.SetOut defOut + Console.SetError defErr + + let getSession (fsi : obj, options : FsiOptions, reportGlobal, liveOut, liveOutFsi, liveErr, liveErrFsi, preventStdOut) = // Intialize output and input streams let out = new OutStreamHelper(reportGlobal, liveOut, liveOutFsi) let err = new OutStreamHelper(reportGlobal, liveErr, liveErrFsi) @@ -1119,7 +1250,7 @@ let getSession (fsi : obj, options : FsiOptions, reportGlobal, liveOut, liveOutF let args = [| yield "C:\\fsi.exe" yield! options.AsArgs |] - printfn "Starting nested fsi.exe with args: %s" (formatArgs args) + Log.verbf "Starting nested fsi.exe with args: %s" (Log.formatArgs args) let saveOutput () = let out = out.GetOutputAndResetLocal() let err = err.GetOutputAndResetLocal() @@ -1151,7 +1282,7 @@ let getSession (fsi : obj, options : FsiOptions, reportGlobal, liveOut, liveOutF raise <| new FsiEvaluationException( "Error while creating a fsi session.", - sprintf "Fsi Arguments: %s" (formatArgs args), + sprintf "Fsi Arguments: %s" (Log.formatArgs args), args |> Array.toList |> Some, { Output = out; Error = err }, e) @@ -1204,7 +1335,7 @@ let getSession (fsi : obj, options : FsiOptions, reportGlobal, liveOut, liveOutF // We just compile ourself a forwarder to fix that. //session.Reference (typeof.Assembly.Location) //session.Let "fsi" fsi -//#if !NETSTANDARD1_5 // Currently this is broken on netcore +#if !NETSTANDARD1_5 // Currently this is broken on netcore session.Let "__rawfsi" (box fsi) session.EvalInteraction """ module __ReflectHelper = @@ -1295,11 +1426,15 @@ module __ReflectHelper = member self.AddPrintTransformer(printer : 'T -> obj) = callInstanceMethod1 fsiObj [|typeof<'T>|] "AddPrintTransformer" printer let fsi = __ReflectHelper.ForwardingInteractiveSettings(__rawfsi)""" - +#endif session - +open System.IO +#if YAAF_FSHARP_SCRIPTING_PUBLIC type ScriptHost private() = +#else +type internal ScriptHost private() = +#endif /// Creates a forwarder Textwriter, which forwards all output to the given function. /// Set revertRedirect only to "false" if you know that f doesn't print anything to the stdout. /// When revertRedirect is true we capture the Console.Out property and set it before calling f. @@ -1308,64 +1443,63 @@ type ScriptHost private() = /// The difference is that with removeNewLines you should use printfn and get lines without newline characters. /// On the other hand without removeNewLines you are called on every TextWriter.Write call, /// so you might be called multiple times for a single lines or a single time for multiple lines. - static member CreateForwardWriter (f, ?revertRedirect, ?removeNewLines) = - let revertRedirect = defaultArg revertRedirect true - let removeNewLines = defaultArg removeNewLines false - let captureOut = System.Console.Out - let captureErr = System.Console.Error - let bufferF = - let builder = new System.Text.StringBuilder() - let properEndLine = ref false - let clearBuilder () = - let current = builder.ToString() - builder.Clear() |> ignore - let reader = new StringReader(current) - let mutable line = "" - while isNull line |> not do - line <- reader.ReadLine() - if isNull line |> not then - if reader.Peek() = -1 && not (current.EndsWith "\n") then - properEndLine := false - builder.Append line |> ignore - else - properEndLine := true - f line - (fun (data:string) -> - if isNull data then - // finished. - let last = builder.ToString() - if !properEndLine || not (System.String.IsNullOrEmpty last) then - f last + static member CreateForwardWriter (f, ?revertRedirect, ?removeNewLines) = + let revertRedirect = defaultArg revertRedirect true + let removeNewLines = defaultArg removeNewLines false + let captureOut = System.Console.Out + let captureErr = System.Console.Error + let bufferF = + let builder = new System.Text.StringBuilder() + let properEndLine = ref false + let clearBuilder () = + let current = builder.ToString() + builder.Clear() |> ignore + let reader = new StringReader(current) + let mutable line = "" + while isNull line |> not do + line <- reader.ReadLine() + if isNull line |> not then + if reader.Peek() = -1 && not (current.EndsWith "\n") then + properEndLine := false + builder.Append line |> ignore else - builder.Append data |> ignore - clearBuilder()) - let withBuffer = if removeNewLines then bufferF else (fun s -> if isNull s |> not then f s) - let myF data = consoleCapture captureOut captureErr (fun () -> withBuffer data) - ForwardTextWriter.Create - (if revertRedirect then myF else withBuffer) - /// Create a new IFsiSession by specifying all fsi arguments manually. - static member Create - ( opts : FsiOptions, ?fsiObj : obj, ?reportGlobal, - ?outWriter : TextWriter, ?fsiOutWriter : TextWriter, - ?errWriter : TextWriter, ?fsiErrWriter : TextWriter, - ?preventStdOut) = - getSession( - defaultArg fsiObj (Microsoft.FSharp.Compiler.Interactive.Shell.Settings.fsi :> obj), - opts, - defaultArg reportGlobal false, outWriter, fsiOutWriter, errWriter, fsiErrWriter, - defaultArg preventStdOut false) - - /// Quickly create a new IFsiSession with some sane defaults - static member CreateNew - ( ?defines : string list, ?fsiObj : obj, ?reportGlobal, - ?outWriter : TextWriter, ?fsiOutWriter : TextWriter, - ?errWriter : TextWriter, ?fsiErrWriter : TextWriter, - ?preventStdOut) = - let opts = - { FsiOptions.Default with - Defines = defaultArg defines [] } - ScriptHost.Create - (opts, ?fsiObj = fsiObj, ?reportGlobal = reportGlobal, - ?outWriter = outWriter, ?fsiOutWriter = fsiOutWriter, - ?errWriter = errWriter, ?fsiErrWriter = fsiErrWriter, - ?preventStdOut = preventStdOut) \ No newline at end of file + properEndLine := true + f line + (fun (data:string) -> + if isNull data then + // finished. + let last = builder.ToString() + if !properEndLine || not (System.String.IsNullOrEmpty last) then + f last + else + builder.Append data |> ignore + clearBuilder()) + let withBuffer = if removeNewLines then bufferF else (fun s -> if isNull s |> not then f s) + let myF data = Helper.consoleCapture captureOut captureErr (fun () -> withBuffer data) + Helper.ForwardTextWriter.Create + (if revertRedirect then myF else withBuffer) + /// Create a new IFsiSession by specifying all fsi arguments manually. + static member Create + ( opts : FsiOptions, ?fsiObj : obj, ?reportGlobal, + ?outWriter : TextWriter, ?fsiOutWriter : TextWriter, + ?errWriter : TextWriter, ?fsiErrWriter : TextWriter, + ?preventStdOut) = + Helper.getSession( + defaultArg fsiObj (Microsoft.FSharp.Compiler.Interactive.Shell.Settings.fsi :> obj), + opts, + defaultArg reportGlobal false, outWriter, fsiOutWriter, errWriter, fsiErrWriter, + defaultArg preventStdOut false) + /// Quickly create a new IFsiSession with some sane defaults + static member CreateNew + ( ?defines : string list, ?fsiObj : obj, ?reportGlobal, + ?outWriter : TextWriter, ?fsiOutWriter : TextWriter, + ?errWriter : TextWriter, ?fsiErrWriter : TextWriter, + ?preventStdOut) = + let opts = + { FsiOptions.Default with + Defines = defaultArg defines [] } + ScriptHost.Create + (opts, ?fsiObj = fsiObj, ?reportGlobal = reportGlobal, + ?outWriter = outWriter, ?fsiOutWriter = fsiOutWriter, + ?errWriter = errWriter, ?fsiErrWriter = fsiErrWriter, + ?preventStdOut = preventStdOut) \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 615e45626..7ef6fd183 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,11 +1,12 @@ source https://api.nuget.org/v3/index.json source https://nuget.org/api/v2 source https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json +source https://ci.appveyor.com/nuget/fake redirects: on nuget FSharp.Data -nuget FAKE +nuget FAKE prerelease nuget CommandLineParser nuget FSharp.Core redirects:force, content:none nuget Microsoft.AspNet.Razor @@ -15,7 +16,7 @@ nuget ILRepack nuget Argu -# github matthid/Yaaf.FSharp.Scripting src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs +#github matthid/Yaaf.FSharp.Scripting src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs group Test source https://api.nuget.org/v3/index.json diff --git a/paket.lock b/paket.lock index c8061fede..7b0579c33 100644 --- a/paket.lock +++ b/paket.lock @@ -6,7 +6,6 @@ NUGET NETStandard.Library (>= 1.6) - framework: >= net463, >= netstandard16 System.Xml.XDocument (>= 4.0.11) - framework: >= net463, >= netstandard16 CommandLineParser (1.9.71) - FAKE (4.58.6) FSharp.Compiler.Service (12.0.5) - content: none FSharp.Core (>= 4.1.2) - framework: >= netstandard16 Microsoft.DiaSymReader (>= 1.1) - framework: >= netstandard16 @@ -502,12 +501,12 @@ NUGET Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13 System.Runtime (>= 4.3) - framework: >= netstandard13 System.Runtime.InteropServices (4.3) - content: none, framework: >= net10, >= netstandard11 - 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 + Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11 + Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11 + System.Reflection (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11 + System.Reflection.Primitives (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11 + System.Runtime (>= 4.3) - framework: net462, >= net463, dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11 + System.Runtime.Handles (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard15, netcore11 System.Runtime.InteropServices.RuntimeInformation (4.3) - framework: >= net463, >= netstandard16 runtime.native.System (>= 4.3) - framework: >= netstandard11 System.Reflection (>= 4.3) - framework: dnxcore50, >= netstandard11 @@ -640,7 +639,7 @@ NUGET 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 (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16, netcore11 System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard16 System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard16 System.Threading (4.3) - content: none, framework: >= net10, >= netstandard10 @@ -706,9 +705,8 @@ NUGET System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard13 System.Xml.ReaderWriter (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 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 (40ef4e32a115962436809666b6868693be6444c2) + remote: https://ci.appveyor.com/nuget/fake + FAKE (5.0.0-alpha004) GROUP Test NUGET remote: https://api.nuget.org/v3/index.json diff --git a/src/FSharp.CodeFormat/CodeFormatAgent.fs b/src/FSharp.CodeFormat/CodeFormatAgent.fs index 5259f3bfe..8d60b86e8 100644 --- a/src/FSharp.CodeFormat/CodeFormatAgent.fs +++ b/src/FSharp.CodeFormat/CodeFormatAgent.fs @@ -16,12 +16,15 @@ open Microsoft.FSharp.Compiler.SourceCodeServices open FSharp.CodeFormat open FSharp.CodeFormat.CommentFilter open FSharp.Formatting.Common +open Yaaf.FSharp.Scripting +open FSharp.Formatting.Common +//type Log = FSharp.Formatting.Common.Log // -------------------------------------------------------------------------------------- // ? // -------------------------------------------------------------------------------------- -module private Helpers = - +module private Helpers = + /// Mapping table that translates F# compiler representation to our union let getTokenKind = function | FSharpTokenColorKind.Comment -> TokenKind.Comment @@ -33,15 +36,15 @@ module private Helpers = | FSharpTokenColorKind.Punctuation -> TokenKind.Punctuation | FSharpTokenColorKind.PreprocessorKeyword -> TokenKind.Preprocessor | FSharpTokenColorKind.String -> TokenKind.String - | FSharpTokenColorKind.UpperIdentifier -> TokenKind.Identifier + | FSharpTokenColorKind.UpperIdentifier -> TokenKind.Identifier | FSharpTokenColorKind.Text | FSharpTokenColorKind.Default | _ -> TokenKind.Default // Parse command line options - split string by space, but if there is something // enclosed in double quotes "..." then ignore spaces in the quoted text - let parseOptions (str:string) = + let parseOptions (str:string) = let rec loop i opts current = - let opts = + let opts = if i < str.Length && str.[i] <> ' ' then opts else (System.String(current |> List.rev |> Array.ofSeq))::opts if i = str.Length then opts @@ -57,10 +60,10 @@ module private Helpers = /// Use the F# compiler's SourceTokenizer to split a snippet (array of strings) /// into a snippet with token information and line numbers. - let getTokens file defines (lines:string[]) : Snippet = + let getTokens file defines (lines:string[]) : Snippet = // Get defined directives - let defines = defines |> Option.map (fun (s:string) -> + let defines = defines |> Option.map (fun (s:string) -> s.Split([| ' '; ';'; ',' |], StringSplitOptions.RemoveEmptyEntries) |> List.ofSeq) // Create source tokenizer let sourceTok = FSharpSourceTokenizer(defaultArg defines [], file) @@ -77,21 +80,21 @@ module private Helpers = yield str, tok state := nstate yield! parseLine() - | None, nstate -> state := nstate + | None, nstate -> state := nstate } - yield { StartLine = n; StartColumn = 0; EndLine = n; EndColumn = 0 }, parseLine() |> List.ofSeq + yield { StartLine = n; StartColumn = 0; EndLine = n; EndColumn = 0 }, parseLine() |> List.ofSeq ] indexedSnippetLines // Count the minimal number of spaces at the beginning of lines // (so that we can remove spaces for indented text) - let countStartingSpaces (lines:Snippet) = + let countStartingSpaces (lines:Snippet) = [ for _, (toks:_ list) in lines do match toks with | ((text:string), info)::_ when info.TokenName = "WHITESPACE" -> yield text.Length - text.TrimStart([| ' ' |]).Length | [] -> () - | _ -> yield 0 + | _ -> yield 0 ] |> Seq.fold min 0 // -------------------------------------------------------------------------------------- @@ -100,17 +103,17 @@ module private Helpers = -type [] Range = { +type [] Range = { LeftCol : int - RightCol : int + RightCol : int } with - static member Create leftCol rightCol = + static member Create leftCol rightCol = { LeftCol = leftCol; RightCol = rightCol } /// Uses agent to handle formatting requests -type CodeFormatAgent() = +type CodeFormatAgent() = // Create keys for query tooltips for double-backtick identifiers - let processDoubleBackticks (body : string) = + let processDoubleBackticks (body : string) = if body.StartsWith "``" then sprintf "( %s )" <| body.Trim '`' else body @@ -128,40 +131,40 @@ type CodeFormatAgent() = | SemanticClassificationType.ValueType -> Some TokenKind.ValueType | SemanticClassificationType.Disposable -> Some TokenKind.Disposable | SemanticClassificationType.ComputationExpression -> Some TokenKind.Keyword - | SemanticClassificationType.TypeArgument -> Some TokenKind.TypeArgument + | SemanticClassificationType.TypeArgument -> Some TokenKind.TypeArgument | SemanticClassificationType.Operator -> Some TokenKind.Operator | SemanticClassificationType.IntrinsicFunction -> Some TokenKind.Keyword // Processes a single line of the snippet - let processSnippetLine (checkResults: FSharpCheckFileResults) (semanticRanges: (Range.range * SemanticClassificationType)[]) + let processSnippetLine (checkResults: FSharpCheckFileResults) (semanticRanges: (Range.range * SemanticClassificationType)[]) (lines: string[]) (line: int, lineTokens: SnippetLine) = let lineStr = lines.[line] // Recursive processing of tokens on the line (keeps a long identifier 'island') let rec loop island (tokens: SnippetLine) (stringRange: Range option) = seq { - match tokens with + match tokens with | [] -> () | (body, token)::rest when token.ColorClass = FSharpTokenColorKind.Keyword -> yield FSharp.CodeFormat.Token (TokenKind.Keyword, body, None) yield! loop [] rest None - | (body, token) :: rest -> + | (body, token) :: rest -> let stringRange, completedStringRange, rest = match rest with // it's the last token in the string | [] -> match token.ColorClass, stringRange with - | FSharpTokenColorKind.String, None -> + | FSharpTokenColorKind.String, None -> None, Some (Range.Create token.LeftColumn token.RightColumn), rest - | FSharpTokenColorKind.String, Some range -> + | FSharpTokenColorKind.String, Some range -> None, Some { range with RightCol = token.RightColumn }, rest | _, Some range -> None, Some range, tokens | _ -> None, None, rest | _ -> match token.ColorClass, stringRange with - | FSharpTokenColorKind.String, None -> + | FSharpTokenColorKind.String, None -> Some (Range.Create token.LeftColumn token.RightColumn), None, rest - | FSharpTokenColorKind.String, Some range -> + | FSharpTokenColorKind.String, Some range -> Some { range with RightCol = token.RightColumn }, None, rest | _, Some range -> None, Some range, tokens | _ -> None, None, rest @@ -171,7 +174,7 @@ type CodeFormatAgent() = // Update the current identifier island (long identifier e.g. Collections.List.map) let island = match token.TokenName with - | "DOT" -> island // keep what we have found so far + | "DOT" -> island // keep what we have found so far | "IDENT" -> processDoubleBackticks body::island // add current identifier | _ -> [] // drop everything - not in island // Find tootltip using F# compiler service & the identifier island @@ -180,29 +183,29 @@ type CodeFormatAgent() = if (token.TokenName = "IDENT") then let island = List.rev island let tip = checkResults.GetToolTipTextAlternate(line + 1, token.LeftColumn + 1, lines.[line], island,FSharpTokenTag.IDENT) - match Async.RunSynchronously tip |> fun (tooltip) -> + match Async.RunSynchronously tip |> fun (tooltip) -> //tooltip. - ToolTipReader.tryFormatTip tooltip with + ToolTipReader.tryFormatTip tooltip with | Some(_) as res -> res | _ -> None else None - - if token.TokenName.StartsWith("OMIT") then + + if token.TokenName.StartsWith("OMIT") then // Special OMIT tag - add tool tip stored in token name // (The text immediately follows the keyword "OMIT") - yield Omitted(body, token.TokenName.Substring(4)) + yield Omitted(body, token.TokenName.Substring(4)) elif token.TokenName = "FSI" then // F# Interactive output - return as Output token yield Output(body) else match tip with | Some (Literal msg::_) when msg.StartsWith("custom operation:") -> - // If the tool-tip says this is a custom operation, then + // If the tool-tip says this is a custom operation, then // we want to treat it as keyword (not sure if there is a better // way to detect this, but Visual Studio also colors these later) yield FSharp.CodeFormat.Token(TokenKind.Keyword, body, tip) - | _ -> - let kind = + | _ -> + let kind = semanticRanges |> Array.tryFind (fun (range,_) -> range.StartColumn = token.LeftColumn) |> Option.bind (fun (_,category) -> categoryToTokenKind category) @@ -213,9 +216,9 @@ type CodeFormatAgent() = | Some _x, None -> yield! loop island rest stringRange | _x, Some { LeftCol = strLeftCol; RightCol = strRightCol } -> - let printfOrEscapedSpans = - semanticRanges - |> Array.filter (fun (range,category) -> + let printfOrEscapedSpans = + semanticRanges + |> Array.filter (fun (range,category) -> (category = SemanticClassificationType.Printf) && range.StartColumn >= strLeftCol && range.EndColumn <= strRightCol) @@ -226,7 +229,7 @@ type CodeFormatAgent() = let data = spans |> Array.fold (fun points (range,category) -> - points + points |> Set.add range.StartColumn |> Set.add (range.EndColumn - 1)) Set.empty |> Set.add (strLeftCol - 1) @@ -234,17 +237,17 @@ type CodeFormatAgent() = |> Set.toSeq |> Seq.pairwise |> Seq.map (fun (leftPoint, rightPoint) -> - printfOrEscapedSpans - |> Array.tryFind (fun (range,category) -> range.StartColumn = leftPoint) + printfOrEscapedSpans + |> Array.tryFind (fun (range,category) -> range.StartColumn = leftPoint) |> Option.bind (fun (range,category)-> categoryToTokenKind category |> Option.map (fun kind -> range.StartColumn, range.EndColumn, kind)) |> Option.defaultValue (leftPoint+1, rightPoint, TokenKind.String)) - + for leftPoint, rightPoint, kind in data do yield FSharp.CodeFormat.Token (kind, lineStr.[leftPoint..rightPoint-1], None) // Process the rest of the line - yield! loop island rest stringRange + yield! loop island rest stringRange } // Process the current line & return info about it @@ -252,118 +255,180 @@ type CodeFormatAgent() = /// Process snippet let processSnippet checkResults categorizedRanges lines (snippet: Snippet) = - snippet + snippet |> List.map (fun snippetLine -> - - processSnippetLine - checkResults - (categorizedRanges - |> Map.tryFind ((fst snippetLine).StartLine + 1) - |> function None -> [||] | Some spans -> Array.ofSeq spans) - lines + + processSnippetLine + checkResults + (categorizedRanges + |> Map.tryFind ((fst snippetLine).StartLine + 1) + |> function None -> [||] | Some spans -> Array.ofSeq spans) + lines ((fst snippetLine).StartLine, snd snippetLine)) // -------------------------------------------------------------------------------------- // Create an instance of an InteractiveChecker (which does background analysis // in a typical IntelliSense editor integration for F#) - let fsChecker = FSharpChecker.Create() - + let fsChecker = FSharpCheckerFuncs.checker // FSharpChecker.Create() // ------------------------------------------------------------------------------------ - let processSourceCode (filePath, source, options, defines) = asyncMaybe { - + let processSourceCode (filePath, source, options, defines) = async { + Log.verbf "starting to process source code from '%s'" filePath // Read the source code into an array of lines use reader = new StringReader(source) - let sourceLines = [| + let sourceLines = [| let line = ref "" while (line := reader.ReadLine(); line.Value <> null) do - yield line.Value + yield line.Value |] - // Get options for a standalone script file (this adds some + // Get options for a standalone script file (this adds some // default references and doesn't require full project information) - let! (opts,_errors) = fsChecker.GetProjectOptionsFromScript(filePath, source, DateTime.Now) |> liftAsync - + let frameworkVersion = FSharpCheckerFuncs.defaultFrameworkVersion + let fsCore = FSharpCheckerFuncs.findFSCore [] [] + let defaultReferences = + FSharpCheckerFuncs.getDefaultSystemReferences frameworkVersion + let projFileName, args = FSharpCheckerFuncs.getCheckerArguments (Some filePath) frameworkVersion defaultReferences None [] [] [] + // filter invalid args + let refCorLib = args |> Seq.find (fun i -> i.EndsWith "mscorlib.dll") + let args = + args |> Array.filter (fun item -> + not <| item.StartsWith "--target" && + not <| item.StartsWith "--doc" && + not <| item.StartsWith "--out" && + not <| item.StartsWith "--nooptimizationdata" && + not <| item.EndsWith "mscorlib.dll") + Log.verbf "getting project options ('%s', \"\"\"%s\"\"\", now, args, assumeDotNetFramework = false): \n\t%s" filePath source (System.String.Join("\n\t", args))// fscore + //let opts = fsChecker.GetProjectOptionsFromCommandLineArgs(projFileName, args) + let! (opts,_errors) = fsChecker.GetProjectOptionsFromScript(filePath, source, DateTime.Now, args, assumeDotNetFramework = false) + //fsChecker.GetP + let formatError (e:FSharpErrorInfo) = + sprintf "%s (%d,%d)-(%d,%d): %A FS%04d: %s" e.FileName e.StartLineAlternate e.StartColumn e.EndLineAlternate e.EndColumn e.Severity e.ErrorNumber e.Message + let formatErrors errors = + System.String.Join("\n", errors |> Seq.map formatError) + // filter duplicates + let opts = + let mutable known = Set.empty + { opts with + OtherOptions = + Array.append [| sprintf "-r:%s" fsCore; refCorLib |] opts.OtherOptions + |> Array.filter (fun item -> + if item.StartsWith "-r:" then + let fullPath = item.Substring 3 + let name = System.IO.Path.GetFileName fullPath + if known.Contains name then + false + else + known <- known.Add name + true + else + if known.Contains item then + false + else + known <- known.Add item + true) + } // Override default options if the user specified something - let opts = - match options with - | Some(str:string) when not(System.String.IsNullOrEmpty(str)) -> - { opts with OtherOptions = Helpers.parseOptions str } + let opts = + match options with + | Some(str:string) when not(System.String.IsNullOrEmpty(str)) -> + { opts with OtherOptions = [| yield! Helpers.parseOptions str; yield! opts.OtherOptions |] } | _ -> opts + //// add our file + //let opts = + // { opts with + // UseScriptResolutionRules = true + // //UnresolvedReferences = Some ( UnresolvedReferencesSet.UnresolvedAssemblyReference []) + // ProjectFileNames = [| filePath |] } + + Log.verbf "project options '%A', OtherOptions: \n\t%s" { opts with OtherOptions = [||] } (System.String.Join("\n\t", opts.OtherOptions)) + //let! results = fsChecker.ParseAndCheckProject(opts) + //let _errors = results.Errors + if _errors.Length > 0 then + Log.warnf "errors from GetProjectOptionsFromScript '%s'" (formatErrors _errors) // Run the second phase - perform type checking - let! _parseResults, parsedInput, checkResults = fsChecker.ParseAndCheckDocument(filePath, source,opts,false) - let! symbolUses = checkResults.GetAllUsesOfAllSymbolsInFile () |> liftAsync - let errors = checkResults.Errors - let classifications = - checkResults.GetSemanticClassification (Some parsedInput.Range) - |> Seq.groupBy (fun (r,c) -> r.StartLine) - |> Map.ofSeq - - - /// Parse source file into a list of lines consisting of tokens - let tokens = Helpers.getTokens (Some filePath) defines sourceLines - - // -------------------------------------------------------------------------------- - // When type-checking completes and we have a parsed file (as tokens), we can - // put the information together - this processes tokens and adds information such - // as color and tool tips (for identifiers) - - // Process "omit" meta-comments in the source - let source = shrinkOmittedParts tokens |> List.ofSeq - - // Split source into snippets if it contains meta-comments - let snippets : NamedSnippet list = - match getSnippets None [] source sourceLines with - | [] -> [null, source] - | snippets -> snippets |> List.rev - - // Generate a list of snippets - let parsedSnippets = - snippets |> List.map (fun (title, lines) -> - if lines.Length = 0 then - // Skip empty snippets - Snippet(title, []) - else - // Process the current snippet - let parsed = processSnippet checkResults classifications sourceLines lines - - // Remove additional whitespace from start of lines - let spaces = Helpers.countStartingSpaces lines - let parsed = parsed |> List.map (function - | Line ((Token(kind, body, tip))::rest) -> - let body = body.Substring(spaces) - Line ((Token(kind, body, tip))::rest) - | line -> line - ) - // Return parsed snippet as 'Snippet' value - Snippet(title, parsed) - ) - - let sourceErrors = [| - for errInfo in errors do - if errInfo.Message <> "Multiple references to 'mscorlib.dll' are not permitted" then - yield SourceError( - (errInfo.StartLineAlternate - 1, errInfo.StartColumn), - (errInfo.EndLineAlternate - 1, errInfo.EndColumn), - (if errInfo.Severity = FSharpErrorSeverity.Error then ErrorKind.Error else ErrorKind.Warning), - errInfo.Message - ) - |] - return parsedSnippets, sourceErrors + Log.verbf "starting to ParseAndCheckDocument from '%s'" filePath + let! res = fsChecker.ParseAndCheckDocument(filePath, source,opts,false) + //fsChecker.InvalidateConfiguration(opts) + //results. + match res with + | Some (_parseResults, parsedInput, checkResults) -> + Log.verbf "starting to GetAllUsesOfAllSymbolsInFile from '%s'" filePath + let! symbolUses = checkResults.GetAllUsesOfAllSymbolsInFile () + let errors = checkResults.Errors + let classifications = + checkResults.GetSemanticClassification (Some parsedInput.Range) + |> Seq.groupBy (fun (r,c) -> r.StartLine) + |> Map.ofSeq + + + /// Parse source file into a list of lines consisting of tokens + let tokens = Helpers.getTokens (Some filePath) defines sourceLines + + // -------------------------------------------------------------------------------- + // When type-checking completes and we have a parsed file (as tokens), we can + // put the information together - this processes tokens and adds information such + // as color and tool tips (for identifiers) + + // Process "omit" meta-comments in the source + let source = shrinkOmittedParts tokens |> List.ofSeq + + // Split source into snippets if it contains meta-comments + let snippets : NamedSnippet list = + match getSnippets None [] source sourceLines with + | [] -> [null, source] + | snippets -> snippets |> List.rev + + // Generate a list of snippets + let parsedSnippets = + snippets |> List.map (fun (title, lines) -> + if lines.Length = 0 then + // Skip empty snippets + Snippet(title, []) + else + // Process the current snippet + let parsed = processSnippet checkResults classifications sourceLines lines + + // Remove additional whitespace from start of lines + let spaces = Helpers.countStartingSpaces lines + let parsed = parsed |> List.map (function + | Line ((Token(kind, body, tip))::rest) -> + let body = body.Substring(spaces) + Line ((Token(kind, body, tip))::rest) + | line -> line + ) + // Return parsed snippet as 'Snippet' value + Snippet(title, parsed) + ) + + let sourceErrors = [| + for errInfo in errors do + if errInfo.Message <> "Multiple references to 'mscorlib.dll' are not permitted" then + yield SourceError( + (errInfo.StartLineAlternate - 1, errInfo.StartColumn), + (errInfo.EndLineAlternate - 1, errInfo.EndColumn), + (if errInfo.Severity = FSharpErrorSeverity.Error then ErrorKind.Error else ErrorKind.Warning), + errInfo.Message + ) + |] + return Some (parsedSnippets, sourceErrors) + | None -> + // TODO: Return something better than None, we probably should return the info in _errors somehow. + return None } - + // ------------------------------------------------------------------------------------ // Agent that implements the parsing & formatting - + let agent = MailboxProcessor.Start (fun agent -> async { while true do // Receive parameters for the next parsing request let! request, (chnl:AsyncReplyChannel<_>) = agent.Receive() try let! result = processSourceCode request - match result with + match result with | Some (res,errs) -> chnl.Reply(Choice1Of2(res |> Array.ofList, errs)) | None -> @@ -395,4 +460,4 @@ type CodeFormatAgent() = let res = agent.PostAndReply(fun chnl -> (file, source, options, defines), chnl) match res with | Choice1Of2 res -> res - | Choice2Of2 exn -> raise exn + | Choice2Of2 exn -> raise exn diff --git a/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj b/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj index 01f75a10a..cac64456b 100644 --- a/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj +++ b/src/FSharp.CodeFormat/FSharp.CodeFormat.fsproj @@ -109,7 +109,7 @@ --> - + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll @@ -123,7 +123,7 @@ - + ..\..\packages\FSharp.Compiler.Service\lib\netstandard1.6\FSharp.Compiler.Service.dll @@ -152,7 +152,7 @@ - + ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll @@ -161,7 +161,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -217,7 +217,7 @@ - + ..\..\packages\Microsoft.DiaSymReader\lib\netstandard1.1\Microsoft.DiaSymReader.dll @@ -228,7 +228,7 @@ - + ..\..\packages\Microsoft.DiaSymReader.PortablePdb\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll @@ -239,7 +239,7 @@ - + True @@ -251,7 +251,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll @@ -262,7 +262,7 @@ - + ..\..\packages\Microsoft.Win32.Registry\ref\netstandard1.3\Microsoft.Win32.Registry.dll @@ -273,7 +273,7 @@ - + ..\..\packages\System.AppContext\lib\net463\System.AppContext.dll @@ -282,7 +282,7 @@ - + ..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll @@ -293,7 +293,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll @@ -313,7 +313,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -324,7 +324,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -335,7 +335,7 @@ - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -346,7 +346,7 @@ - + ..\..\packages\System.Console\lib\net46\System.Console.dll @@ -355,7 +355,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -375,7 +375,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -386,7 +386,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll @@ -395,7 +395,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -406,7 +406,7 @@ - + ..\..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll @@ -417,7 +417,7 @@ - + ..\..\packages\System.Diagnostics.TraceSource\ref\netstandard1.3\System.Diagnostics.TraceSource.dll @@ -437,7 +437,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll @@ -455,7 +455,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -475,7 +475,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -486,7 +486,7 @@ - + ..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll @@ -495,7 +495,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -506,7 +506,7 @@ - + ..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll @@ -515,7 +515,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -526,7 +526,7 @@ - + ..\..\packages\System.IO\lib\net462\System.IO.dll @@ -553,7 +553,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -580,7 +580,7 @@ - + ..\..\packages\System.IO.Compression\lib\net46\System.IO.Compression.dll @@ -598,7 +598,7 @@ - + ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll @@ -609,7 +609,7 @@ - + True @@ -621,7 +621,7 @@ - + ..\..\packages\System.IO.Compression.ZipFile\lib\netstandard1.3\System.IO.Compression.ZipFile.dll @@ -632,7 +632,7 @@ - + ..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll @@ -641,7 +641,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -652,7 +652,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll @@ -661,7 +661,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -672,7 +672,7 @@ - + ..\..\packages\System.Linq\lib\net463\System.Linq.dll @@ -681,7 +681,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -692,7 +692,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll @@ -701,7 +701,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -712,7 +712,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -723,7 +723,7 @@ - + ..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll @@ -732,29 +732,9 @@ - - - - ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll - False - True - - - - - - - - - ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll - False - True - - - - + ..\..\packages\System.Net.Sockets\lib\net46\System.Net.Sockets.dll @@ -763,7 +743,7 @@ - + ..\..\packages\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll @@ -774,7 +754,7 @@ - + ..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll @@ -785,7 +765,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -796,7 +776,7 @@ - + ..\..\packages\System.Reflection\lib\net462\System.Reflection.dll @@ -823,7 +803,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -834,7 +814,7 @@ - + ..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll @@ -845,7 +825,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -856,7 +836,7 @@ - + ..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll @@ -867,7 +847,7 @@ - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -878,7 +858,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll @@ -887,7 +867,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -905,7 +885,7 @@ - + True @@ -944,7 +924,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -955,7 +935,7 @@ - + ..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll @@ -982,7 +962,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -993,7 +973,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -1013,7 +993,7 @@ - + ..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll @@ -1049,7 +1029,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -1060,7 +1040,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1069,7 +1049,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1078,7 +1058,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1089,7 +1069,7 @@ - + ..\..\packages\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll @@ -1100,7 +1080,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -1111,7 +1091,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll @@ -1120,7 +1100,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -1131,7 +1111,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll @@ -1140,7 +1120,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll @@ -1151,7 +1131,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll @@ -1160,7 +1140,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll @@ -1171,7 +1151,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll @@ -1180,7 +1160,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -1191,7 +1171,7 @@ - + ..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll @@ -1202,7 +1182,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll @@ -1211,7 +1191,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1222,7 +1202,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -1231,7 +1211,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -1251,7 +1231,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -1271,7 +1251,7 @@ - + ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll @@ -1282,7 +1262,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll @@ -1291,7 +1271,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll @@ -1302,7 +1282,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1322,7 +1302,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -1333,7 +1313,7 @@ - + ..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -1344,7 +1324,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -1355,7 +1335,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -1366,7 +1346,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -1377,7 +1357,7 @@ - + ..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll @@ -1397,7 +1377,7 @@ - + True @@ -1409,7 +1389,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll @@ -1420,14 +1400,14 @@ - + True - + ..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll diff --git a/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj b/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj index c2a57e2bf..de2c712dd 100644 --- a/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj +++ b/src/FSharp.Formatting.CommandTool/FSharp.Formatting.CommandTool.fsproj @@ -155,7 +155,7 @@ - + ..\..\packages\CommandLineParser\lib\net45\CommandLine.dll @@ -184,7 +184,7 @@ - + ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll @@ -193,7 +193,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -249,7 +249,7 @@ - + ..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll @@ -260,7 +260,7 @@ - + ..\..\packages\RazorEngine\lib\net45\RazorEngine.dll @@ -280,7 +280,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -291,7 +291,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -302,7 +302,7 @@ - + ..\..\packages\System.Console\lib\net46\System.Console.dll @@ -311,7 +311,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -331,7 +331,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -342,7 +342,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll @@ -351,7 +351,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -362,7 +362,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll @@ -380,7 +380,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -400,7 +400,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -411,7 +411,7 @@ - + ..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll @@ -420,7 +420,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -431,7 +431,7 @@ - + ..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll @@ -440,7 +440,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -451,7 +451,7 @@ - + ..\..\packages\System.IO\lib\net462\System.IO.dll @@ -478,7 +478,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -489,7 +489,7 @@ - + ..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll @@ -498,7 +498,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -509,7 +509,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll @@ -518,7 +518,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -529,7 +529,7 @@ - + ..\..\packages\System.Linq\lib\net463\System.Linq.dll @@ -538,7 +538,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -549,7 +549,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll @@ -558,7 +558,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -569,7 +569,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -580,7 +580,7 @@ - + ..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll @@ -589,29 +589,9 @@ - - - - ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll - False - True - - - - - - - - - ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll - False - True - - - - + ..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll @@ -622,7 +602,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -633,7 +613,7 @@ - + ..\..\packages\System.Reflection\lib\net462\System.Reflection.dll @@ -660,7 +640,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -671,7 +651,7 @@ - + ..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll @@ -682,7 +662,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -693,7 +673,7 @@ - + ..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll @@ -704,7 +684,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll @@ -713,7 +693,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -731,7 +711,7 @@ - + True @@ -770,7 +750,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -781,7 +761,7 @@ - + ..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll @@ -808,7 +788,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -819,7 +799,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -839,7 +819,7 @@ - + ..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll @@ -875,7 +855,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -886,7 +866,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -897,7 +877,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll @@ -906,7 +886,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -917,7 +897,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll @@ -926,7 +906,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll @@ -937,7 +917,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll @@ -946,7 +926,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll @@ -957,7 +937,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll @@ -966,7 +946,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -977,7 +957,7 @@ - + ..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll @@ -988,7 +968,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll @@ -997,7 +977,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1008,7 +988,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -1017,7 +997,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -1037,7 +1017,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -1048,7 +1028,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll @@ -1057,7 +1037,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll @@ -1068,7 +1048,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1088,7 +1068,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -1099,7 +1079,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -1110,7 +1090,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -1121,7 +1101,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -1132,7 +1112,7 @@ - + ..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll diff --git a/src/FSharp.Formatting.Common/FSharp.Formatting.Common.fsproj b/src/FSharp.Formatting.Common/FSharp.Formatting.Common.fsproj index e7de025d1..59672509f 100644 --- a/src/FSharp.Formatting.Common/FSharp.Formatting.Common.fsproj +++ b/src/FSharp.Formatting.Common/FSharp.Formatting.Common.fsproj @@ -72,6 +72,10 @@ --> + + True + paket-files/YaafFSharpScripting.fs + Common\AssemblyInfo.fs @@ -87,7 +91,7 @@ - + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll @@ -101,7 +105,7 @@ - + ..\..\packages\FSharp.Compiler.Service\lib\netstandard1.6\FSharp.Compiler.Service.dll @@ -130,7 +134,7 @@ - + ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll @@ -139,7 +143,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -195,7 +199,7 @@ - + ..\..\packages\Microsoft.DiaSymReader\lib\netstandard1.1\Microsoft.DiaSymReader.dll @@ -206,7 +210,7 @@ - + ..\..\packages\Microsoft.DiaSymReader.PortablePdb\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll @@ -217,7 +221,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\lib\net46\Microsoft.Win32.Primitives.dll @@ -226,7 +230,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll @@ -237,7 +241,7 @@ - + ..\..\packages\Microsoft.Win32.Registry\ref\netstandard1.3\Microsoft.Win32.Registry.dll @@ -248,7 +252,7 @@ - + ..\..\packages\System.AppContext\lib\net463\System.AppContext.dll @@ -257,7 +261,7 @@ - + ..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll @@ -268,7 +272,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll @@ -288,7 +292,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -299,7 +303,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -310,7 +314,7 @@ - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -321,7 +325,7 @@ - + ..\..\packages\System.Console\lib\net46\System.Console.dll @@ -330,7 +334,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -350,7 +354,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -361,7 +365,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll @@ -370,7 +374,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -381,7 +385,7 @@ - + ..\..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll @@ -392,7 +396,7 @@ - + ..\..\packages\System.Diagnostics.TraceSource\ref\netstandard1.3\System.Diagnostics.TraceSource.dll @@ -403,7 +407,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll @@ -421,7 +425,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -441,7 +445,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -452,7 +456,7 @@ - + ..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll @@ -461,7 +465,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -472,7 +476,7 @@ - + ..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll @@ -481,7 +485,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -492,7 +496,7 @@ - + ..\..\packages\System.IO\lib\net462\System.IO.dll @@ -519,7 +523,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -537,7 +541,7 @@ - + ..\..\packages\System.IO.Compression\lib\net46\System.IO.Compression.dll @@ -555,7 +559,7 @@ - + ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll @@ -566,7 +570,7 @@ - + True @@ -578,7 +582,7 @@ - + ..\..\packages\System.IO.Compression.ZipFile\lib\netstandard1.3\System.IO.Compression.ZipFile.dll @@ -589,7 +593,7 @@ - + ..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll @@ -598,7 +602,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -609,7 +613,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll @@ -618,7 +622,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -629,7 +633,7 @@ - + ..\..\packages\System.Linq\lib\net463\System.Linq.dll @@ -638,7 +642,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -649,7 +653,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll @@ -658,7 +662,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -669,7 +673,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -680,7 +684,7 @@ - + ..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll @@ -689,29 +693,9 @@ - - - - ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll - False - True - - - - - - - - - ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll - False - True - - - - + ..\..\packages\System.Net.Sockets\lib\net46\System.Net.Sockets.dll @@ -720,7 +704,7 @@ - + ..\..\packages\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll @@ -731,7 +715,7 @@ - + ..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll @@ -742,7 +726,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -753,7 +737,7 @@ - + ..\..\packages\System.Reflection\lib\net462\System.Reflection.dll @@ -780,7 +764,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -791,7 +775,7 @@ - + ..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll @@ -802,7 +786,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -813,7 +797,7 @@ - + ..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll @@ -824,7 +808,7 @@ - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -835,7 +819,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll @@ -844,7 +828,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -862,7 +846,7 @@ - + True @@ -901,7 +885,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -912,7 +896,7 @@ - + ..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll @@ -939,7 +923,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -950,7 +934,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -970,7 +954,7 @@ - + ..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll @@ -1006,7 +990,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -1017,7 +1001,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1026,7 +1010,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1035,7 +1019,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1046,7 +1030,7 @@ - + ..\..\packages\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll @@ -1057,7 +1041,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -1068,7 +1052,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll @@ -1077,7 +1061,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -1088,7 +1072,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll @@ -1097,7 +1081,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll @@ -1108,7 +1092,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll @@ -1117,7 +1101,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll @@ -1128,7 +1112,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll @@ -1137,7 +1121,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -1148,7 +1132,7 @@ - + ..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll @@ -1159,7 +1143,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll @@ -1168,7 +1152,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1179,7 +1163,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -1188,7 +1172,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -1208,7 +1192,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -1228,7 +1212,7 @@ - + ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll @@ -1239,7 +1223,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll @@ -1248,7 +1232,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll @@ -1259,7 +1243,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1279,7 +1263,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -1290,7 +1274,7 @@ - + ..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -1301,7 +1285,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -1312,7 +1296,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -1323,7 +1307,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -1334,7 +1318,7 @@ - + ..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll @@ -1354,7 +1338,7 @@ - + True @@ -1366,7 +1350,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll @@ -1377,14 +1361,14 @@ - + True - + ..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll diff --git a/src/FSharp.Formatting.Common/paket.references b/src/FSharp.Formatting.Common/paket.references index e4c76aeae..591ac9e2a 100644 --- a/src/FSharp.Formatting.Common/paket.references +++ b/src/FSharp.Formatting.Common/paket.references @@ -1,2 +1,3 @@ FSharp.Core -FSharp.Compiler.Service \ No newline at end of file +FSharp.Compiler.Service +File: YaafFSharpScripting.fs \ No newline at end of file diff --git a/src/FSharp.Formatting.Razor/FSharp.Formatting.Razor.fsproj b/src/FSharp.Formatting.Razor/FSharp.Formatting.Razor.fsproj index 5b055f7af..650533c17 100644 --- a/src/FSharp.Formatting.Razor/FSharp.Formatting.Razor.fsproj +++ b/src/FSharp.Formatting.Razor/FSharp.Formatting.Razor.fsproj @@ -128,7 +128,7 @@ - + ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll @@ -137,7 +137,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -193,7 +193,7 @@ - + ..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll @@ -204,7 +204,7 @@ - + ..\..\packages\RazorEngine\lib\net45\RazorEngine.dll @@ -224,7 +224,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -235,7 +235,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -246,7 +246,7 @@ - + ..\..\packages\System.Console\lib\net46\System.Console.dll @@ -255,7 +255,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -275,7 +275,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -286,7 +286,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll @@ -295,7 +295,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -306,7 +306,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll @@ -324,7 +324,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -344,7 +344,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -355,7 +355,7 @@ - + ..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll @@ -364,7 +364,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -375,7 +375,7 @@ - + ..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll @@ -384,7 +384,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -395,7 +395,7 @@ - + ..\..\packages\System.IO\lib\net462\System.IO.dll @@ -422,7 +422,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -433,7 +433,7 @@ - + ..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll @@ -442,7 +442,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -453,7 +453,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll @@ -462,7 +462,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -473,7 +473,7 @@ - + ..\..\packages\System.Linq\lib\net463\System.Linq.dll @@ -482,7 +482,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -493,7 +493,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll @@ -502,7 +502,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -513,7 +513,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -524,7 +524,7 @@ - + ..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll @@ -533,29 +533,9 @@ - - - - ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll - False - True - - - - - - - - - ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll - False - True - - - - + ..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll @@ -566,7 +546,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -577,7 +557,7 @@ - + ..\..\packages\System.Reflection\lib\net462\System.Reflection.dll @@ -604,7 +584,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -615,7 +595,7 @@ - + ..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll @@ -626,7 +606,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -637,7 +617,7 @@ - + ..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll @@ -648,7 +628,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll @@ -657,7 +637,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -675,7 +655,7 @@ - + True @@ -714,7 +694,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -725,7 +705,7 @@ - + ..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll @@ -752,7 +732,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -763,7 +743,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -783,7 +763,7 @@ - + ..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll @@ -819,7 +799,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -830,7 +810,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -841,7 +821,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll @@ -850,7 +830,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -861,7 +841,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll @@ -870,7 +850,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll @@ -881,7 +861,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll @@ -890,7 +870,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll @@ -901,7 +881,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll @@ -910,7 +890,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -921,7 +901,7 @@ - + ..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll @@ -932,7 +912,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll @@ -941,7 +921,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -952,7 +932,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -961,7 +941,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -981,7 +961,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -992,7 +972,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll @@ -1001,7 +981,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll @@ -1012,7 +992,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1032,7 +1012,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -1043,7 +1023,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -1054,7 +1034,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -1065,7 +1045,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -1076,7 +1056,7 @@ - + ..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll diff --git a/src/FSharp.Literate/Evaluator.fs b/src/FSharp.Literate/Evaluator.fs index ce7bda2ef..e468f82b5 100644 --- a/src/FSharp.Literate/Evaluator.fs +++ b/src/FSharp.Literate/Evaluator.fs @@ -4,7 +4,7 @@ open System open System.IO open FSharp.Markdown open FSharp.CodeFormat -open FSharp.Formatting.Scripting +open Yaaf.FSharp.Scripting // ------------------------------------------------------------------------------------------------ diff --git a/src/FSharp.Literate/FSharp.Literate.fsproj b/src/FSharp.Literate/FSharp.Literate.fsproj index 56f6e01eb..512a7dd3f 100644 --- a/src/FSharp.Literate/FSharp.Literate.fsproj +++ b/src/FSharp.Literate/FSharp.Literate.fsproj @@ -76,9 +76,6 @@ Common\StringParsing.fs - - Common\Scripting.fs - @@ -125,7 +122,7 @@ --> - + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll @@ -139,7 +136,7 @@ - + ..\..\packages\FSharp.Compiler.Service\lib\netstandard1.6\FSharp.Compiler.Service.dll @@ -168,7 +165,7 @@ - + ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll @@ -177,7 +174,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -233,7 +230,7 @@ - + ..\..\packages\Microsoft.DiaSymReader\lib\netstandard1.1\Microsoft.DiaSymReader.dll @@ -244,7 +241,7 @@ - + ..\..\packages\Microsoft.DiaSymReader.PortablePdb\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll @@ -255,7 +252,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\lib\net46\Microsoft.Win32.Primitives.dll @@ -264,7 +261,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll @@ -275,7 +272,7 @@ - + ..\..\packages\Microsoft.Win32.Registry\ref\netstandard1.3\Microsoft.Win32.Registry.dll @@ -286,7 +283,7 @@ - + ..\..\packages\System.AppContext\lib\net463\System.AppContext.dll @@ -295,7 +292,7 @@ - + ..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll @@ -306,7 +303,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll @@ -326,7 +323,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -337,7 +334,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -348,7 +345,7 @@ - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -359,7 +356,7 @@ - + ..\..\packages\System.Console\lib\net46\System.Console.dll @@ -368,7 +365,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -388,7 +385,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -399,7 +396,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll @@ -408,7 +405,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -419,7 +416,7 @@ - + ..\..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll @@ -430,7 +427,7 @@ - + ..\..\packages\System.Diagnostics.TraceSource\ref\netstandard1.3\System.Diagnostics.TraceSource.dll @@ -441,7 +438,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll @@ -459,7 +456,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -479,7 +476,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -490,7 +487,7 @@ - + ..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll @@ -499,7 +496,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -510,7 +507,7 @@ - + ..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll @@ -519,7 +516,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -530,7 +527,7 @@ - + ..\..\packages\System.IO\lib\net462\System.IO.dll @@ -557,7 +554,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -575,7 +572,7 @@ - + ..\..\packages\System.IO.Compression\lib\net46\System.IO.Compression.dll @@ -593,7 +590,7 @@ - + ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll @@ -604,7 +601,7 @@ - + True @@ -616,7 +613,7 @@ - + ..\..\packages\System.IO.Compression.ZipFile\lib\netstandard1.3\System.IO.Compression.ZipFile.dll @@ -627,7 +624,7 @@ - + ..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll @@ -636,7 +633,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -647,7 +644,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll @@ -656,7 +653,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -667,7 +664,7 @@ - + ..\..\packages\System.Linq\lib\net463\System.Linq.dll @@ -676,7 +673,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -687,7 +684,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll @@ -696,7 +693,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -707,7 +704,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -718,7 +715,7 @@ - + ..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll @@ -727,29 +724,9 @@ - - - - ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll - False - True - - - - - - - - - ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll - False - True - - - - + ..\..\packages\System.Net.Sockets\lib\net46\System.Net.Sockets.dll @@ -758,7 +735,7 @@ - + ..\..\packages\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll @@ -769,7 +746,7 @@ - + ..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll @@ -780,7 +757,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -791,7 +768,7 @@ - + ..\..\packages\System.Reflection\lib\net462\System.Reflection.dll @@ -818,7 +795,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -829,7 +806,7 @@ - + ..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll @@ -840,7 +817,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -851,7 +828,7 @@ - + ..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll @@ -862,7 +839,7 @@ - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -873,7 +850,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll @@ -882,7 +859,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -900,7 +877,7 @@ - + True @@ -939,7 +916,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -950,7 +927,7 @@ - + ..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll @@ -977,7 +954,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -988,7 +965,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -1008,7 +985,7 @@ - + ..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll @@ -1044,7 +1021,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -1055,7 +1032,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1064,7 +1041,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1073,7 +1050,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1084,7 +1061,7 @@ - + ..\..\packages\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll @@ -1095,7 +1072,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -1106,7 +1083,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll @@ -1115,7 +1092,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -1126,7 +1103,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll @@ -1135,7 +1112,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll @@ -1146,7 +1123,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll @@ -1155,7 +1132,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll @@ -1166,7 +1143,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll @@ -1175,7 +1152,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -1186,7 +1163,7 @@ - + ..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll @@ -1197,7 +1174,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll @@ -1206,7 +1183,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1217,7 +1194,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -1226,7 +1203,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -1246,7 +1223,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -1266,7 +1243,7 @@ - + ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll @@ -1277,7 +1254,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll @@ -1286,7 +1263,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll @@ -1297,7 +1274,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1317,7 +1294,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -1328,7 +1305,7 @@ - + ..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -1339,7 +1316,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -1350,7 +1327,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -1361,7 +1338,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -1372,7 +1349,7 @@ - + ..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll @@ -1392,7 +1369,7 @@ - + True @@ -1404,7 +1381,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll @@ -1415,14 +1392,14 @@ - + True - + ..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll diff --git a/src/FSharp.Markdown/FSharp.Markdown.fsproj b/src/FSharp.Markdown/FSharp.Markdown.fsproj index 32c074891..c7cce3a28 100644 --- a/src/FSharp.Markdown/FSharp.Markdown.fsproj +++ b/src/FSharp.Markdown/FSharp.Markdown.fsproj @@ -122,7 +122,7 @@ - + ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll @@ -131,7 +131,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -196,7 +196,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -207,7 +207,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -218,7 +218,7 @@ - + True @@ -230,7 +230,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -250,7 +250,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -261,7 +261,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll @@ -270,7 +270,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -290,7 +290,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll @@ -308,7 +308,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -328,7 +328,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -339,7 +339,7 @@ - + ..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll @@ -348,7 +348,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -359,7 +359,7 @@ - + ..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll @@ -368,7 +368,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -379,7 +379,7 @@ - + ..\..\packages\System.IO\lib\net462\System.IO.dll @@ -406,7 +406,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -417,7 +417,7 @@ - + ..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll @@ -426,7 +426,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -437,7 +437,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll @@ -446,7 +446,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -457,7 +457,7 @@ - + ..\..\packages\System.Linq\lib\net463\System.Linq.dll @@ -466,7 +466,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -477,7 +477,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll @@ -486,7 +486,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -497,7 +497,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -508,7 +508,7 @@ - + ..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll @@ -517,29 +517,9 @@ - - - - ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll - False - True - - - - - - - - - ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll - False - True - - - - + ..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll @@ -550,7 +530,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -561,7 +541,7 @@ - + ..\..\packages\System.Reflection\lib\net462\System.Reflection.dll @@ -588,7 +568,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -599,7 +579,7 @@ - + ..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll @@ -610,7 +590,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -621,7 +601,7 @@ - + ..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll @@ -632,7 +612,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll @@ -641,7 +621,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -659,7 +639,7 @@ - + True @@ -698,7 +678,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -709,7 +689,7 @@ - + ..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll @@ -736,7 +716,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -747,7 +727,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -767,7 +747,7 @@ - + ..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll @@ -803,7 +783,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -814,7 +794,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -825,7 +805,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll @@ -834,7 +814,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -845,7 +825,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll @@ -854,7 +834,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll @@ -865,7 +845,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll @@ -874,7 +854,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll @@ -885,7 +865,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll @@ -894,7 +874,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -905,7 +885,7 @@ - + ..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll @@ -916,7 +896,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll @@ -925,7 +905,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -936,7 +916,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -945,7 +925,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -965,7 +945,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -976,7 +956,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll @@ -985,7 +965,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll @@ -996,7 +976,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1016,7 +996,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -1027,7 +1007,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -1038,7 +1018,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -1049,7 +1029,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -1060,7 +1040,7 @@ - + ..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll diff --git a/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj b/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj index 62ee48e6a..03468c470 100644 --- a/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj +++ b/src/FSharp.MetadataFormat/FSharp.MetadataFormat.fsproj @@ -90,9 +90,6 @@ Common\StringParsing.fs - - Common\Scripting.fs - @@ -126,7 +123,7 @@ - + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll @@ -140,7 +137,7 @@ - + ..\..\packages\FSharp.Compiler.Service\lib\netstandard1.6\FSharp.Compiler.Service.dll @@ -169,7 +166,7 @@ - + ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll @@ -178,7 +175,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -234,7 +231,7 @@ - + ..\..\packages\Microsoft.DiaSymReader\lib\netstandard1.1\Microsoft.DiaSymReader.dll @@ -245,7 +242,7 @@ - + ..\..\packages\Microsoft.DiaSymReader.PortablePdb\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll @@ -256,7 +253,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\lib\net46\Microsoft.Win32.Primitives.dll @@ -265,7 +262,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll @@ -276,7 +273,7 @@ - + ..\..\packages\Microsoft.Win32.Registry\ref\netstandard1.3\Microsoft.Win32.Registry.dll @@ -287,7 +284,7 @@ - + ..\..\packages\System.AppContext\lib\net463\System.AppContext.dll @@ -296,7 +293,7 @@ - + ..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll @@ -307,7 +304,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll @@ -327,7 +324,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -338,7 +335,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -349,7 +346,7 @@ - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -360,7 +357,7 @@ - + ..\..\packages\System.Console\lib\net46\System.Console.dll @@ -369,7 +366,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -389,7 +386,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -400,7 +397,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll @@ -409,7 +406,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -420,7 +417,7 @@ - + ..\..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll @@ -431,7 +428,7 @@ - + ..\..\packages\System.Diagnostics.TraceSource\ref\netstandard1.3\System.Diagnostics.TraceSource.dll @@ -442,7 +439,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll @@ -460,7 +457,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -480,7 +477,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -491,7 +488,7 @@ - + ..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll @@ -500,7 +497,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -511,7 +508,7 @@ - + ..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll @@ -520,7 +517,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -531,7 +528,7 @@ - + ..\..\packages\System.IO\lib\net462\System.IO.dll @@ -558,7 +555,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -576,7 +573,7 @@ - + ..\..\packages\System.IO.Compression\lib\net46\System.IO.Compression.dll @@ -594,7 +591,7 @@ - + ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll @@ -605,7 +602,7 @@ - + True @@ -617,7 +614,7 @@ - + ..\..\packages\System.IO.Compression.ZipFile\lib\netstandard1.3\System.IO.Compression.ZipFile.dll @@ -628,7 +625,7 @@ - + ..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll @@ -637,7 +634,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -648,7 +645,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll @@ -657,7 +654,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -668,7 +665,7 @@ - + ..\..\packages\System.Linq\lib\net463\System.Linq.dll @@ -677,7 +674,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -688,7 +685,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll @@ -697,7 +694,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -708,7 +705,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -719,7 +716,7 @@ - + ..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll @@ -728,29 +725,9 @@ - - - - ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll - False - True - - - - - - - - - ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll - False - True - - - - + ..\..\packages\System.Net.Sockets\lib\net46\System.Net.Sockets.dll @@ -759,7 +736,7 @@ - + ..\..\packages\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll @@ -770,7 +747,7 @@ - + ..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll @@ -781,7 +758,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -792,7 +769,7 @@ - + ..\..\packages\System.Reflection\lib\net462\System.Reflection.dll @@ -819,7 +796,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -830,7 +807,7 @@ - + ..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll @@ -841,7 +818,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -852,7 +829,7 @@ - + ..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll @@ -863,7 +840,7 @@ - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -874,7 +851,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll @@ -883,7 +860,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -901,7 +878,7 @@ - + True @@ -940,7 +917,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -951,7 +928,7 @@ - + ..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll @@ -978,7 +955,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -989,7 +966,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -1009,7 +986,7 @@ - + ..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll @@ -1045,7 +1022,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -1056,7 +1033,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1065,7 +1042,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1074,7 +1051,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1085,7 +1062,7 @@ - + ..\..\packages\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll @@ -1096,7 +1073,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -1107,7 +1084,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll @@ -1116,7 +1093,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -1127,7 +1104,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll @@ -1136,7 +1113,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll @@ -1147,7 +1124,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll @@ -1156,7 +1133,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll @@ -1167,7 +1144,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll @@ -1176,7 +1153,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -1187,7 +1164,7 @@ - + ..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll @@ -1198,7 +1175,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll @@ -1207,7 +1184,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1218,7 +1195,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -1227,7 +1204,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -1247,7 +1224,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -1267,7 +1244,7 @@ - + ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll @@ -1278,7 +1255,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll @@ -1287,7 +1264,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll @@ -1298,7 +1275,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1318,7 +1295,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -1329,7 +1306,7 @@ - + ..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -1340,7 +1317,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -1351,7 +1328,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -1362,7 +1339,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -1373,7 +1350,7 @@ - + ..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll @@ -1393,7 +1370,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\lib\net46\System.Xml.ReaderWriter.dll @@ -1402,7 +1379,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll @@ -1413,7 +1390,7 @@ - + ..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll diff --git a/src/FSharp.MetadataFormat/Main.fs b/src/FSharp.MetadataFormat/Main.fs index bcb3dc2e7..4e2ba378f 100755 --- a/src/FSharp.MetadataFormat/Main.fs +++ b/src/FSharp.MetadataFormat/Main.fs @@ -6,7 +6,7 @@ open System.Collections.Generic open Microsoft.FSharp.Compiler.SourceCodeServices open Microsoft.FSharp.Compiler.Range open FSharp.Formatting.Common -open FSharp.Formatting.Scripting +open Yaaf.FSharp.Scripting open FSharp.Patterns open FSharp.CodeFormat diff --git a/start_appveyor b/start_appveyor new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/start_appveyor @@ -0,0 +1 @@ +test diff --git a/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj b/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj index 166ce8eaf..61358d5c1 100644 --- a/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj +++ b/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj @@ -111,7 +111,7 @@ - + ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll @@ -120,7 +120,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -185,7 +185,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -196,7 +196,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -207,7 +207,7 @@ - + True @@ -219,7 +219,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -239,7 +239,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -250,7 +250,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll @@ -259,7 +259,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -279,7 +279,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll @@ -297,7 +297,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -317,7 +317,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -328,7 +328,7 @@ - + ..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll @@ -337,7 +337,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -348,7 +348,7 @@ - + ..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll @@ -357,7 +357,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -368,7 +368,7 @@ - + ..\..\packages\System.IO\lib\net462\System.IO.dll @@ -395,7 +395,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -406,7 +406,7 @@ - + ..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll @@ -415,7 +415,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -426,7 +426,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll @@ -435,7 +435,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -446,7 +446,7 @@ - + ..\..\packages\System.Linq\lib\net463\System.Linq.dll @@ -455,7 +455,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -466,7 +466,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll @@ -475,7 +475,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -486,7 +486,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -497,7 +497,7 @@ - + ..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll @@ -506,29 +506,9 @@ - - - - ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll - False - True - - - - - - - - - ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll - False - True - - - - + ..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll @@ -539,7 +519,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -550,7 +530,7 @@ - + ..\..\packages\System.Reflection\lib\net462\System.Reflection.dll @@ -577,7 +557,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -588,7 +568,7 @@ - + ..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll @@ -599,7 +579,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -610,7 +590,7 @@ - + ..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll @@ -621,7 +601,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll @@ -630,7 +610,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -648,7 +628,7 @@ - + True @@ -687,7 +667,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -698,7 +678,7 @@ - + ..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll @@ -725,7 +705,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -736,7 +716,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -756,7 +736,7 @@ - + ..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll @@ -792,7 +772,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -803,7 +783,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -814,7 +794,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll @@ -823,7 +803,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -834,7 +814,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll @@ -843,7 +823,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll @@ -854,7 +834,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll @@ -863,7 +843,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll @@ -874,7 +854,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll @@ -883,7 +863,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -894,7 +874,7 @@ - + ..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll @@ -905,7 +885,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll @@ -914,7 +894,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -925,7 +905,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -934,7 +914,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -954,7 +934,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -965,7 +945,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll @@ -974,7 +954,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll @@ -985,7 +965,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1005,7 +985,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -1016,7 +996,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -1027,7 +1007,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -1038,7 +1018,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -1049,7 +1029,7 @@ - + ..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll @@ -1069,7 +1049,7 @@ - + ..\..\packages\test\FsUnit\lib\net45\FsUnit.NUnit.dll @@ -1078,7 +1058,7 @@ - + ..\..\packages\test\FsUnit\lib\netstandard1.6\FsUnit.NUnit.dll @@ -1089,7 +1069,7 @@ - + ..\..\packages\test\Microsoft.Win32.Primitives\lib\net46\Microsoft.Win32.Primitives.dll @@ -1098,7 +1078,7 @@ - + ..\..\packages\test\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll @@ -1150,7 +1130,7 @@ - + ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll @@ -1159,7 +1139,7 @@ - + ..\..\packages\test\NUnit\lib\netstandard1.6\nunit.framework.dll @@ -1188,7 +1168,7 @@ - + ..\..\packages\test\System.AppContext\lib\net463\System.AppContext.dll @@ -1197,7 +1177,7 @@ - + ..\..\packages\test\System.AppContext\lib\netstandard1.6\System.AppContext.dll @@ -1208,7 +1188,7 @@ - + ..\..\packages\test\System.Buffers\lib\netstandard1.1\System.Buffers.dll @@ -1219,7 +1199,7 @@ - + ..\..\packages\test\System.IO.Compression\lib\net46\System.IO.Compression.dll @@ -1230,7 +1210,7 @@ - + True @@ -1242,7 +1222,7 @@ - + ..\..\packages\test\System.IO.Compression.ZipFile\lib\netstandard1.3\System.IO.Compression.ZipFile.dll @@ -1253,7 +1233,7 @@ - + ..\..\packages\test\System.Net.Sockets\lib\net46\System.Net.Sockets.dll @@ -1262,7 +1242,7 @@ - + ..\..\packages\test\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll @@ -1273,7 +1253,7 @@ - + ..\..\packages\test\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1282,7 +1262,7 @@ - + ..\..\packages\test\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1291,7 +1271,7 @@ - + ..\..\packages\test\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1302,7 +1282,7 @@ - + ..\..\packages\test\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll @@ -1311,7 +1291,7 @@ - + ..\..\packages\test\System.Runtime.Loader\ref\netstandard1.5\System.Runtime.Loader.dll @@ -1322,7 +1302,7 @@ - + ..\..\packages\test\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -1333,7 +1313,7 @@ - + True @@ -1345,7 +1325,7 @@ - + ..\..\packages\test\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll @@ -1356,14 +1336,14 @@ - + True - + ..\..\packages\test\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll diff --git a/tests/FSharp.Literate.Tests/EvalTests.fs b/tests/FSharp.Literate.Tests/EvalTests.fs index 51115d87d..e73da9bc8 100644 --- a/tests/FSharp.Literate.Tests/EvalTests.fs +++ b/tests/FSharp.Literate.Tests/EvalTests.fs @@ -20,6 +20,8 @@ open NUnit.Framework open FSharp.Literate.Tests.Setup open FSharp.Markdown.Unit +do FSharp.Formatting.TestHelpers.enableLogging() + // -------------------------------------------------------------------------------------- // Test FSI evaluator // -------------------------------------------------------------------------------------- diff --git a/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj b/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj index a4e15cd2d..dd5bb981e 100644 --- a/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj +++ b/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj @@ -76,9 +76,6 @@ Common\MarkdownUnit.fs - - Common\Scripting.fs - @@ -99,6 +96,11 @@ --> + + FSharp.Formatting.TestHelpers + {0b552f94-33fe-4037-9c17-1eb2a885f263} + True + CSharpFormat {9ab3650b-cc24-4404-a175-a573da928475} @@ -136,7 +138,7 @@ - + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll @@ -150,7 +152,7 @@ - + ..\..\packages\FSharp.Compiler.Service\lib\netstandard1.6\FSharp.Compiler.Service.dll @@ -179,7 +181,7 @@ - + ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll @@ -188,7 +190,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -244,7 +246,7 @@ - + ..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll @@ -255,7 +257,7 @@ - + ..\..\packages\Microsoft.DiaSymReader\lib\netstandard1.1\Microsoft.DiaSymReader.dll @@ -266,7 +268,7 @@ - + ..\..\packages\Microsoft.DiaSymReader.PortablePdb\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll @@ -277,7 +279,7 @@ - + True @@ -289,7 +291,7 @@ - + ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll @@ -300,7 +302,7 @@ - + ..\..\packages\Microsoft.Win32.Registry\ref\netstandard1.3\Microsoft.Win32.Registry.dll @@ -311,7 +313,7 @@ - + ..\..\packages\RazorEngine\lib\net45\RazorEngine.dll @@ -322,7 +324,7 @@ - + ..\..\packages\System.AppContext\lib\net463\System.AppContext.dll @@ -331,7 +333,7 @@ - + ..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll @@ -342,7 +344,7 @@ - + ..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll @@ -362,7 +364,7 @@ - + ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll @@ -373,7 +375,7 @@ - + ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll @@ -384,7 +386,7 @@ - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -395,7 +397,7 @@ - + ..\..\packages\System.Console\lib\net46\System.Console.dll @@ -404,7 +406,7 @@ - + ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll @@ -424,7 +426,7 @@ - + ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll @@ -435,7 +437,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll @@ -444,7 +446,7 @@ - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -455,7 +457,7 @@ - + ..\..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll @@ -466,7 +468,7 @@ - + ..\..\packages\System.Diagnostics.TraceSource\ref\netstandard1.3\System.Diagnostics.TraceSource.dll @@ -486,7 +488,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll @@ -504,7 +506,7 @@ - + ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll @@ -524,7 +526,7 @@ - + ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll @@ -535,7 +537,7 @@ - + ..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll @@ -544,7 +546,7 @@ - + ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll @@ -555,7 +557,7 @@ - + ..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll @@ -564,7 +566,7 @@ - + ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll @@ -575,7 +577,7 @@ - + ..\..\packages\System.IO\lib\net462\System.IO.dll @@ -602,7 +604,7 @@ - + ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll @@ -629,7 +631,7 @@ - + ..\..\packages\System.IO.Compression\lib\net46\System.IO.Compression.dll @@ -647,7 +649,7 @@ - + ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll @@ -658,7 +660,7 @@ - + True @@ -670,7 +672,7 @@ - + ..\..\packages\System.IO.Compression.ZipFile\lib\netstandard1.3\System.IO.Compression.ZipFile.dll @@ -681,7 +683,7 @@ - + ..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll @@ -690,7 +692,7 @@ - + ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll @@ -701,7 +703,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll @@ -710,7 +712,7 @@ - + ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll @@ -721,7 +723,7 @@ - + ..\..\packages\System.Linq\lib\net463\System.Linq.dll @@ -730,7 +732,7 @@ - + ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll @@ -741,7 +743,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll @@ -750,7 +752,7 @@ - + ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll @@ -761,7 +763,7 @@ - + ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll @@ -772,7 +774,7 @@ - + ..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll @@ -781,29 +783,9 @@ - - - - ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll - False - True - - - - - - - - - ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll - False - True - - - - + ..\..\packages\System.Net.Sockets\lib\net46\System.Net.Sockets.dll @@ -812,7 +794,7 @@ - + ..\..\packages\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll @@ -823,7 +805,7 @@ - + ..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll @@ -834,7 +816,7 @@ - + ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll @@ -845,7 +827,7 @@ - + ..\..\packages\System.Reflection\lib\net462\System.Reflection.dll @@ -872,7 +854,7 @@ - + ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll @@ -883,7 +865,7 @@ - + ..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll @@ -894,7 +876,7 @@ - + ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll @@ -905,7 +887,7 @@ - + ..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll @@ -916,7 +898,7 @@ - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -927,7 +909,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll @@ -936,7 +918,7 @@ - + ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll @@ -954,7 +936,7 @@ - + True @@ -993,7 +975,7 @@ - + ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll @@ -1004,7 +986,7 @@ - + ..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll @@ -1031,7 +1013,7 @@ - + ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll @@ -1042,7 +1024,7 @@ - + ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll @@ -1062,7 +1044,7 @@ - + ..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll @@ -1098,7 +1080,7 @@ - + ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll @@ -1109,7 +1091,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1118,7 +1100,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1127,7 +1109,7 @@ - + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll @@ -1138,7 +1120,7 @@ - + ..\..\packages\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll @@ -1149,7 +1131,7 @@ - + ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll @@ -1160,7 +1142,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll @@ -1169,7 +1151,7 @@ - + ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll @@ -1180,7 +1162,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll @@ -1189,7 +1171,7 @@ - + ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll @@ -1200,7 +1182,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll @@ -1209,7 +1191,7 @@ - + ..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll @@ -1220,7 +1202,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll @@ -1229,7 +1211,7 @@ - + ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll @@ -1240,7 +1222,7 @@ - + ..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll @@ -1251,7 +1233,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll @@ -1260,7 +1242,7 @@ - + ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll @@ -1271,7 +1253,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -1280,7 +1262,7 @@ - + ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll @@ -1300,7 +1282,7 @@ - + ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll @@ -1320,7 +1302,7 @@ - + ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll @@ -1331,7 +1313,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll @@ -1340,7 +1322,7 @@ - + ..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll @@ -1351,7 +1333,7 @@ - + ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll @@ -1371,7 +1353,7 @@ - + ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll @@ -1382,7 +1364,7 @@ - + ..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -1393,7 +1375,7 @@ - + ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll @@ -1404,7 +1386,7 @@ - + ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll @@ -1415,7 +1397,7 @@ - + ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll @@ -1426,7 +1408,7 @@ - + ..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll @@ -1446,7 +1428,7 @@ - + True @@ -1458,7 +1440,7 @@ - + ..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll @@ -1469,14 +1451,14 @@ - + True - + ..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll @@ -1487,7 +1469,7 @@ - + ..\..\packages\test\FsUnit\lib\net45\FsUnit.NUnit.dll @@ -1496,7 +1478,7 @@ - + ..\..\packages\test\FsUnit\lib\netstandard1.6\FsUnit.NUnit.dll @@ -1548,7 +1530,7 @@ - + ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll @@ -1557,7 +1539,7 @@ - + ..\..\packages\test\NUnit\lib\netstandard1.6\nunit.framework.dll diff --git a/tests/FSharp.Literate.Tests/Tests.fs b/tests/FSharp.Literate.Tests/Tests.fs index 36884d736..09f050a56 100644 --- a/tests/FSharp.Literate.Tests/Tests.fs +++ b/tests/FSharp.Literate.Tests/Tests.fs @@ -21,31 +21,9 @@ open NUnit.Framework open FSharp.Literate.Tests.Setup open FSharp.Formatting.Razor open FsUnitTyped +open FSharp.Formatting - -module Logging = FSharp.Formatting.Common.Log -type TraceOptions = System.Diagnostics.TraceOptions -do - try - System.Diagnostics.Trace.AutoFlush <- true - let allTraceOptions = TraceOptions.Callstack ||| TraceOptions.DateTime ||| TraceOptions.LogicalOperationStack ||| - TraceOptions.ProcessId ||| TraceOptions.ThreadId ||| TraceOptions.Timestamp - let noTraceOptions = TraceOptions.None - let listeners = - [|Logging.ConsoleListener() - |> Logging.SetupListener noTraceOptions System.Diagnostics.SourceLevels.Information |] - let sources = - [ FSharp.Formatting.Common.Log.source - //Yaaf.FSharp.Scripting.Log.source - ] - - sources |> Seq.iter (Logging.SetupSource listeners) - - // Test that everything works - Logging.infof "FSharp.Formatting Logging setup!" - //Yaaf.FSharp.Scripting.Log.infof "Yaaf.FSharp.Scripting Logging setup!" - with e -> - printfn "FSharp.Formatting Logging setup failed: %A" e +do TestHelpers.enableLogging() let properNewLines (text: string) = text.Replace("\r\n", System.Environment.NewLine) @@ -494,7 +472,7 @@ let info = "project-summary", "A short summary of your project" "project-github", "http://github.com/pblasucci/fsharp-project-scaffold" "project-nuget", "http://nuget.com/packages/FSharp.ProjectScaffold" - "root", "http://tpetricek.github.io/FSharp.FSharp.ProjectScaffold" ] + "root", "http://fsprojects.github.io/FSharp.FSharp.ProjectScaffold" ] let docPageTemplate = __SOURCE_DIRECTORY__ "../../misc/templates/docpage.cshtml" diff --git a/tests/FSharp.Markdown.Tests/CommonMarkSpecTest.fs b/tests/FSharp.Markdown.Tests/CommonMarkSpecTest.fs index 3fc9ab319..d5735cca0 100644 --- a/tests/FSharp.Markdown.Tests/CommonMarkSpecTest.fs +++ b/tests/FSharp.Markdown.Tests/CommonMarkSpecTest.fs @@ -17,6 +17,8 @@ open FsUnit open NUnit.Framework open FSharp.Markdown +let properNewLines (text: string) = text.Replace("\r\n", "\n").Replace("\n", System.Environment.NewLine) + let enabledSections = [ "Fenced code blocks" "Indented code blocks" @@ -56,7 +58,7 @@ and code blocks: > return shell_exec("echo $input | $markdown_script"); Any decent text editor should make email-style quoting easy.""" - let html = """

Blockquotes can contain other Markdown elements, including headers, lists, + let html = properNewLines """

Blockquotes can contain other Markdown elements, including headers, lists, and code blocks:

> ## This is a header.
 > 
@@ -82,7 +84,7 @@ let ``manual markdown test: use spaces in the first line of a code block (indent
will turn into:""" - let html = """

For example, this:

+ let html = properNewLines """

For example, this:

    <div class="footer">
         &copy; 2004 Foo Corporation
     </div>
@@ -100,7 +102,7 @@ let ``manual markdown test: use tabs for defining a list`` () =
 + this is a list item
   indented with spaces
 "
-  let html = """
    
+  let html = properNewLines """
      
 
    • 
 
      this is a list item
 indented with tabs
      
@@ -122,7 +124,7 @@ with a continuation line
 + this is a list item
   indented with spaces
 "
-  let html = """
        
+  let html = properNewLines """
          
 
        • 
 
          this is a list item
 with a continuation line
          
@@ -141,7 +143,7 @@ let ``manual markdown test: test if we can handle paragraph ending with two spac
   let markdown = "this is a paragraph ending with two spaces\t  
 with a continuation line
 "
-  let html = "
          this is a paragraph ending with two spaces\t
          
+  let html = properNewLines "
          this is a paragraph ending with two spaces\t
          
 with a continuation line
          
 "
   (Markdown.TransformHtml(markdown))
@@ -152,7 +154,7 @@ let ``manual markdown test: test that we don't trim tab character at the end`` (
   let markdown = "this is a paragraph ending with tab  \t
 with a continuation line
 "
-  let html = "
          this is a paragraph ending with tab  \t
+  let html = properNewLines "
          this is a paragraph ending with tab  \t
 with a continuation line
          
 "
   (Markdown.TransformHtml(markdown))
@@ -162,7 +164,7 @@ with a continuation line
          
 let ``manual markdown test: test code block (with tabs) in list`` () =
   let markdown = "- \t  Code Block
 "
-  let html = "
            
+  let html = properNewLines "
              
 
            • 
 
                Code Block
 
              
@@ -176,7 +178,7 @@ let ``manual markdown test: test code block (with tabs) in list`` () =
 let ``manual markdown test: test code block (with spaces) in list`` () =
   let markdown = "-       Code Block
 "
-  let html = "
                
+  let html = properNewLines "
                  
 
                • 
 
                    Code Block
 
                  
@@ -191,7 +193,7 @@ let ``manual markdown test: blockquote with continuation`` () =
   let markdown = "> blockquote
 with continuation
 "
-  let html = "
                  
+  let html = properNewLines "
                  
 
                  blockquote
 with continuation
                  
 
                  
@@ -204,7 +206,7 @@ let ``manual markdown test: blockquote without continuation`` () =
   let markdown = "> blockquote
 # without continuation
 "
-  let html = "
                  
+  let html = properNewLines "
                  
 
                  blockquote
                  
 
                  
 
                  without continuation
                  
diff --git a/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj b/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj
index cc6ade2dc..cd128e515 100644
--- a/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj
+++ b/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj
@@ -118,7 +118,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll
@@ -127,7 +127,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll
@@ -183,7 +183,7 @@
     
   
   
-    
+    
       
         
           True
@@ -195,7 +195,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\FSharp.Data\lib\portable-net45+netcore45\FSharp.Data.dll
@@ -233,7 +233,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
@@ -244,7 +244,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll
@@ -255,7 +255,7 @@
     
   
   
-    
+    
       
         
           True
@@ -267,7 +267,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll
@@ -287,7 +287,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
@@ -298,7 +298,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll
@@ -307,7 +307,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll
@@ -327,7 +327,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll
@@ -345,7 +345,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll
@@ -365,7 +365,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
@@ -376,7 +376,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll
@@ -385,7 +385,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll
@@ -396,7 +396,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll
@@ -405,7 +405,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll
@@ -416,7 +416,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.IO\lib\net462\System.IO.dll
@@ -443,7 +443,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
@@ -454,7 +454,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll
@@ -463,7 +463,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
@@ -474,7 +474,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll
@@ -483,7 +483,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll
@@ -494,7 +494,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Linq\lib\net463\System.Linq.dll
@@ -503,7 +503,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll
@@ -514,7 +514,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll
@@ -523,7 +523,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll
@@ -534,7 +534,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll
@@ -545,7 +545,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll
@@ -554,29 +554,9 @@
         
       
     
-    
-      
-        
-          ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll
-          False
-          True
-        
-      
-    
-  
-  
-    
-      
-        
-          ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll
-          False
-          True
-        
-      
-    
   
   
-    
+    
       
         
           ..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll
@@ -587,7 +567,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll
@@ -598,7 +578,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Reflection\lib\net462\System.Reflection.dll
@@ -625,7 +605,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
@@ -636,7 +616,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll
@@ -647,7 +627,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll
@@ -658,7 +638,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll
@@ -669,7 +649,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll
@@ -678,7 +658,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll
@@ -696,7 +676,7 @@
         
       
     
-    
+    
       
         
           True
@@ -735,7 +715,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
@@ -746,7 +726,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll
@@ -773,7 +753,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
@@ -784,7 +764,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
@@ -804,7 +784,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll
@@ -840,7 +820,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
@@ -851,7 +831,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll
@@ -862,7 +842,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll
@@ -871,7 +851,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll
@@ -882,7 +862,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll
@@ -891,7 +871,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll
@@ -902,7 +882,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll
@@ -911,7 +891,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll
@@ -922,7 +902,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll
@@ -931,7 +911,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll
@@ -942,7 +922,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll
@@ -953,7 +933,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll
@@ -962,7 +942,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll
@@ -973,7 +953,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll
@@ -982,7 +962,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll
@@ -1002,7 +982,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
@@ -1013,7 +993,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll
@@ -1022,7 +1002,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll
@@ -1033,7 +1013,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll
@@ -1053,7 +1033,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
@@ -1064,7 +1044,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll
@@ -1075,7 +1055,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll
@@ -1086,7 +1066,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll
@@ -1097,7 +1077,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll
@@ -1128,7 +1108,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\test\FsUnit\lib\net45\FsUnit.NUnit.dll
@@ -1137,7 +1117,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\FsUnit\lib\netstandard1.6\FsUnit.NUnit.dll
@@ -1148,7 +1128,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\test\Microsoft.Win32.Primitives\lib\net46\Microsoft.Win32.Primitives.dll
@@ -1157,7 +1137,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll
@@ -1209,7 +1189,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll
@@ -1218,7 +1198,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\NUnit\lib\netstandard1.6\nunit.framework.dll
@@ -1247,7 +1227,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\test\System.AppContext\lib\net463\System.AppContext.dll
@@ -1256,7 +1236,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\System.AppContext\lib\netstandard1.6\System.AppContext.dll
@@ -1267,7 +1247,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\test\System.Buffers\lib\netstandard1.1\System.Buffers.dll
@@ -1278,7 +1258,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\test\System.IO.Compression\lib\net46\System.IO.Compression.dll
@@ -1289,7 +1269,7 @@
     
   
   
-    
+    
       
         
           True
@@ -1301,7 +1281,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\System.IO.Compression.ZipFile\lib\netstandard1.3\System.IO.Compression.ZipFile.dll
@@ -1312,7 +1292,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\test\System.Net.Sockets\lib\net46\System.Net.Sockets.dll
@@ -1321,7 +1301,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll
@@ -1332,7 +1312,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\test\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -1341,7 +1321,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -1350,7 +1330,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -1361,7 +1341,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\test\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll
@@ -1370,7 +1350,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\System.Runtime.Loader\ref\netstandard1.5\System.Runtime.Loader.dll
@@ -1381,7 +1361,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\test\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll
@@ -1392,7 +1372,7 @@
     
   
   
-    
+    
       
         
           True
@@ -1404,7 +1384,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll
@@ -1415,7 +1395,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\test\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll
diff --git a/tests/FSharp.Markdown.Tests/Markdown.fs b/tests/FSharp.Markdown.Tests/Markdown.fs
index de8475bbf..e8c980aee 100644
--- a/tests/FSharp.Markdown.Tests/Markdown.fs
+++ b/tests/FSharp.Markdown.Tests/Markdown.fs
@@ -13,7 +13,7 @@ open FSharp.Markdown
 open FSharp.Formatting.Common
 open FsUnitTyped
 
-let properNewLines (text: string) = text.Replace("\r\n", System.Environment.NewLine)
+let properNewLines (text: string) = text.Replace("\r\n", "\n").Replace("\n", System.Environment.NewLine)
 
 let shouldEqualNoWhiteSpace (x:string) (y:string) =
     shouldEqual (x.Split()) (y.Split())
@@ -116,7 +116,7 @@ let ``Transform LaTex block correctly``() =
   let doc = """$$$
 foo\$\$bar<>\$\&\%\$\#\_\{\}
 foo\$\$bar<>\$\&\%\$\#\_\{\}"""
-  let expected = """
                  \[foo\$\$bar<>\$\&\%\$\#\_\{\}
+  let expected = properNewLines """
                  \[foo\$\$bar<>\$\&\%\$\#\_\{\}
 foo\$\$bar<>\$\&\%\$\#\_\{\}\]
                  """
   (Markdown.TransformHtml doc).Trim()
   |> shouldEqual expected
diff --git a/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj b/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj
index ff43b5217..5563b34ec 100644
--- a/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj
+++ b/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj
@@ -75,8 +75,49 @@
   
   -->
   
+  
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+      FSharp.Formatting.TestHelpers
+      {0b552f94-33fe-4037-9c17-1eb2a885f263}
+      True
+    
+    
+      FSharp.CodeFormat
+      {341ebf32-d470-4c55-99e9-55f14f7ffbb1}
+      True
+    
+    
+      FSharp.Formatting.Common
+      {91bad90e-bf3b-4646-a1a7-1568f8f25075}
+      True
+    
+    
+      FSharp.Formatting.Razor
+      {c6b3c274-71a8-4239-ba9a-1af7b2f7c736}
+      True
+    
+    
+      FSharp.Literate
+      {65e6d541-0486-4383-b619-5cfc5d2ba2f0}
+      True
+    
+    
+      FSharp.MetadataFormat
+      {bc4946ba-2724-4524-ac50-dfc49ee154a1}
+      True
+    
+  
   
-    
+    
       
         
           ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll
@@ -90,7 +131,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\FSharp.Compiler.Service\lib\netstandard1.6\FSharp.Compiler.Service.dll
@@ -119,7 +160,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll
@@ -128,7 +169,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll
@@ -184,7 +225,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll
@@ -195,7 +236,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\Microsoft.DiaSymReader\lib\netstandard1.1\Microsoft.DiaSymReader.dll
@@ -206,7 +247,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\Microsoft.DiaSymReader.PortablePdb\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll
@@ -217,7 +258,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\Microsoft.Win32.Primitives\lib\net46\Microsoft.Win32.Primitives.dll
@@ -226,7 +267,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll
@@ -237,7 +278,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\Microsoft.Win32.Registry\ref\netstandard1.3\Microsoft.Win32.Registry.dll
@@ -248,7 +289,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\RazorEngine\lib\net45\RazorEngine.dll
@@ -259,7 +300,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.AppContext\lib\net463\System.AppContext.dll
@@ -268,7 +309,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll
@@ -279,7 +320,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll
@@ -299,7 +340,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
@@ -310,7 +351,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll
@@ -321,7 +362,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll
@@ -332,7 +373,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Console\lib\net46\System.Console.dll
@@ -341,7 +382,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll
@@ -361,7 +402,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
@@ -372,7 +413,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll
@@ -381,7 +422,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll
@@ -392,7 +433,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll
@@ -403,7 +444,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Diagnostics.TraceSource\ref\netstandard1.3\System.Diagnostics.TraceSource.dll
@@ -414,7 +455,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll
@@ -432,7 +473,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll
@@ -452,7 +493,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
@@ -463,7 +504,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll
@@ -472,7 +513,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll
@@ -483,7 +524,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll
@@ -492,7 +533,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll
@@ -503,7 +544,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.IO\lib\net462\System.IO.dll
@@ -530,7 +571,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
@@ -548,7 +589,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.IO.Compression\lib\net46\System.IO.Compression.dll
@@ -566,7 +607,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll
@@ -577,7 +618,7 @@
     
   
   
-    
+    
       
         
           True
@@ -589,7 +630,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.IO.Compression.ZipFile\lib\netstandard1.3\System.IO.Compression.ZipFile.dll
@@ -600,7 +641,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll
@@ -609,7 +650,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
@@ -620,7 +661,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll
@@ -629,7 +670,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll
@@ -640,7 +681,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Linq\lib\net463\System.Linq.dll
@@ -649,7 +690,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll
@@ -660,7 +701,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll
@@ -669,7 +710,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll
@@ -680,7 +721,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll
@@ -691,7 +732,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll
@@ -700,29 +741,9 @@
         
       
     
-    
-      
-        
-          ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll
-          False
-          True
-        
-      
-    
   
   
-    
-      
-        
-          ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll
-          False
-          True
-        
-      
-    
-  
-  
-    
+    
       
         
           ..\..\packages\System.Net.Sockets\lib\net46\System.Net.Sockets.dll
@@ -731,7 +752,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll
@@ -742,7 +763,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll
@@ -753,7 +774,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll
@@ -764,7 +785,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Reflection\lib\net462\System.Reflection.dll
@@ -791,7 +812,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
@@ -802,7 +823,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll
@@ -813,7 +834,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll
@@ -824,7 +845,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll
@@ -835,7 +856,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll
@@ -846,7 +867,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll
@@ -855,7 +876,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll
@@ -873,7 +894,7 @@
         
       
     
-    
+    
       
         
           True
@@ -912,7 +933,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
@@ -923,7 +944,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll
@@ -950,7 +971,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
@@ -961,7 +982,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
@@ -981,7 +1002,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll
@@ -1017,7 +1038,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
@@ -1028,7 +1049,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -1037,7 +1058,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -1046,7 +1067,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -1057,7 +1078,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll
@@ -1068,7 +1089,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll
@@ -1079,7 +1100,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll
@@ -1088,7 +1109,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll
@@ -1099,7 +1120,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll
@@ -1108,7 +1129,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll
@@ -1119,7 +1140,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll
@@ -1128,7 +1149,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll
@@ -1139,7 +1160,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll
@@ -1148,7 +1169,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll
@@ -1159,7 +1180,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll
@@ -1170,7 +1191,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll
@@ -1179,7 +1200,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll
@@ -1190,7 +1211,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll
@@ -1199,7 +1220,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll
@@ -1219,7 +1240,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
@@ -1239,7 +1260,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll
@@ -1250,7 +1271,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll
@@ -1259,7 +1280,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll
@@ -1270,7 +1291,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll
@@ -1290,7 +1311,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
@@ -1301,7 +1322,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll
@@ -1312,7 +1333,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll
@@ -1323,7 +1344,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll
@@ -1334,7 +1355,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll
@@ -1345,7 +1366,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll
@@ -1365,7 +1386,7 @@
     
   
   
-    
+    
       
         
           True
@@ -1377,7 +1398,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll
@@ -1388,14 +1409,14 @@
     
   
   
-    
+    
       
         
           True
         
       
     
-    
+    
       
         
           ..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll
@@ -1406,7 +1427,7 @@
     
   
   
-    
+    
       
         
           ..\..\packages\test\FsUnit\lib\net45\FsUnit.NUnit.dll
@@ -1415,7 +1436,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\FsUnit\lib\netstandard1.6\FsUnit.NUnit.dll
@@ -1467,7 +1488,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\NUnit\lib\net45\nunit.framework.dll
@@ -1476,7 +1497,7 @@
         
       
     
-    
+    
       
         
           ..\..\packages\test\NUnit\lib\netstandard1.6\nunit.framework.dll
@@ -1504,40 +1525,4 @@
       
     
   
-  
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-      FSharp.CodeFormat
-      {341ebf32-d470-4c55-99e9-55f14f7ffbb1}
-      True
-    
-    
-      FSharp.Formatting.Common
-      {91bad90e-bf3b-4646-a1a7-1568f8f25075}
-      True
-    
-    
-      FSharp.Formatting.Razor
-      {c6b3c274-71a8-4239-ba9a-1af7b2f7c736}
-      True
-    
-    
-      FSharp.Literate
-      {65e6d541-0486-4383-b619-5cfc5d2ba2f0}
-      True
-    
-    
-      FSharp.MetadataFormat
-      {bc4946ba-2724-4524-ac50-dfc49ee154a1}
-      True
-    
-  
 
\ No newline at end of file
diff --git a/tests/FSharp.MetadataFormat.Tests/Tests.fs b/tests/FSharp.MetadataFormat.Tests/Tests.fs
index da3305290..8919a2a91 100755
--- a/tests/FSharp.MetadataFormat.Tests/Tests.fs
+++ b/tests/FSharp.MetadataFormat.Tests/Tests.fs
@@ -61,7 +61,7 @@ let info =
     "project-summary", "A short summary of your project"
     "project-github", "http://github.com/pblasucci/fsharp-project-scaffold"
     "project-nuget", "http://nuget.com/packages/FSharp.ProjectScaffold"
-    "root", "http://tpetricek.github.io/FSharp.FSharp.ProjectScaffold" ]
+    "root", "http://fsprojects.github.io/FSharp.FSharp.ProjectScaffold" ]
 
 let generate (libraries:string list) useMarkdown =
     try let output = getOutputDir ()
@@ -82,6 +82,7 @@ let generate (libraries:string list) useMarkdown =
         )
         reraise ()
 
+do FSharp.Formatting.TestHelpers.enableLogging()
 
 []
 let ``MetadataFormat works on sample Deedle assembly``() =
@@ -571,4 +572,4 @@ runtest ``MetadataFormat test that csharp (publiconly) support works``;;
 printfn "MetadataFormat test that cref generation works"
 runtest ``MetadataFormat test that cref generation works``;;
 
-#endif
\ No newline at end of file
+#endif
diff --git a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.fsproj b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.fsproj
index f31913ba4..1f1363bb2 100644
--- a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.fsproj
+++ b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib1.fsproj
@@ -100,7 +100,7 @@
                           
                         
                       
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll
@@ -109,7 +109,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll
@@ -165,7 +165,7 @@
     
                     
   
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll
@@ -176,7 +176,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\RazorEngine\lib\net45\RazorEngine.dll
@@ -196,7 +196,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
@@ -207,7 +207,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll
@@ -218,7 +218,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Console\lib\net46\System.Console.dll
@@ -227,7 +227,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll
@@ -247,7 +247,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
@@ -258,7 +258,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll
@@ -267,7 +267,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll
@@ -278,7 +278,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll
@@ -296,7 +296,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll
@@ -316,7 +316,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
@@ -327,7 +327,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll
@@ -336,7 +336,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll
@@ -347,7 +347,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll
@@ -356,7 +356,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll
@@ -367,7 +367,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO\lib\net462\System.IO.dll
@@ -394,7 +394,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
@@ -405,7 +405,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll
@@ -414,7 +414,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
@@ -425,7 +425,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll
@@ -434,7 +434,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll
@@ -445,7 +445,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq\lib\net463\System.Linq.dll
@@ -454,7 +454,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll
@@ -465,7 +465,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll
@@ -474,7 +474,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll
@@ -485,7 +485,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll
@@ -496,7 +496,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll
@@ -505,29 +505,9 @@
         
       
     
-    
-      
-        
-          ..\..\..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll
-          False
-          True
-        
-      
-    
-  
-  
-    
-      
-        
-          ..\..\..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll
-          False
-          True
-        
-      
-    
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll
@@ -538,7 +518,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll
@@ -549,7 +529,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection\lib\net462\System.Reflection.dll
@@ -576,7 +556,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
@@ -587,7 +567,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll
@@ -598,7 +578,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll
@@ -609,7 +589,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll
@@ -620,7 +600,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll
@@ -629,7 +609,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll
@@ -647,7 +627,7 @@
         
       
     
-    
+    
       
         
           True
@@ -686,7 +666,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
@@ -697,7 +677,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll
@@ -724,7 +704,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
@@ -735,7 +715,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
@@ -755,7 +735,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll
@@ -791,7 +771,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
@@ -802,7 +782,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll
@@ -813,7 +793,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll
@@ -822,7 +802,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll
@@ -833,7 +813,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll
@@ -842,7 +822,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll
@@ -853,7 +833,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll
@@ -862,7 +842,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll
@@ -873,7 +853,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll
@@ -882,7 +862,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll
@@ -893,7 +873,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll
@@ -904,7 +884,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll
@@ -913,7 +893,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll
@@ -924,7 +904,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll
@@ -933,7 +913,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll
@@ -953,7 +933,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
@@ -964,7 +944,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll
@@ -973,7 +953,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll
@@ -984,7 +964,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll
@@ -1004,7 +984,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
@@ -1015,7 +995,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll
@@ -1026,7 +1006,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll
@@ -1037,7 +1017,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll
@@ -1048,7 +1028,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll
diff --git a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj
index 47d70d826..0885b8611 100644
--- a/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj
+++ b/tests/FSharp.MetadataFormat.Tests/files/FsLib/FsLib2.fsproj
@@ -100,7 +100,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll
@@ -109,7 +109,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll
@@ -165,7 +165,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll
@@ -176,7 +176,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\RazorEngine\lib\net45\RazorEngine.dll
@@ -196,7 +196,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
@@ -207,7 +207,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll
@@ -218,7 +218,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Console\lib\net46\System.Console.dll
@@ -227,7 +227,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll
@@ -247,7 +247,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
@@ -258,7 +258,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll
@@ -267,7 +267,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll
@@ -278,7 +278,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll
@@ -296,7 +296,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll
@@ -316,7 +316,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
@@ -327,7 +327,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll
@@ -336,7 +336,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll
@@ -347,7 +347,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll
@@ -356,7 +356,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll
@@ -367,7 +367,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO\lib\net462\System.IO.dll
@@ -394,7 +394,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
@@ -405,7 +405,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll
@@ -414,7 +414,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
@@ -425,7 +425,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll
@@ -434,7 +434,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll
@@ -445,7 +445,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq\lib\net463\System.Linq.dll
@@ -454,7 +454,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll
@@ -465,7 +465,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll
@@ -474,7 +474,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll
@@ -485,7 +485,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll
@@ -496,7 +496,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll
@@ -505,29 +505,9 @@
         
       
     
-    
-      
-        
-          ..\..\..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll
-          False
-          True
-        
-      
-    
-  
-  
-    
-      
-        
-          ..\..\..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll
-          False
-          True
-        
-      
-    
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll
@@ -538,7 +518,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll
@@ -549,7 +529,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection\lib\net462\System.Reflection.dll
@@ -576,7 +556,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
@@ -587,7 +567,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll
@@ -598,7 +578,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll
@@ -609,7 +589,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll
@@ -620,7 +600,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll
@@ -629,7 +609,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll
@@ -647,7 +627,7 @@
         
       
     
-    
+    
       
         
           True
@@ -686,7 +666,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
@@ -697,7 +677,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll
@@ -724,7 +704,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
@@ -735,7 +715,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
@@ -755,7 +735,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll
@@ -791,7 +771,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
@@ -802,7 +782,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll
@@ -813,7 +793,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll
@@ -822,7 +802,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll
@@ -833,7 +813,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll
@@ -842,7 +822,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll
@@ -853,7 +833,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll
@@ -862,7 +842,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll
@@ -873,7 +853,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll
@@ -882,7 +862,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll
@@ -893,7 +873,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll
@@ -904,7 +884,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll
@@ -913,7 +893,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll
@@ -924,7 +904,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll
@@ -933,7 +913,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll
@@ -953,7 +933,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
@@ -964,7 +944,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll
@@ -973,7 +953,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll
@@ -984,7 +964,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll
@@ -1004,7 +984,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
@@ -1015,7 +995,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll
@@ -1026,7 +1006,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll
@@ -1037,7 +1017,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll
@@ -1048,7 +1028,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll
diff --git a/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib1.fsproj b/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib1.fsproj
index 882b98e84..348a75c1e 100644
--- a/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib1.fsproj
+++ b/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib1.fsproj
@@ -84,7 +84,7 @@
   
   -->
   
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll
@@ -98,7 +98,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Compiler.Service\lib\netstandard1.6\FSharp.Compiler.Service.dll
@@ -127,7 +127,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll
@@ -136,7 +136,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll
@@ -192,7 +192,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll
@@ -203,7 +203,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.DiaSymReader\lib\netstandard1.1\Microsoft.DiaSymReader.dll
@@ -214,7 +214,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.DiaSymReader.PortablePdb\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll
@@ -225,7 +225,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.Win32.Primitives\lib\net46\Microsoft.Win32.Primitives.dll
@@ -234,7 +234,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll
@@ -245,7 +245,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.Win32.Registry\ref\netstandard1.3\Microsoft.Win32.Registry.dll
@@ -256,7 +256,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\RazorEngine\lib\net45\RazorEngine.dll
@@ -267,7 +267,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.AppContext\lib\net463\System.AppContext.dll
@@ -276,7 +276,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll
@@ -287,7 +287,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll
@@ -307,7 +307,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
@@ -318,7 +318,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll
@@ -329,7 +329,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll
@@ -340,7 +340,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Console\lib\net46\System.Console.dll
@@ -349,7 +349,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll
@@ -369,7 +369,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
@@ -380,7 +380,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll
@@ -389,7 +389,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll
@@ -400,7 +400,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll
@@ -411,7 +411,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.TraceSource\ref\netstandard1.3\System.Diagnostics.TraceSource.dll
@@ -422,7 +422,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll
@@ -440,7 +440,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll
@@ -460,7 +460,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
@@ -471,7 +471,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll
@@ -480,7 +480,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll
@@ -491,7 +491,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll
@@ -500,7 +500,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll
@@ -511,7 +511,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO\lib\net462\System.IO.dll
@@ -538,7 +538,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
@@ -556,7 +556,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.Compression\lib\net46\System.IO.Compression.dll
@@ -574,7 +574,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll
@@ -585,7 +585,7 @@
     
   
   
-    
+    
       
         
           True
@@ -597,7 +597,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.Compression.ZipFile\lib\netstandard1.3\System.IO.Compression.ZipFile.dll
@@ -608,7 +608,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll
@@ -617,7 +617,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
@@ -628,7 +628,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll
@@ -637,7 +637,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll
@@ -648,7 +648,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq\lib\net463\System.Linq.dll
@@ -657,7 +657,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll
@@ -668,7 +668,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll
@@ -677,7 +677,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll
@@ -688,7 +688,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll
@@ -699,7 +699,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll
@@ -708,29 +708,9 @@
         
       
     
-    
-      
-        
-          ..\..\..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll
-          False
-          True
-        
-      
-    
-  
-  
-    
-      
-        
-          ..\..\..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll
-          False
-          True
-        
-      
-    
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.Sockets\lib\net46\System.Net.Sockets.dll
@@ -739,7 +719,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll
@@ -750,7 +730,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll
@@ -761,7 +741,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll
@@ -772,7 +752,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection\lib\net462\System.Reflection.dll
@@ -799,7 +779,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
@@ -810,7 +790,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll
@@ -821,7 +801,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll
@@ -832,7 +812,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll
@@ -843,7 +823,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll
@@ -854,7 +834,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll
@@ -863,7 +843,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll
@@ -881,7 +861,7 @@
         
       
     
-    
+    
       
         
           True
@@ -920,7 +900,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
@@ -931,7 +911,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll
@@ -958,7 +938,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
@@ -969,7 +949,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
@@ -989,7 +969,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll
@@ -1025,7 +1005,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
@@ -1036,7 +1016,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -1045,7 +1025,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -1054,7 +1034,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -1065,7 +1045,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll
@@ -1076,7 +1056,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll
@@ -1087,7 +1067,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll
@@ -1096,7 +1076,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll
@@ -1107,7 +1087,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll
@@ -1116,7 +1096,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll
@@ -1127,7 +1107,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll
@@ -1136,7 +1116,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll
@@ -1147,7 +1127,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll
@@ -1156,7 +1136,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll
@@ -1167,7 +1147,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll
@@ -1178,7 +1158,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll
@@ -1187,7 +1167,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll
@@ -1198,7 +1178,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll
@@ -1207,7 +1187,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll
@@ -1227,7 +1207,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
@@ -1247,7 +1227,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll
@@ -1258,7 +1238,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll
@@ -1267,7 +1247,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll
@@ -1278,7 +1258,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll
@@ -1298,7 +1278,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
@@ -1309,7 +1289,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll
@@ -1320,7 +1300,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll
@@ -1331,7 +1311,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll
@@ -1342,7 +1322,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll
@@ -1353,7 +1333,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll
@@ -1373,7 +1353,7 @@
     
   
   
-    
+    
       
         
           True
@@ -1385,7 +1365,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll
@@ -1396,14 +1376,14 @@
     
   
   
-    
+    
       
         
           True
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll
diff --git a/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib2.fsproj b/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib2.fsproj
index 93d019926..022eadc8a 100644
--- a/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib2.fsproj
+++ b/tests/FSharp.MetadataFormat.Tests/files/TestLib/TestLib2.fsproj
@@ -82,7 +82,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll
@@ -96,7 +96,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Compiler.Service\lib\netstandard1.6\FSharp.Compiler.Service.dll
@@ -125,7 +125,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll
@@ -134,7 +134,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll
@@ -190,7 +190,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.AspNet.Razor\lib\net45\System.Web.Razor.dll
@@ -201,7 +201,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.DiaSymReader\lib\netstandard1.1\Microsoft.DiaSymReader.dll
@@ -212,7 +212,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.DiaSymReader.PortablePdb\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll
@@ -223,7 +223,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.Win32.Primitives\lib\net46\Microsoft.Win32.Primitives.dll
@@ -232,7 +232,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll
@@ -243,7 +243,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\Microsoft.Win32.Registry\ref\netstandard1.3\Microsoft.Win32.Registry.dll
@@ -254,7 +254,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\RazorEngine\lib\net45\RazorEngine.dll
@@ -265,7 +265,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.AppContext\lib\net463\System.AppContext.dll
@@ -274,7 +274,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.AppContext\lib\netstandard1.6\System.AppContext.dll
@@ -285,7 +285,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll
@@ -305,7 +305,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
@@ -316,7 +316,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll
@@ -327,7 +327,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll
@@ -338,7 +338,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Console\lib\net46\System.Console.dll
@@ -347,7 +347,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll
@@ -367,7 +367,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
@@ -378,7 +378,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll
@@ -387,7 +387,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll
@@ -398,7 +398,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll
@@ -409,7 +409,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.TraceSource\ref\netstandard1.3\System.Diagnostics.TraceSource.dll
@@ -420,7 +420,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll
@@ -438,7 +438,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll
@@ -458,7 +458,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
@@ -469,7 +469,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll
@@ -478,7 +478,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll
@@ -489,7 +489,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll
@@ -498,7 +498,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll
@@ -509,7 +509,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO\lib\net462\System.IO.dll
@@ -536,7 +536,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
@@ -554,7 +554,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.Compression\lib\net46\System.IO.Compression.dll
@@ -572,7 +572,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll
@@ -583,7 +583,7 @@
     
   
   
-    
+    
       
         
           True
@@ -595,7 +595,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.Compression.ZipFile\lib\netstandard1.3\System.IO.Compression.ZipFile.dll
@@ -606,7 +606,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll
@@ -615,7 +615,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
@@ -626,7 +626,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll
@@ -635,7 +635,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll
@@ -646,7 +646,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq\lib\net463\System.Linq.dll
@@ -655,7 +655,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll
@@ -666,7 +666,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll
@@ -675,7 +675,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll
@@ -686,7 +686,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll
@@ -697,7 +697,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll
@@ -706,29 +706,9 @@
         
       
     
-    
-      
-        
-          ..\..\..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll
-          False
-          True
-        
-      
-    
-  
-  
-    
-      
-        
-          ..\..\..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll
-          False
-          True
-        
-      
-    
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.Sockets\lib\net46\System.Net.Sockets.dll
@@ -737,7 +717,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll
@@ -748,7 +728,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll
@@ -759,7 +739,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll
@@ -770,7 +750,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection\lib\net462\System.Reflection.dll
@@ -797,7 +777,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
@@ -808,7 +788,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll
@@ -819,7 +799,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll
@@ -830,7 +810,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll
@@ -841,7 +821,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll
@@ -852,7 +832,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll
@@ -861,7 +841,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll
@@ -879,7 +859,7 @@
         
       
     
-    
+    
       
         
           True
@@ -918,7 +898,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
@@ -929,7 +909,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll
@@ -956,7 +936,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
@@ -967,7 +947,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
@@ -987,7 +967,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll
@@ -1023,7 +1003,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
@@ -1034,7 +1014,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -1043,7 +1023,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -1052,7 +1032,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -1063,7 +1043,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Loader\lib\netstandard1.5\System.Runtime.Loader.dll
@@ -1074,7 +1054,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll
@@ -1085,7 +1065,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll
@@ -1094,7 +1074,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll
@@ -1105,7 +1085,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll
@@ -1114,7 +1094,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll
@@ -1125,7 +1105,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll
@@ -1134,7 +1114,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll
@@ -1145,7 +1125,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll
@@ -1154,7 +1134,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll
@@ -1165,7 +1145,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll
@@ -1176,7 +1156,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll
@@ -1185,7 +1165,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll
@@ -1196,7 +1176,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll
@@ -1205,7 +1185,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll
@@ -1225,7 +1205,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
@@ -1245,7 +1225,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll
@@ -1256,7 +1236,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll
@@ -1265,7 +1245,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll
@@ -1276,7 +1256,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll
@@ -1296,7 +1276,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
@@ -1307,7 +1287,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll
@@ -1318,7 +1298,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll
@@ -1329,7 +1309,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll
@@ -1340,7 +1320,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll
@@ -1351,7 +1331,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll
@@ -1371,7 +1351,7 @@
     
   
   
-    
+    
       
         
           True
@@ -1383,7 +1363,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Xml.ReaderWriter\lib\netstandard1.3\System.Xml.ReaderWriter.dll
@@ -1394,14 +1374,14 @@
     
   
   
-    
+    
       
         
           True
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Xml.XDocument\lib\netstandard1.3\System.Xml.XDocument.dll
diff --git a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.fsproj b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.fsproj
index 1d9b79cfe..a7922551d 100644
--- a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.fsproj
+++ b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib1.fsproj
@@ -93,7 +93,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll
@@ -102,7 +102,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll
@@ -167,7 +167,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
@@ -178,7 +178,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll
@@ -189,7 +189,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Console\lib\net46\System.Console.dll
@@ -198,7 +198,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll
@@ -218,7 +218,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
@@ -229,7 +229,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll
@@ -238,7 +238,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll
@@ -249,7 +249,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll
@@ -267,7 +267,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll
@@ -287,7 +287,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
@@ -298,7 +298,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll
@@ -307,7 +307,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll
@@ -318,7 +318,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll
@@ -327,7 +327,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll
@@ -338,7 +338,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO\lib\net462\System.IO.dll
@@ -365,7 +365,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
@@ -376,7 +376,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll
@@ -385,7 +385,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
@@ -396,7 +396,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll
@@ -405,7 +405,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll
@@ -416,7 +416,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq\lib\net463\System.Linq.dll
@@ -425,7 +425,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll
@@ -436,7 +436,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll
@@ -445,7 +445,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll
@@ -456,7 +456,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll
@@ -467,7 +467,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll
@@ -476,29 +476,9 @@
         
       
     
-    
-      
-        
-          ..\..\..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll
-          False
-          True
-        
-      
-    
-  
-  
-    
-      
-        
-          ..\..\..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll
-          False
-          True
-        
-      
-    
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll
@@ -509,7 +489,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll
@@ -520,7 +500,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection\lib\net462\System.Reflection.dll
@@ -547,7 +527,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
@@ -558,7 +538,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll
@@ -569,7 +549,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll
@@ -580,7 +560,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll
@@ -591,7 +571,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll
@@ -600,7 +580,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll
@@ -618,7 +598,7 @@
         
       
     
-    
+    
       
         
           True
@@ -657,7 +637,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
@@ -668,7 +648,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll
@@ -695,7 +675,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
@@ -706,7 +686,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
@@ -726,7 +706,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll
@@ -762,7 +742,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
@@ -773,7 +753,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll
@@ -784,7 +764,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll
@@ -793,7 +773,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll
@@ -804,7 +784,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll
@@ -813,7 +793,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll
@@ -824,7 +804,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll
@@ -833,7 +813,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll
@@ -844,7 +824,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll
@@ -853,7 +833,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll
@@ -864,7 +844,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll
@@ -875,7 +855,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll
@@ -884,7 +864,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll
@@ -895,7 +875,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll
@@ -904,7 +884,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll
@@ -924,7 +904,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
@@ -935,7 +915,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll
@@ -944,7 +924,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll
@@ -955,7 +935,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll
@@ -975,7 +955,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
@@ -986,7 +966,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll
@@ -997,7 +977,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll
@@ -1008,7 +988,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll
@@ -1019,7 +999,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll
diff --git a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.fsproj b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.fsproj
index e1b9af324..d030fea32 100644
--- a/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.fsproj
+++ b/tests/FSharp.MetadataFormat.Tests/files/crefLib/crefLib2.fsproj
@@ -104,7 +104,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll
@@ -113,7 +113,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll
@@ -178,7 +178,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll
@@ -189,7 +189,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Collections.Concurrent\lib\netstandard1.3\System.Collections.Concurrent.dll
@@ -200,7 +200,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Console\lib\net46\System.Console.dll
@@ -209,7 +209,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll
@@ -229,7 +229,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll
@@ -240,7 +240,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.DiagnosticSource\lib\net46\System.Diagnostics.DiagnosticSource.dll
@@ -249,7 +249,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll
@@ -260,7 +260,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Tracing\lib\net462\System.Diagnostics.Tracing.dll
@@ -278,7 +278,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll
@@ -298,7 +298,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll
@@ -309,7 +309,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Calendars\lib\net46\System.Globalization.Calendars.dll
@@ -318,7 +318,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll
@@ -329,7 +329,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Extensions\lib\net46\System.Globalization.Extensions.dll
@@ -338,7 +338,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll
@@ -349,7 +349,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO\lib\net462\System.IO.dll
@@ -376,7 +376,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll
@@ -387,7 +387,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll
@@ -396,7 +396,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll
@@ -407,7 +407,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll
@@ -416,7 +416,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.IO.FileSystem.Primitives\lib\netstandard1.3\System.IO.FileSystem.Primitives.dll
@@ -427,7 +427,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq\lib\net463\System.Linq.dll
@@ -436,7 +436,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Linq\lib\netstandard1.6\System.Linq.dll
@@ -447,7 +447,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll
@@ -456,7 +456,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Expressions\lib\netstandard1.6\System.Linq.Expressions.dll
@@ -467,7 +467,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Linq.Queryable\lib\netstandard1.3\System.Linq.Queryable.dll
@@ -478,7 +478,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll
@@ -487,29 +487,9 @@
         
       
     
-    
-      
-        
-          ..\..\..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll
-          False
-          True
-        
-      
-    
-  
-  
-    
-      
-        
-          ..\..\..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll
-          False
-          True
-        
-      
-    
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Net.WebHeaderCollection\lib\netstandard1.3\System.Net.WebHeaderCollection.dll
@@ -520,7 +500,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.ObjectModel\lib\netstandard1.3\System.ObjectModel.dll
@@ -531,7 +511,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection\lib\net462\System.Reflection.dll
@@ -558,7 +538,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll
@@ -569,7 +549,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit\lib\netstandard1.3\System.Reflection.Emit.dll
@@ -580,7 +560,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit.ILGeneration\lib\netstandard1.3\System.Reflection.Emit.ILGeneration.dll
@@ -591,7 +571,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.Emit.Lightweight\lib\netstandard1.3\System.Reflection.Emit.Lightweight.dll
@@ -602,7 +582,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.TypeExtensions\lib\net462\System.Reflection.TypeExtensions.dll
@@ -611,7 +591,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Reflection.TypeExtensions\lib\netstandard1.5\System.Reflection.TypeExtensions.dll
@@ -629,7 +609,7 @@
         
       
     
-    
+    
       
         
           True
@@ -668,7 +648,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll
@@ -679,7 +659,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll
@@ -706,7 +686,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll
@@ -717,7 +697,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll
@@ -737,7 +717,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices\lib\net463\System.Runtime.InteropServices.dll
@@ -773,7 +753,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll
@@ -784,7 +764,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Runtime.Numerics\lib\netstandard1.3\System.Runtime.Numerics.dll
@@ -795,7 +775,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll
@@ -804,7 +784,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll
@@ -815,7 +795,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Cng\lib\net463\System.Security.Cryptography.Cng.dll
@@ -824,7 +804,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll
@@ -835,7 +815,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Csp\lib\net46\System.Security.Cryptography.Csp.dll
@@ -844,7 +824,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll
@@ -855,7 +835,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll
@@ -864,7 +844,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll
@@ -875,7 +855,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll
@@ -886,7 +866,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll
@@ -895,7 +875,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.Primitives\lib\netstandard1.3\System.Security.Cryptography.Primitives.dll
@@ -906,7 +886,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll
@@ -915,7 +895,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll
@@ -935,7 +915,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll
@@ -946,7 +926,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll
@@ -955,7 +935,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Text.RegularExpressions\lib\netstandard1.6\System.Text.RegularExpressions.dll
@@ -966,7 +946,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading\lib\netstandard1.3\System.Threading.dll
@@ -986,7 +966,7 @@
         
       
     
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll
@@ -997,7 +977,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Tasks.Parallel\lib\netstandard1.3\System.Threading.Tasks.Parallel.dll
@@ -1008,7 +988,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.Thread\lib\netstandard1.3\System.Threading.Thread.dll
@@ -1019,7 +999,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.Threading.ThreadPool\lib\netstandard1.3\System.Threading.ThreadPool.dll
@@ -1030,7 +1010,7 @@
     
   
   
-    
+    
       
         
           ..\..\..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll