diff --git a/paket.dependencies b/paket.dependencies index f857393d..57c2777b 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,7 +1,7 @@ source http://nuget.org/api/v2 redirects: on strategy: max - +framework >= net40 nuget Fantomas nuget FSharp.Compiler.Service nuget FSharp.Core @@ -42,7 +42,7 @@ group vssdk group Test source http://nuget.org/api/v2 - + framework >= net40 nuget Foq nuget FsCheck nuget FSharp.Compiler.Service.ProjectCracker @@ -51,7 +51,7 @@ group Test group Build source http://nuget.org/api/v2 - + framework >= net40 nuget canopy nuget FAKE nuget FSharp.Formatting diff --git a/paket.lock b/paket.lock index 47f44ac0..4b619513 100644 --- a/paket.lock +++ b/paket.lock @@ -1,17 +1,17 @@ REDIRECTS: ON STRATEGY: MAX +FRAMEWORK: >= NET40 NUGET remote: http://www.nuget.org/api/v2 Fantomas (2.4) FSharp.Compiler.Service (>= 8.0) FParsec (1.0.2) - FSharp.Compiler.Service (8.0) + FSharp.Compiler.Service (10.0.1) System.Collections.Immutable (>= 1.2) System.Reflection.Metadata (>= 1.4.1-beta-24227-04) FSharp.Compiler.Service.ProjectCracker (8.0) FSharp.Core (4.0.0.1) FSharp.Data (2.3.2) - Zlib.Portable (>= 1.11) - framework: >= netstandard11, portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81 FSharp.Management (0.4.2) FSharp.ViewModule.Core (1.0.5) FSharp.Core @@ -21,137 +21,10 @@ NUGET FSharp.Compiler.Service.ProjectCracker (>= 8.0) FsPickler (3.2) FsXaml.Wpf (3.1.2) - Microsoft.NETCore.Platforms (1.0.1) - framework: >= netstandard10 - Microsoft.NETCore.Targets (1.0.1) - framework: >= netstandard10 - runtime.native.System (4.0) - framework: >= netstandard13 - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - runtime.native.System.IO.Compression (4.1) - framework: >= netstandard13 - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) SourceLink.SymbolStore (0.5) - System.Collections (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 System.Collections.Immutable (1.2) - System.Collections (>= 4.0.11) - framework: >= netstandard10 - System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard10 - System.Globalization (>= 4.0.11) - framework: >= netstandard10 - System.Linq (>= 4.1) - framework: >= netstandard10 - System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard10 - System.Runtime (>= 4.1) - framework: >= netstandard10 - System.Runtime.Extensions (>= 4.1) - framework: >= netstandard10 - System.Threading (>= 4.0.11) - framework: >= netstandard10 - System.Diagnostics.Debug (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Globalization (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.IO (4.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.IO.Compression (4.1) - framework: >= netstandard11 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: >= netstandard13 - runtime.native.System (>= 4.0) - framework: >= netstandard13 - runtime.native.System.IO.Compression (>= 4.1) - framework: >= netstandard13 - System.Collections (>= 4.0.11) - framework: >= netstandard13 - System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard13 - System.IO (>= 4.1) - framework: dnxcore50, netstandard11, >= netstandard13 - System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard11, >= netstandard13 - System.Runtime.Extensions (>= 4.1) - framework: >= netstandard13 - System.Runtime.Handles (>= 4.0.1) - framework: >= netstandard13 - System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard13 - System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard11, >= netstandard13 - System.Threading (>= 4.0.11) - framework: >= netstandard13 - System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Linq (4.1) - framework: >= netstandard10 - System.Collections (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard16 - System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard16 - System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard16 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard16 - System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard16 - System.Reflection (4.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.IO (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Reflection.Extensions (4.0.1) - framework: >= netstandard11 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - System.Reflection (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10 System.Reflection.Metadata (1.4.1-beta-24430-01) - System.Collections (>= 4.0.11) - framework: >= netstandard11 - System.Collections.Immutable (>= 1.1.37) - framework: portable-net45+win8 - System.Collections.Immutable (>= 1.2) - framework: >= net45, >= netstandard11, monoandroid, monotouch, xamarinios, xamarinmac, winv4.5, wpav8.1 - System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard11 - System.IO (>= 4.1) - framework: >= netstandard11 - System.IO.Compression (>= 4.1) - framework: >= netstandard11 - System.Linq (>= 4.1) - framework: >= netstandard11 - System.Reflection (>= 4.1) - framework: >= netstandard11 - System.Reflection.Extensions (>= 4.0.1) - framework: >= netstandard11 - System.Reflection.Primitives (>= 4.0.1) - framework: >= netstandard11 - System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard11 - System.Runtime (>= 4.1) - framework: >= netstandard11 - System.Runtime.Extensions (>= 4.1) - framework: >= netstandard11 - System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard11 - System.Text.Encoding (>= 4.0.11) - framework: >= netstandard11 - System.Text.Encoding.Extensions (>= 4.0.11) - framework: >= netstandard11 - System.Threading (>= 4.0.11) - framework: >= netstandard11 - System.Reflection.Primitives (4.0.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Resources.ResourceManager (4.0.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard10 - System.Reflection (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (4.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15 - System.Runtime.Extensions (4.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime.Handles (4.0.1) - framework: >= netstandard13 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: >= netstandard13 - System.Runtime (>= 4.1) - framework: >= netstandard13 - System.Runtime.InteropServices (4.1) - framework: >= netstandard11 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Reflection (>= 4.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Runtime (>= 4.1) - framework: >= net462, dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Runtime.Handles (>= 4.0.1) - framework: dnxcore50, netstandard13, >= netstandard15 - System.Text.Encoding (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Text.Encoding.Extensions (4.0.11) - framework: >= netstandard11 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading (4.0.11) - framework: >= netstandard10 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading.Tasks (4.0.11) - framework: netstandard10, >= netstandard13 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Zlib.Portable (1.11) - framework: >= netstandard11, portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81 + System.Collections.Immutable (>= 1.2) - framework: >= net45 GROUP Build NUGET @@ -181,7 +54,7 @@ NUGET GITHUB remote: fsharp/FAKE modules/Octokit/Octokit.fsx (4e4428bfe931a5f720e32f9d69289d25eb16d467) - Octokit (>= 0.20) + Octokit GROUP Test NUGET remote: http://www.nuget.org/api/v2 diff --git a/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj b/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj index 174a8e1b..72b3477e 100644 --- a/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj +++ b/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj @@ -107,15 +107,6 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - @@ -125,54 +116,9 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - + ..\..\packages\FSharp.ViewModule.Core\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.ViewModule.dll @@ -214,27 +160,7 @@ - - - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll - False - True - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - - - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -243,167 +169,9 @@ - - - - ..\..\packages\System.Collections.Immutable\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - True - - - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll - False - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll - False - True - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll - False - True - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll - False - True - - - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -412,233 +180,6 @@ - - - - ..\..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll - False - True - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll - False - True - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - diff --git a/src/FSharp.Editing.VisualStudio/Coloring/UnusedSymbolClassifier.fs b/src/FSharp.Editing.VisualStudio/Coloring/UnusedSymbolClassifier.fs index 76ceee33..68412ed1 100644 --- a/src/FSharp.Editing.VisualStudio/Coloring/UnusedSymbolClassifier.fs +++ b/src/FSharp.Editing.VisualStudio/Coloring/UnusedSymbolClassifier.fs @@ -256,7 +256,7 @@ type UnusedSymbolClassifier let projectCheckedSubscription = // project check results needed for Unused Declarations only. if includeUnusedReferences() then - Some (vsLanguageService.RawChecker.ProjectChecked.Subscribe (fun projectFileName -> + Some (vsLanguageService.RawChecker.ProjectChecked.Subscribe (fun (projectFileName, _extraProjectInfo) -> let projects = singleSymbolsProjects.Value let projects = match projects |> List.partition (fun p -> p.Options.ProjectFileName = projectFileName) with diff --git a/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj b/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj index b4f673b6..bdb8c1ef 100644 --- a/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj +++ b/src/FSharp.Editing.VisualStudio/FSharp.Editing.VisualStudio.fsproj @@ -183,37 +183,27 @@ --> - - - ..\..\packages\Fantomas\lib\FantomasLib.dll - True - True - - - - ..\..\packages\FParsec\lib\net40-client\FParsec.dll - True - True - - - ..\..\packages\FParsec\lib\net40-client\FParsecCS.dll + + ..\..\packages\Fantomas\lib\FantomasLib.dll True True - + + + - ..\..\packages\FParsec\lib\portable-net45+netcore45+wpa81+wp8\FParsec.dll + ..\..\packages\FParsec\lib\net40-client\FParsec.dll True True - ..\..\packages\FParsec\lib\portable-net45+netcore45+wpa81+wp8\FParsecCS.dll + ..\..\packages\FParsec\lib\net40-client\FParsecCS.dll True True @@ -248,15 +238,6 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - @@ -266,54 +247,9 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - + ..\..\packages\FSharp.ViewModule.Core\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.ViewModule.dll @@ -335,21 +271,6 @@ - - - - ..\..\packages\FsPickler\lib\net35\FsPickler.dll - True - True - - - True - - - True - - - @@ -403,6 +324,9 @@ True + + True + True @@ -426,27 +350,7 @@ - - - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll - False - True - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - - - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -455,167 +359,9 @@ - - - - ..\..\packages\System.Collections.Immutable\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - True - - - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll - False - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll - False - True - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll - False - True - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll - False - True - - - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -624,233 +370,6 @@ - - - - ..\..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll - False - True - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll - False - True - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - diff --git a/src/FSharp.Editing/Common/Lexer.fs b/src/FSharp.Editing/Common/Lexer.fs index 7b1a9efa..a1b96afd 100644 --- a/src/FSharp.Editing/Common/Lexer.fs +++ b/src/FSharp.Editing/Common/Lexer.fs @@ -48,7 +48,7 @@ module Lexer = | Some _, newLexState -> loop lineTokenizer newLexState - let sourceTokenizer = SourceTokenizer(defines, Some "/tmp.fsx") + let sourceTokenizer = FSharpSourceTokenizer(defines, Some "/tmp.fsx") let lines = String.getLines source let lexState = ref 0L for line in lines do @@ -81,7 +81,7 @@ module Lexer = let defines = args |> Seq.choose (fun s -> if s.StartsWith "--define:" then Some s.[9..] else None) |> Seq.toList - let sourceTokenizer = SourceTokenizer(defines, Some "/tmp.fsx") + let sourceTokenizer = FSharpSourceTokenizer(defines, Some "/tmp.fsx") let lineTokenizer = sourceTokenizer.CreateLineTokenizer lineStr let rec loop lexState acc = match lineTokenizer.ScanToken lexState with diff --git a/src/FSharp.Editing/FSharp.Editing.fsproj b/src/FSharp.Editing/FSharp.Editing.fsproj index 19ca5465..02b7a2d0 100644 --- a/src/FSharp.Editing/FSharp.Editing.fsproj +++ b/src/FSharp.Editing/FSharp.Editing.fsproj @@ -121,15 +121,6 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - @@ -139,74 +130,9 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll - False - True - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -215,167 +141,9 @@ - - - - ..\..\packages\System.Collections.Immutable\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll - False - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll - False - True - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll - False - True - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll - False - True - - - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -384,232 +152,5 @@ - - - - ..\..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll - False - True - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll - False - True - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - \ No newline at end of file diff --git a/src/FSharp.Editing/ProjectSystem/LanguageService.fs b/src/FSharp.Editing/ProjectSystem/LanguageService.fs index 93796863..afbb6b6d 100644 --- a/src/FSharp.Editing/ProjectSystem/LanguageService.fs +++ b/src/FSharp.Editing/ProjectSystem/LanguageService.fs @@ -168,8 +168,13 @@ type LanguageService (?backgroundCompilation: bool, ?projectCacheSize: int, ?fil debug "[LanguageService] Change state for %s to `BeingChecked`" filePath debug "[LanguageService] Parse and typecheck source..." - return! x.ParseAndCheckFileInProject (fixedFilePath, 0, source, options, - IsResultObsolete (fun _ -> isResultObsolete filePath), null) + return! x.ParseAndCheckFileInProject ( + filename = fixedFilePath + , fileversion = 0 + , source = source + , options = options + , textSnapshotInfo = (*IsResultObsolete*) (fun _ -> isResultObsolete filePath) + ) finally if files.TryUpdate (filePath, Checked, BeingChecked) then debug "[LanguageService] %s: BeingChecked => Checked" filePath @@ -276,7 +281,9 @@ type LanguageService (?backgroundCompilation: bool, ?projectCacheSize: int, ?fil UseScriptResolutionRules = false LoadTime = fakeDateTimeRepresentingTimeLoaded projFilename UnresolvedReferences = None - ReferencedProjects = referencedProjects } + ReferencedProjects = referencedProjects + OriginalLoadReferences = List.empty + ExtraProjectInfo = None } debug "GetProjectCheckerOptions: ProjectFileName: %s, ProjectFileNames: %A, FSharpProjectOptions: %A, IsIncompleteTypeCheckEnvironment: %A, UseScriptResolutionRules: %A, ReferencedProjects: %A" opts.ProjectFileName opts.ProjectFileNames opts.OtherOptions opts.IsIncompleteTypeCheckEnvironment opts.UseScriptResolutionRules opts.ReferencedProjects opts diff --git a/src/FSharp.Editing/TaskListCommentExtractor.fs b/src/FSharp.Editing/TaskListCommentExtractor.fs index c1fae426..bac63d46 100644 --- a/src/FSharp.Editing/TaskListCommentExtractor.fs +++ b/src/FSharp.Editing/TaskListCommentExtractor.fs @@ -29,7 +29,7 @@ module private Utils = member x.Text(lines: string[], lineNumber: int) = lines.[lineNumber].Substring(x.LeftColumn, x.FullMatchedLength) - let sourceTok = SourceTokenizer([], Some "/tmp.fsx") + let sourceTok = FSharpSourceTokenizer([], Some "/tmp.fsx") let createNewLineTokenizer (lines: string[]) (lineNumber: int) = let nextLine = diff --git a/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj b/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj index 18f20cf5..b69ffb73 100644 --- a/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj +++ b/src/FSharpVSPowerTools/FSharpVSPowerTools.csproj @@ -261,13 +261,17 @@ --> - - - ..\..\packages\Fantomas\lib\FantomasLib.dll - True - True - - + + + + + ..\..\packages\Fantomas\lib\FantomasLib.dll + True + True + + + + @@ -285,15 +289,6 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - @@ -303,74 +298,9 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll - False - True - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -379,167 +309,9 @@ - - - - ..\..\packages\System.Collections.Immutable\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll - False - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll - False - True - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll - False - True - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll - False - True - - - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -548,233 +320,6 @@ - - - - ..\..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll - False - True - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll - False - True - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - diff --git a/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj b/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj index 572c1c1f..07099398 100644 --- a/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj +++ b/tests/FSharp.Editing.Tests/FSharp.Editing.Tests.fsproj @@ -128,15 +128,6 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - @@ -146,51 +137,6 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - @@ -202,33 +148,6 @@ - - - - ..\..\packages\FSharp.Data\lib\portable-net45+netcore45\FSharp.Data.dll - True - True - - - - - - - ..\..\packages\FSharp.Data\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Data.dll - True - True - - - - - - - ..\..\packages\FSharp.Data\lib\portable-net45+sl50+netcore45\FSharp.Data.dll - True - True - - - @@ -267,27 +186,7 @@ - - - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll - False - True - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - - - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -296,167 +195,9 @@ - - - - ..\..\packages\System.Collections.Immutable\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - True - - - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll - False - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll - False - True - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll - False - True - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll - False - True - - - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -465,244 +206,6 @@ - - - - ..\..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll - False - True - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll - False - True - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - - - - - - - ..\..\packages\Zlib.Portable\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll - True - True - - - diff --git a/tests/FSharp.Editing.Tests/GoToDefinitionTests.fs b/tests/FSharp.Editing.Tests/GoToDefinitionTests.fs index a2e2a2ae..ff3f2c72 100644 --- a/tests/FSharp.Editing.Tests/GoToDefinitionTests.fs +++ b/tests/FSharp.Editing.Tests/GoToDefinitionTests.fs @@ -107,7 +107,9 @@ let validateSignature source signature = IsIncompleteTypeCheckEnvironment = false UseScriptResolutionRules = true LoadTime = DateTime.UtcNow - UnresolvedReferences = None } + UnresolvedReferences = None + OriginalLoadReferences = List.empty + ExtraProjectInfo = None } let results = languageService.ParseAndCheckFileInProject(opts, signatureFile, signature, AllowStaleResults.No) |> Async.RunSynchronously diff --git a/tests/FSharp.Editing.Tests/TestHelpers.fs b/tests/FSharp.Editing.Tests/TestHelpers.fs index 4acf1df7..9c0f23d0 100644 --- a/tests/FSharp.Editing.Tests/TestHelpers.fs +++ b/tests/FSharp.Editing.Tests/TestHelpers.fs @@ -131,4 +131,6 @@ module LanguageServiceTestHelper = IsIncompleteTypeCheckEnvironment = false UseScriptResolutionRules = true LoadTime = DateTime.UtcNow - UnresolvedReferences = None } + UnresolvedReferences = None + OriginalLoadReferences = List.empty + ExtraProjectInfo = None } diff --git a/tests/FSharp.Editing.Tests/app.config b/tests/FSharp.Editing.Tests/app.config index 8a1c7f19..572f3ac3 100644 --- a/tests/FSharp.Editing.Tests/app.config +++ b/tests/FSharp.Editing.Tests/app.config @@ -11,7 +11,7 @@ True - + diff --git a/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj b/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj index cbd1d4a5..b4fe7128 100644 --- a/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj +++ b/tests/FSharp.Editing.VisualStudio.Tests/FSharp.Editing.VisualStudio.Tests.fsproj @@ -225,20 +225,6 @@ - - - - ..\..\packages\FParsec\lib\portable-net45+netcore45+wpa81+wp8\FParsec.dll - True - True - - - ..\..\packages\FParsec\lib\portable-net45+netcore45+wpa81+wp8\FParsecCS.dll - True - True - - - @@ -268,15 +254,6 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - @@ -286,54 +263,9 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - + ..\..\packages\FSharp.ViewModule.Core\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.ViewModule.dll @@ -355,27 +287,7 @@ - - - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.dll - False - True - - - - - - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - - - + ..\..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -384,167 +296,9 @@ - - - - ..\..\packages\System.Collections.Immutable\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - True - - - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.dll - False - True - - - - - - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.dll - False - True - - - - - - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.dll - False - True - - - - - - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.dll - False - True - - - - - - - ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll - False - True - - - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False - True - - - - - - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - + ..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll @@ -553,233 +307,6 @@ - - - - ..\..\packages\System.Reflection.Metadata\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.dll - False - True - - - - - - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.dll - False - True - - - - - - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.dll - False - True - - - - - - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.dll - False - True - - - - - - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - diff --git a/tests/FSharp.Editing.VisualStudio.Tests/app.config b/tests/FSharp.Editing.VisualStudio.Tests/app.config index fd413fe3..db82a7bf 100644 --- a/tests/FSharp.Editing.VisualStudio.Tests/app.config +++ b/tests/FSharp.Editing.VisualStudio.Tests/app.config @@ -48,7 +48,7 @@ True - +