diff --git a/VisualFSharp.sln b/VisualFSharp.sln
index 7ab8602b3a3f54f79338863f607947fab9f5144a..282b4a2b8cb1272c8b895e732aea77c0f4dbcfb2 100644
--- a/VisualFSharp.sln
+++ b/VisualFSharp.sln
@@ -14,7 +14,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Server.Shar
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Core", "src\fsharp\FSharp.Core\FSharp.Core.fsproj", "{DED3BBD7-53F4-428A-8C9F-27968E768605}"
EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.LanguageService", "vsintegration\src\FSharp.LanguageService\FSharp.LanguageService.fsproj", "{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.LanguageService", "vsintegration\src\FSharp.LanguageService\FSharp.LanguageService.fsproj", "{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharp.LanguageService.Base", "vsintegration\src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj", "{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}"
EndProject
@@ -202,10 +202,10 @@ Global
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Debug|x86.ActiveCfg = Debug|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Debug|x86.Build.0 = Debug|Any CPU
- {EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
- {EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|Any CPU.Build.0 = Proto|Any CPU
- {EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|x86.ActiveCfg = Proto|Any CPU
- {EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|x86.Build.0 = Proto|Any CPU
+ {EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|Any CPU.ActiveCfg = Release|Any CPU
+ {EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|Any CPU.Build.0 = Release|Any CPU
+ {EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|x86.ActiveCfg = Release|Any CPU
+ {EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Proto|x86.Build.0 = Release|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Release|Any CPU.Build.0 = Release|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}.Release|x86.ActiveCfg = Release|Any CPU
diff --git a/build/targets/PackageVersions.props b/build/targets/PackageVersions.props
index e1967c63a25322af20878a44a3a04999ae22a7ef..ea69e1331998da1c2a20016ac6be4753a6f19e87 100644
--- a/build/targets/PackageVersions.props
+++ b/build/targets/PackageVersions.props
@@ -12,25 +12,28 @@
2.3.0-beta2-61719-01
- 8.0.1
8.0.1
15.0.26201-alpha
+ 1.1.4322
15.0.26201
15.0.26201
15.0.26201
15.0.26201
8.0.50727
+ 15.0.26201
15.0.26201
+ 10.0.30319
10.0.30319
11.0.50727
11.0.61030
- 7.10.6070
- 8.0.50727
15.1.192
7.0.4
+ 8.0.4
+ 7.0.4
1.0.30
+ 1.0.1
10.0.2
0.2.0-beta-000081
diff --git a/vsintegration/FSharp.Directory.Build.props b/vsintegration/FSharp.Directory.Build.props
index f0b6ff9fa927ce4b60db86a34f3fe424ebcf1fca..fa9f1e6747f43ca3f6b77c8bd3b870be9f75de9d 100644
--- a/vsintegration/FSharp.Directory.Build.props
+++ b/vsintegration/FSharp.Directory.Build.props
@@ -6,7 +6,4 @@
true
-
-
diff --git a/vsintegration/FSharp.Directory.Build.targets b/vsintegration/FSharp.Directory.Build.targets
index 5d99b165f398503afcd4151696b8c6af2683d3c9..b8d93f91d91da3e86a64cb436f1681cef00098cb 100644
--- a/vsintegration/FSharp.Directory.Build.targets
+++ b/vsintegration/FSharp.Directory.Build.targets
@@ -2,6 +2,8 @@
+
+
diff --git a/vsintegration/src/FSharp.LanguageService/Directory.Build.props b/vsintegration/src/FSharp.LanguageService/Directory.Build.props
new file mode 100644
index 0000000000000000000000000000000000000000..bb8eac309b1ad0dfc3418caf301e1f06803c82ae
--- /dev/null
+++ b/vsintegration/src/FSharp.LanguageService/Directory.Build.props
@@ -0,0 +1,3 @@
+
+
+
diff --git a/vsintegration/src/FSharp.LanguageService/Directory.Build.targets b/vsintegration/src/FSharp.LanguageService/Directory.Build.targets
new file mode 100644
index 0000000000000000000000000000000000000000..ccd47cc0a9aa21567cd1adbf7d7054bf309679f1
--- /dev/null
+++ b/vsintegration/src/FSharp.LanguageService/Directory.Build.targets
@@ -0,0 +1,3 @@
+
+
+
diff --git a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
index 72cb1c12636df96849958237c88f6ff7cff51096..f69eadc543815f135f5b2e121d2d5f89bf5ffc8d 100644
--- a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
+++ b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
@@ -1,37 +1,26 @@
-
+
+
- $(MSBuildProjectDirectory)\..\..\..\src
- true
- FSharp
- v4.6
- true
- true
- false
- false
- true
- true
- true
- true
-
-
- Debug
- AnyCPU
- 2.0
- {EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}
+ net46
Library
- FSharp.LanguageService
- true
+ true
+ false
$(NoWarn);75
- LIBRARY
- false
+ true
$(OtherFlags) --warnon:1182 --subsystemversion:6.00
-
-
-
-
+
+
+
+ net462
+
+
@@ -44,9 +33,10 @@
+
-
-
+
+
true
Microsoft.VisualStudio.FSharp.LanguageService.Strings
@@ -63,179 +53,50 @@
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll
-
-
- $(FSharpSourcesRoot)\..\packages\EnvDTE.8.0.1\lib\net10\EnvDTE.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\EnvDTE80.8.0.1\lib\net10\EnvDTE80.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\VSSDK.VSLangProj.7.0.4\lib\net20\VSLangProj.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\VSSDK.VSLangProj.8.8.0.4\lib\net20\VSLangProj80.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.ProjectAggregator.8.0.50727\lib\net45\Microsoft.VisualStudio.ProjectAggregator.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Designer.Interfaces.1.1.4322\lib\microsoft.visualstudio.designer.interfaces.dll
-
-
- $(FSharpSourcesRoot)\..\packages\VSSDK.VSHelp.7.0.4\lib\net20\Microsoft.VisualStudio.VSHelp.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Framework.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.$(MicrosoftVisualStudioThreadingVersion)\lib\net45\Microsoft.VisualStudio.Threading.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Editor.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Editor.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.UI.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Data.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.Data.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Logic.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.Logic.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.CoreUtility.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.CoreUtility.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Utilities.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Utilities.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Design.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Design.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).$(RoslynVSPackagesVersion)\lib\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.ComponentModelHost.15.0.26201-alpha\lib\net46\Microsoft.VisualStudio.ComponentModelHost.dll
-
-
- {DED3BBD7-53F4-428A-8C9F-27968E768605}
- FSharp.Core
- True
-
-
- FSharp.VS.FSI
- {991dcf75-c2eb-42b6-9a0d-aa1d2409d519}
- True
-
-
- FSharp.LanguageService.Base
- {1c5c163c-37ea-4a3c-8ccc-0d34b74bf8ef}
- True
-
-
- {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}
- FSharp.Compiler.Private
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.CodeAnalysis.Common.$(RoslynVersion)\lib\netstandard1.3\Microsoft.CodeAnalysis.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.CodeAnalysis.EditorFeatures.$(RoslynVersion)\lib\net46\Microsoft.CodeAnalysis.EditorFeatures.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.CodeAnalysis.EditorFeatures.Text.$(RoslynVersion)\lib\net46\Microsoft.CodeAnalysis.EditorFeatures.Text.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.CodeAnalysis.Features.$(RoslynVersion)\lib\netstandard1.3\Microsoft.CodeAnalysis.Features.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.$(RoslynVersion)\lib\netstandard1.3\Microsoft.CodeAnalysis.Workspaces.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.LanguageServices.$(RoslynVersion)\lib\net46\Microsoft.VisualStudio.LanguageServices.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.Composition.1.0.30\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll
- True
-
-
- $(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
- True
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
+