converge compiler DLLs

222818fc · Don Syme · 16de2e1d · 222818fc · 222818fc · 222818fc
50 changed file
--- a/VisualFSharp.sln
+++ b/VisualFSharp.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler", "src\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service", "src\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.VS.FSI", "vsintegration\src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj", "{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}"
 	ProjectSection(ProjectDependencies) = postProject

--- a/build-everything.proj
+++ b/build-everything.proj
@@ -9,7 +9,7 @@

  <ItemGroup Condition="'$(BUILD_NET40)'=='1'">
    <ProjectsWithNet40 Include="src/fsharp/FSharp.Build/FSharp.Build.fsproj" />
-    <ProjectsWithNet40 Include="src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj" />
+    <ProjectsWithNet40 Include="src/fsharp/FSharp.Compiler.Service.Internal/FSharp.Compiler.Service.Internal.fsproj" />
    <ProjectsWithNet40 Include="src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj"/>
    <ProjectsWithNet40 Include="src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj" />
    <ProjectsWithNet40 Include="src/fsharp/Fsc/Fsc.fsproj" />
@@ -20,7 +20,7 @@
  <ItemGroup Condition="'$(BUILD_CORECLR)'=='1'">
    <ProjectsWithCoreClr Include="src/fsharp/FSharp.Core/FSharp.Core.fsproj" />
    <ProjectsWithCoreClr Include="src/fsharp/FSharp.Build/FSharp.Build.fsproj" />
-    <ProjectsWithCoreClr Include="src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj" />
+    <ProjectsWithCoreClr Include="src/fsharp/FSharp.Compiler.Service.Internal/FSharp.Compiler.Service.Internal.fsproj" />
    <ProjectsWithCoreClr Include="src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj" />
    <ProjectsWithCoreClr Include="src/fsharp/Fsc/Fsc.fsproj" />
    <ProjectsWithCoreClr Include="src/fsharp/fsi/Fsi.fsproj" />

--- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.fsproj
+++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.fsproj
@@ -46,7 +46,7 @@
    <DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
    <DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION_CORECLR</DefineConstants>
    <DefineConstants>$(DefineConstants);FSI_TODO_NETCORE</DefineConstants>
-    <DefineConstants>$(DefineConstants);RESHAPED_MSBUILD</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_RESHAPED_MSBUILD</DefineConstants>
    <DefineConstants>$(DefineConstants);SIGNED</DefineConstants>
    <DefineConstants>$(DefineConstants);STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY</DefineConstants>
    <NoWarn>$(NoWarn);44;69;65;54;61;75;62;9;2003;</NoWarn>

--- a/mono/FSharp.Compiler/Makefile
+++ b/mono/FSharp.Compiler/Makefile
-NAME=FSharp.Compiler
+NAME=FSharp.Compiler.Service.Internal
 ASSEMBLY = $(NAME).dll
 TOKEN=$(SIGN_TOKEN)


--- a/mono/config.make.in
+++ b/mono/config.make.in
@@ -139,7 +139,7 @@ install-sdk-lib:
 	    echo "Signing $(outdir)$(ASSEMBLY) with Mono key"; \
 	    $(monobindir)/sn -q -R $(outdir)$(ASSEMBLY) $(topdir)mono/mono.snk; \
 	fi
-	@if test x-$(NAME) = x-FSharp.Compiler; then \
+	@if test x-$(NAME) = x-FSharp.Compiler.Service.Internal; then \
 	    echo "Installing extra dependency System.Collections.Immutable.dll to $(DESTDIR)$(monodir)/fsharp/"; \
 	    $(INSTALL_LIB) $(outdir)System.Collections.Immutable.dll $(DESTDIR)$(monodir)/fsharp/; \
 	    echo "Installing extra dependency System.Reflection.Metadata.dll to $(DESTDIR)$(monodir)/fsharp/"; \

--- a/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs
+++ b/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs
@@ -6,7 +6,7 @@
    <ComponentGroup Id="Compiler_LangPack">
      <ComponentRef Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" />
      <ComponentRef Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" />
-      <ComponentRef Id="Compiler_LangPack_FSharp.Compiler.Service.dll_$(var.LocaleCode)" />
+      <ComponentRef Id="Compiler_LangPack_FSharp.Compiler.Service.Internal.dll_$(var.LocaleCode)" />
      <ComponentRef Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" />
      <ComponentRef Id="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" />
      <ComponentRef Id="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" />
@@ -21,8 +21,8 @@
        <File Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Build.resources.dll" KeyPath="yes" />
      </Component>

-      <Component Id="Compiler_LangPack_FSharp.Compiler.Service.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Compiler.Service.dll_$(var.LocaleCode), $(var.LocaleCode)))">
-        <File Id="Compiler_LangPack_FSharp.Compiler.Service.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Compiler.resources.dll" KeyPath="yes" />
+      <Component Id="Compiler_LangPack_FSharp.Compiler.Service.Internal.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Compiler.Service.Internal.dll_$(var.LocaleCode), $(var.LocaleCode)))">
+        <File Id="Compiler_LangPack_FSharp.Compiler.Service.Internal.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Compiler.Service.Internal.resources.dll" KeyPath="yes" />
      </Component>

      <Component Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_fsc.exe_$(var.LocaleCode), $(var.LocaleCode)))">

--- a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
+++ b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
@@ -6,7 +6,7 @@
    <ComponentGroup Id="Compiler_Redist">
      <ComponentRef Id="Compiler_Redist_FSharp.Core.dll" />
      <ComponentRef Id="Compiler_Redist_FSharp.Build.dll" />
-      <ComponentRef Id="Compiler_Redist_FSharp.Compiler.Service.dll" />
+      <ComponentRef Id="Compiler_Redist_FSharp.Compiler.Service.Internal.dll" />
      <ComponentRef Id="Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll" />      
      <ComponentRef Id="Compiler_Redist_FSharp.Data.TypeProviders.dll" />      
      <ComponentRef Id="Compiler_Redist_fsc.exe" />
@@ -65,9 +65,9 @@
        </File>
      </Component>

-      <Component Id="Compiler_Redist_FSharp.Compiler.Service.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.Service.dll, $(var.LocaleCode)))">
-        <File Id="Compiler_Redist_FSharp.Compiler.Service.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Service.dll" KeyPath="yes">
-          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Service.Native.dll" Priority="0" Dependencies="no" Platform="all" AssemblyApplication="Compiler_Redist_fsc.exe" />
+      <Component Id="Compiler_Redist_FSharp.Compiler.Service.Internal.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.Service.Internal.dll, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_FSharp.Compiler.Service.Internal.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Service.Internal,dll" KeyPath="yes">
+          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Service.Internal.Native.dll" Priority="0" Dependencies="no" Platform="all" AssemblyApplication="Compiler_Redist_fsc.exe" />
        </File>
      </Component>


--- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr
+++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr
@@ -8,7 +8,7 @@ folder "InstallDir:Common7\IDE\PublicAssemblies\$(LocaleParentCulture)"
  file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Core.resources.dll" vs.file.ngen=yes

 folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\$(LocaleParentCulture)"
-  file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Compiler.resources.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Compiler.Service.Internal.resources.dll" vs.file.ngen=yes
  file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Core.resources.dll" vs.file.ngen=yes
  file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.LanguageService.Base.resources.dll" vs.file.ngen=yes
  file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.LanguageService.resources.dll" vs.file.ngen=yes

--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@ -193,6 +193,7 @@
    <DefineConstants>$(DefineConstants);FX_RESHAPED_GLOBALIZATION</DefineConstants>
    <DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
    <DefineConstants>$(DefineConstants);FX_JITTRACKING_ISSUE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
    <DefineConstants Condition=" '$(FX_NO_LOADER)' != 'true' ">$(DefineConstants);FX_RESHAPED_REFLECTION_CORECLR</DefineConstants>
    <DefineConstants>$(DefineConstants);FX_RESHAPED_MSBUILD</DefineConstants>
    <DefineConstants>$(DefineConstants);FSI_TODO_NETCORE</DefineConstants>

--- a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.Internal.dll.fs
+++ b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.Internal.dll.fs
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+namespace Microsoft.FSharp
+open System.Reflection
+open System.Runtime.InteropServices
+
+[<assembly:AssemblyDescription("FSharp.Compiler.Service.Internal.dll")>]
+[<assembly:AssemblyCompany("Microsoft Corporation")>]
+[<assembly:AssemblyTitle("FSharp.Compiler.Service.Internal.dll")>]
+[<assembly:AssemblyCopyright("\169 Microsoft Corporation.  Apache 2.0 License.")>]
+[<assembly:AssemblyProduct("Microsoft\174 F#")>]
+[<assembly:ComVisible(false)>]
+
+#if NO_STRONG_NAMES
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsc")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsiAnyCpu")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.LanguageService")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.ProjectSystem.Base")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.ProjectSystem.FSharp")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.ProjectSystem.PropertyPages")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.Interactive.Settings")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.Server.Shared")>]
+
+// Note: internals visible to unit test DLLs in Retail (and all) builds.
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Test")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.Unittests")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Salsa")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Unittests")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsc-proto")>]
+#endif
+#if STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY
+
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsc, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsiAnyCpu, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.LanguageService, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.LanguageService.Base, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.ProjectSystem.Base, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.ProjectSystem.FSharp, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.ProjectSystem.PropertyPages, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.Interactive.Settings, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.Server.Shared, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Salsa, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsc-proto, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+#endif
+#if STRONG_NAME_FSHARP_COMPILER_WITH_TEST_KEY
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsc, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsiAnyCpu, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.LanguageService, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.LanguageService.Base, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.ProjectSystem.Base, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.ProjectSystem.FSharp, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.ProjectSystem.PropertyPages, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.Interactive.Settings, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.Server.Shared, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Salsa, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.Compiler.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010077d32e043d184cf8cebf177201ec6fad091581a3a639a0534f1c4ebb3ab847a6b6636990224a04cf4bd1aec51ecec44cf0c8922eb5bb2ee65ec3fb9baa87e141042c96ce414f98af33508c7e24dab5b068aa802f6693881537ee0efcb5d3f1c9aaf8215ac42e92ba9a5a02574d6890d07464cb2f338b043b1c4ffe98efe069ee")>]
+#endif
+do()
--- a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.dll.fs
+++ b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.dll.fs
@@ -4,9 +4,9 @@ namespace Microsoft.FSharp
 open System.Reflection
 open System.Runtime.InteropServices

-[<assembly:AssemblyDescription("FSharp.Compiler.Service.dll")>]
+[<assembly:AssemblyDescription("FSharp.Compiler.Service.Internal.dll")>]
 [<assembly:AssemblyCompany("Microsoft Corporation")>]
-[<assembly:AssemblyTitle("FSharp.Compiler.Service.dll")>]
+[<assembly:AssemblyTitle("FSharp.Compiler.Service.Internal.dll")>]
 [<assembly:AssemblyCopyright("\169 Microsoft Corporation.  Apache 2.0 License.")>]
 [<assembly:AssemblyProduct("Microsoft\174 F#")>]
 [<assembly:ComVisible(false)>]

--- a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec
+++ b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec
@@ -41,7 +41,7 @@
    </metadata>
    <files>
        <file src="fsc.exe"                           target="lib/netstandard1.6" />
-        <file src="FSharp.Compiler.Service.dll"       target="lib/netstandard1.6" />
+        <file src="FSharp.Compiler.Service.Internal.dll"       target="lib/netstandard1.6" />
        <file src="default.win32manifest"             target="runtimes/any/native/" />
        <file src="FSharp.Build.dll"                  target="lib/netstandard1.6" />
        <file src="Microsoft.FSharp.targets"          target="runtimes/any/native/" />

--- a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Interactive.netcore.nuspec
+++ b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Interactive.netcore.nuspec
@@ -40,7 +40,7 @@
        </dependencies>
    </metadata>
    <files>
-        <file src="FSharp.Compiler.Service.dll"  target="lib/netstandard1.6" />
+        <file src="FSharp.Compiler.Service.Internal.dll"  target="lib/netstandard1.6" />
        <file src="fsi.exe"                      target="lib/netstandard1.6" />
        <file src="FSharp.Compiler.Interactive.Settings.dll" target="lib/netstandard1.6" />
    </files>

--- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
+++ b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
@@ -9,7 +9,7 @@
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <OutputType>Library</OutputType>
-    <AssemblyName>FSharp.Compiler.Service</AssemblyName>
+    <AssemblyName>FSharp.Compiler.Service.Internal</AssemblyName>
    <DefineConstants>EXTENSIONTYPING;$(DefineConstants)</DefineConstants>
    <DefineConstants>COMPILER;$(DefineConstants)</DefineConstants>
    <NoWarn>$(NoWarn);62;9</NoWarn>
@@ -61,9 +61,9 @@
      <HasLceComments>false</HasLceComments>
      <InProject>false</InProject>
    </FilesToLocalize>
-    <PackageNuspec Include="FSharp.Compiler.netcore.nuspec" Condition="'$(TargetFramework)' == 'coreclr'" />
-    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Service.dll.fs">
-      <Link>assemblyinfo.FSharp.Compiler.Service.dll.fs</Link>
+    <PackageNuspec Include="FSharp.Compiler.Service.Internal.netcore.nuspec" Condition="'$(TargetFramework)' == 'coreclr'" />
+    <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Service.Internal.dll.fs">
+      <Link>assemblyinfo.FSharp.Compiler.Service.Internal.dll.fs</Link>
    </Compile>
    <FsSrGen Include="..\FSComp.txt">
      <Link>FSComp.txt</Link>

--- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.nuspec
+++ b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.nuspec
@@ -38,6 +38,6 @@
        </dependencies>
    </metadata>
    <files>
-        <file src="FSharp.Compiler.Service.dll"     target="lib/netstandard1.6" />
+        <file src="FSharp.Compiler.Service.Internal.dll"     target="lib/netstandard1.6" />
    </files>
 </package>
--- a/src/fsharp/FSharp.Compiler.Service/InternalsVisibleTo.fs
+++ b/src/fsharp/FSharp.Compiler.Service/InternalsVisibleTo.fs
--- a/src/fsharp/FSharp.Compiler.Service/project.json
+++ b/src/fsharp/FSharp.Compiler.Service/project.json
--- a/src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj
+++ b/src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj
@@ -60,8 +60,8 @@
    <Compile Include="EditDistance.fs" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
-      <Name>FSharp.Compiler.Service</Name>
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
+      <Name>FSharp.Compiler.Service.Internal</Name>
      <Project>{2e4d67b4-522d-4cf7-97e4-ba940f0b18f3}</Project>
    </ProjectReference>
    <ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj">

--- a/src/fsharp/Fsc/Fsc.fsproj
+++ b/src/fsharp/Fsc/Fsc.fsproj
@@ -58,9 +58,9 @@
    <Reference Include="System" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+    <ProjectReference Include="..\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
      <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
-      <Name>FSharp.Compiler.Service</Name>
+      <Name>FSharp.Compiler.Service.Internal</Name>
    </ProjectReference>
    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
      <Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>

--- a/src/fsharp/SimulatedMSBuildReferenceResolver.fs
+++ b/src/fsharp/SimulatedMSBuildReferenceResolver.fs
@@ -18,7 +18,7 @@ let internal SimulatedMSBuildResolver =
    { new Resolver with 
        member __.HighestInstalledNetFrameworkVersion() = "v4.5"
        member __.DotNetFrameworkReferenceAssembliesRootDirectory = 
-#if RESHAPED_MSBUILD
+#if FX_RESHAPED_MSBUILD
            ""
 #else
            if System.Environment.OSVersion.Platform = System.PlatformID.Win32NT then 
@@ -34,7 +34,7 @@ let internal SimulatedMSBuildResolver =
        member __.Resolve(resolutionEnvironment, references, targetFrameworkVersion, targetFrameworkDirectories, targetProcessorArchitecture,                
                            fsharpCoreDir, explicitIncludeDirs, implicitIncludeDir, logMessage, logWarningOrError) =

-#if !RESHAPED_MSBUILD
+#if !FX_RESHAPED_MSBUILD
            let registrySearchPaths() = 
              [ let registryKey = @"Software\Microsoft\.NetFramework";
                use key = Registry.LocalMachine.OpenSubKey(registryKey)
@@ -69,7 +69,7 @@ let internal SimulatedMSBuildResolver =
                yield! explicitIncludeDirs 
                yield fsharpCoreDir
                yield implicitIncludeDir 
-#if !RESHAPED_MSBUILD
+#if !FX_RESHAPED_MSBUILD
                if System.Environment.OSVersion.Platform = System.PlatformID.Win32NT then 
                    yield! registrySearchPaths() 
 #endif
@@ -90,7 +90,7 @@ let internal SimulatedMSBuildResolver =
                            success r
                with e -> logWarningOrError false "SR001" (e.ToString())

-#if !RESHAPED_MSBUILD
+#if !FX_RESHAPED_MSBUILD
                // For this one we need to get the version search exactly right, without doing a load
                try 
                    if not found && r.StartsWith("FSharp.Core, Version=")  && Environment.OSVersion.Platform = PlatformID.Win32NT then 
@@ -121,7 +121,7 @@ let internal SimulatedMSBuildResolver =
                            success trialPath
                  with e -> logWarningOrError false "SR001" (e.ToString())

-#if !RESHAPED_MSBUILD
+#if !FX_RESHAPED_MSBUILD
                try 
                    // Seach the GAC on Windows
                    if not found && not isFileName && Environment.OSVersion.Platform = PlatformID.Win32NT then 
@@ -166,7 +166,7 @@ let internal SimulatedMSBuildResolver =
            results.ToArray() }

 let internal GetBestAvailableResolver() = 
-#if !RESHAPED_MSBUILD
+#if !FX_RESHAPED_MSBUILD
    let tryMSBuild v = 
        // Detect if MSBuild is on the machine, if so use the resolver from there
        let mb = try Assembly.Load(sprintf "Microsoft.Build.Framework, Version=%s.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" v) |> Option.ofObj with _ -> None

--- a/src/fsharp/fscmain.fs
+++ b/src/fsharp/fscmain.fs
@@ -23,7 +23,7 @@ open Microsoft.FSharp.Core.ReflectionAdapters
 #endif

 #if !FX_NO_DEFAULT_DEPENDENCY_TYPE
-[<Dependency("FSharp.Compiler.Service",LoadHint.Always)>] 
+[<Dependency("FSharp.Compiler.Service.Internal",LoadHint.Always)>] 
 #endif
 do ()


--- a/src/fsharp/fsi/Fsi.fsproj
+++ b/src/fsharp/fsi/Fsi.fsproj
@@ -65,9 +65,9 @@
    <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+    <ProjectReference Include="..\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
      <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
-      <Name>FSharp.Compiler.Service</Name>
+      <Name>FSharp.Compiler.Service.Internal</Name>
    </ProjectReference>
    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >
      <Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>

--- a/src/fsharp/fsi/fsimain.fs
+++ b/src/fsharp/fsi/fsimain.fs
@@ -38,7 +38,7 @@ open Microsoft.FSharp.Core.ReflectionAdapters

 // Hardbinding dependencies should we NGEN fsi.exe
 #if !FX_NO_DEFAULT_DEPENDENCY_TYPE
-[<Dependency("FSharp.Compiler.Service",LoadHint.Always)>] do ()
+[<Dependency("FSharp.Compiler.Service.Internal",LoadHint.Always)>] do ()
 [<Dependency("FSharp.Core",LoadHint.Always)>] do ()
 #endif


--- a/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
+++ b/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
@@ -61,9 +61,9 @@
      <Project>{d5870cf0-ed51-4cbc-b3d7-6f56da84ac06}</Project>
      <Private>True</Private>
    </ProjectReference>
-    <ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+    <ProjectReference Include="..\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
      <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
-      <Name>FSharp.Compiler.Service</Name>
+      <Name>FSharp.Compiler.Service.Internal</Name>
    </ProjectReference>
    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >
      <Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>

--- a/src/fsharp/vs/Reactor.fsi
+++ b/src/fsharp/vs/Reactor.fsi
@@ -46,6 +46,6 @@ type internal Reactor =
    /// The timespan in milliseconds before background work begins after the operations queue is empty
    member PauseBeforeBackgroundWork : int with get, set

-    /// Get the reactor for FSharp.Compiler.Service.dll
+    /// Get the reactor 
    static member Singleton : Reactor
  
--- a/src/fsharp/vs/ServiceInterfaceStubGenerator.fs
+++ b/src/fsharp/vs/ServiceInterfaceStubGenerator.fs
@@ -11,6 +11,7 @@ open Microsoft.FSharp.Compiler.Range
 open Microsoft.FSharp.Compiler.SourceCodeServices
 open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library 
        
+#if !FX_NO_INDENTED_TEXT_WRITER
 [<AutoOpen>]
 module internal CodeGenerationUtils =
    open System.IO
@@ -909,3 +910,4 @@ module internal InterfaceStubGenerator =
            None
        | ParsedInput.ImplFile input -> 
            walkImplFileInput input
+#endif
--- a/src/fsharp/vs/ServiceInterfaceStubGenerator.fsi
+++ b/src/fsharp/vs/ServiceInterfaceStubGenerator.fsi
@@ -11,6 +11,7 @@ open Microsoft.FSharp.Compiler.Range
 open Microsoft.FSharp.Compiler.SourceCodeServices
 open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library 
        
+#if !FX_NO_INDENTED_TEXT_WRITER
 /// Capture information about an interface in ASTs
 [<RequireQualifiedAccess; NoEquality; NoComparison>]
 type internal InterfaceData =
@@ -42,3 +43,4 @@ module internal InterfaceStubGenerator =

    /// Find corresponding interface declaration at a given position
    val tryFindInterfaceDeclaration: pos -> parsedInput: ParsedInput -> InterfaceData option
+#endif
--- a/src/fsharp/vs/service.fs
+++ b/src/fsharp/vs/service.fs
@@ -10,6 +10,7 @@ open System.Collections.Generic
 open System.Collections.Concurrent
 open System.Diagnostics
 open System.IO
+open System.Reflection
 open System.Text

 open Microsoft.FSharp.Core.Printf
@@ -44,6 +45,10 @@ open Internal.Utilities
 open Internal.Utilities.Collections
 open Microsoft.FSharp.Compiler.Layout.TaggedTextOps

+#if FX_RESHAPED_REFLECTION
+open Microsoft.FSharp.Core.ReflectionAdapters
+#endif
+
 type internal Layout = StructuredFormat.Layout

 [<AutoOpen>]

--- a/src/utils/sformat.fs
+++ b/src/utils/sformat.fs
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.

 // This file is compiled 3(!) times in the codebase
-//    - as the internal implementation of printf '%A' formatting 
-//           defines: FSHARP_CORE
-//    - as the internal implementation of structured formatting in FSharp.Compiler.Service.dll 
+//    - as the internal implementation of printf '%A' formatting in FSharp.Core
+//    - as the internal implementation of structured formatting in the compiler and F# Interactive
 //           defines: COMPILER 
-//           NOTE: this implementation is used by fsi.exe. This is very important.
 //
 // The one implementation file is used because we very much want to keep the implementations of
 // structured formatting the same for fsi.exe and '%A' printing. However fsi.exe may have
@@ -17,17 +15,10 @@
 #nowarn "52" // The value has been copied to ensure the original is not mutated by this operation

 #if COMPILER
-// fsc-proto.exe:
-// FSharp.Compiler.Service.dll:
 namespace Internal.Utilities.StructuredFormat
 #else
-#if FSHARP_CORE 
 // FSharp.Core.dll:
 namespace Microsoft.FSharp.Text.StructuredPrintfImpl
-#else
-// Powerpack: 
-namespace Microsoft.FSharp.Text.StructuredFormat
-#endif
 #endif

    // Breakable block layout implementation.
@@ -316,12 +307,9 @@ namespace Microsoft.FSharp.Text.StructuredFormat
    type FormatOptions =
        { FloatingPointFormat: string;
          AttributeProcessor: (string -> (string * string) list -> bool -> unit);
-#if FSHARP_CORE
-#else
-#if COMPILER    // FSharp.Compiler.Service.dll: This is the PrintIntercepts extensibility point currently revealed by fsi.exe's AddPrinter
+#if COMPILER // This is the PrintIntercepts extensibility point currently revealed by fsi.exe's AddPrinter
          PrintIntercepts: (IEnvironment -> obj -> Layout option) list;
          StringLimit : int;
-#endif
 #endif
          FormatProvider: System.IFormatProvider;
 #if FX_RESHAPED_REFLECTION
@@ -337,12 +325,9 @@ namespace Microsoft.FSharp.Text.StructuredFormat
          ShowIEnumerable: bool; }
        static member Default =
            { FormatProvider = (System.Globalization.CultureInfo.InvariantCulture :> System.IFormatProvider);
-#if FSHARP_CORE
-#else
-#if COMPILER    // FSharp.Compiler.Service.dll: This is the PrintIntercepts extensibility point currently revealed by fsi.exe's AddPrinter
+#if COMPILER    // This is the PrintIntercepts extensibility point currently revealed by fsi.exe's AddPrinter
              PrintIntercepts = [];
              StringLimit = System.Int32.MaxValue;
-#endif
 #endif
              AttributeProcessor= (fun _ _ _ -> ());
 #if FX_RESHAPED_REFLECTION
@@ -1028,9 +1013,7 @@ namespace Microsoft.FSharp.Text.StructuredFormat
                                                None
                                  // Seed with an empty layout with a space to the left for formatting purposes
                                  buildObjMessageL txt [leftL (tagText "")] 
-#if FSHARP_CORE
-#else
-#if COMPILER    // FSharp.Compiler.Service.dll: This is the PrintIntercepts extensibility point currently revealed by fsi.exe's AddPrinter
+#if COMPILER    // This is the PrintIntercepts extensibility point currently revealed by fsi.exe's AddPrinter
                        let res = 
                            match res with 
                            | Some _ -> res
@@ -1040,7 +1023,6 @@ namespace Microsoft.FSharp.Text.StructuredFormat
                                                member env.MaxColumns = opts.PrintLength
                                                member env.MaxRows = opts.PrintLength }
                                opts.PrintIntercepts |> List.tryPick (fun intercept -> intercept env x)
-#endif
 #endif
                        let res = 
                            match res with 
@@ -1337,7 +1319,11 @@ namespace Microsoft.FSharp.Text.StructuredFormat

        let any_to_string x = layout_as_string FormatOptions.Default x

-#if FSHARP_CORE
+#if COMPILER
+        /// Called 
+        let fsi_any_to_layout opts x = anyL ShowTopLevelBinding BindingFlags.Public opts x
+#else
+// FSharp.Core
 #if FX_RESHAPED_REFLECTION
        let internal anyToStringForPrintf opts (showNonPublicMembers : bool) x = 
            let bindingFlags = ReflectionUtils.toBindingFlags showNonPublicMembers
@@ -1347,7 +1333,3 @@ namespace Microsoft.FSharp.Text.StructuredFormat
            x |> anyL ShowAll bindingFlags opts |> layout_to_string opts
 #endif

-#if COMPILER
-        /// Called 
-        let fsi_any_to_layout opts x = anyL ShowTopLevelBinding BindingFlags.Public opts x
-#endif  
--- a/tests/fsharpqa/testenv/bin/KnownFailRewriter.fsx
+++ b/tests/fsharpqa/testenv/bin/KnownFailRewriter.fsx
@@ -102,7 +102,7 @@ module FSharpInfo =
    let IsFSharpCompilerDebug () = 
        let o = Microsoft.Win32.Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\FSharp\4.1\Runtime\v4.0", null, null)
        if o <> null then
-            let path = System.IO.Path.Combine( o :?> string, "FSharp.Compiler.Service.dll")
+            let path = System.IO.Path.Combine( o :?> string, "FSharp.Compiler.Service.Internal.dll")
            let asm = System.Reflection.Assembly.LoadFrom(path)

            match asm.GetCustomAttributes(typeof<System.Diagnostics.DebuggableAttribute>, false) with

--- a/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj
+++ b/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj
@@ -48,9 +48,9 @@
      <Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
      <Name>FSharp.Core</Name>
    </ProjectReference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
      <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
-      <Name>FSharp.Compiler.Service</Name>
+      <Name>FSharp.Compiler.Service.Internal</Name>
    </ProjectReference>
  </ItemGroup>
  <Choose>

--- a/vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj
+++ b/vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj
@@ -66,9 +66,9 @@
      <Project>{ded3bbd7-53f4-428a-8c9f-27968e768605}</Project>
      <Private>True</Private>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+    <ProjectReference Include="..\..\..\src\fsharp\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
      <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
-      <Name>FSharp.Compiler.Service</Name>
+      <Name>FSharp.Compiler.Service.Internal</Name>
      <Private>True</Private>
    </ProjectReference>
  </ItemGroup>

--- a/vsintegration/Utils/LanguageServiceProfiling/Options.fs
+++ b/vsintegration/Utils/LanguageServiceProfiling/Options.fs
@@ -27,7 +27,7 @@ let FCS (repositoryDir: string) : Options =
    let files =
          [| @"src\fsharp\FSharp.Compiler.Service\obj\Release\FSComp.fs"
             @"src\fsharp\FSharp.Compiler.Service\obj\Release\FSIstrings.fs"
-             @"src\assemblyinfo\assemblyinfo.FSharp.Compiler.Service.dll.fs"
+             @"src\assemblyinfo\assemblyinfo.FSharp.Compiler.Service.Internal.dll.fs"
             @"src\assemblyinfo\assemblyinfo.shared.fs"
             @"src\utils\reshapedreflection.fs"
             @"src\utils\sformat.fsi"
@@ -195,10 +195,10 @@ let FCS (repositoryDir: string) : Options =
             @"src\fsharp\fsi\fsi.fs" |]

    { Options =
-        {ProjectFileName = repositoryDir </> @"src\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj"
+        {ProjectFileName = repositoryDir </> @"src\fsharp\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj"
         SourceFiles = files |> Array.map (fun x -> repositoryDir </> x)
         OtherOptions =
-          [|@"-o:obj\Release\FSharp.Compiler.Service.dll"; "-g"; "--noframework";
+          [|@"-o:obj\Release\FSharp.Compiler.Service.Internal.dll"; "-g"; "--noframework";
            @"--baseaddress:0x06800000"; "--define:DEBUG";
            @"--define:CROSS_PLATFORM_COMPILER"; "--define:FX_ATLEAST_45";
            @"--define:FX_ATLEAST_40"; "--define:BE_SECURITY_TRANSPARENT";
@@ -335,7 +335,7 @@ let VFPT (repositoryDir: string) : Options =
         OtherOptions =
          [|@"-o:obj\Release\FSharp.Editing.dll"; "--debug:pdbonly"; "--noframework";
            @"--define:TRACE"; "--doc:bin\Release\FSharp.Editing.XML"; "--optimize+";
-            @"-r:" + (repositoryDir </> @"packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll");
+            @"-r:" + (repositoryDir </> @"packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.Internal.dll");
            @"-r:" + (repositoryDir </> @"packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll");
            @"-r:" + (repositoryDir </> @"packages\FSharp.Core\lib\net40\FSharp.Core.dll");
            @"-r:C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\mscorlib.dll";

--- a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
@@ -15,7 +15,7 @@
    <Actions>
      <Action Type="Ngen" Path="fsiAnyCpu.exe" />
      <Action Type="Ngen" Path="fsi.exe" />
-      <Action Type="Ngen" Path="FSharp.Compiler.Service.dll" />
+      <Action Type="Ngen" Path="FSharp.Compiler.Service.Internal.dll" />
      <Action Type="Ngen" Path="FSharp.Compiler.Interactive.Settings.dll" />
      <Action Type="Ngen" Path="FSharp.Compiler.Server.Shared.dll" />
      <Action Type="Ngen" Path="FSharp.Core.dll" />

--- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
+++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
@@ -123,9 +123,9 @@
      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
      <Private>True</Private>
    </ProjectReference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
      <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
-      <Name>FSharp.Compiler.Service</Name>
+      <Name>FSharp.Compiler.Service.Internal</Name>
      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
      <Private>True</Private>

--- a/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj
+++ b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj
@@ -122,9 +122,9 @@
      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
      <Private>True</Private>
    </ProjectReference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
      <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
-      <Name>FSharp.Compiler.Service</Name>
+      <Name>FSharp.Compiler.Service.Internal</Name>
      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
      <Private>True</Private>

--- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
+++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
@@ -107,9 +107,9 @@
      <Project>{1c5c163c-37ea-4a3c-8ccc-0d34b74bf8ef}</Project>
      <Private>True</Private>
    </ProjectReference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
      <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
-      <Name>FSharp.Compiler.Service</Name>
+      <Name>FSharp.Compiler.Service.Internal</Name>
      <Private>True</Private>
    </ProjectReference>
    <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.UIResources\FSharp.UIResources.csproj">

--- a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
+++ b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
@@ -203,9 +203,9 @@
      <Project>{1c5c163c-37ea-4a3c-8ccc-0d34b74bf8ef}</Project>
      <Private>True</Private>
    </ProjectReference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
      <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
-      <Name>FSharp.Compiler.Service</Name>
+      <Name>FSharp.Compiler.Service.Internal</Name>
      <Private>True</Private>
    </ProjectReference>
    <Reference Include="Microsoft.CodeAnalysis">

--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
@@ -296,9 +296,9 @@
      <Project>{1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF}</Project>
      <Name>FSharp.LanguageService.Base</Name>
    </ProjectReference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
      <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
-      <Name>FSharp.Compiler.Service</Name>
+      <Name>FSharp.Compiler.Service.Internal</Name>
      <Private>True</Private>
    </ProjectReference>
    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">

--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
@@ -215,9 +215,9 @@
    <Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
    </Reference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
      <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
-      <Name>FSharp.Compiler.Service</Name>
+      <Name>FSharp.Compiler.Service.Internal</Name>
      <Private>True</Private>
    </ProjectReference>
    <ProjectReference Include="..\FSharp.LanguageService\FSharp.LanguageService.fsproj">

--- a/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
+++ b/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
@@ -69,8 +69,8 @@
  </ItemGroup>
  
  <ItemGroup>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
-      <Name>FSharp.Compiler.Service</Name>
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
+      <Name>FSharp.Compiler.Service.Internal</Name>
      <Project>{2e4d67b4-522d-4cf7-97e4-ba940f0b18f3}</Project>
      <Private>True</Private>
    </ProjectReference>

--- a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj
+++ b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj
@@ -163,9 +163,9 @@
      <Project>{702a7979-bcf9-4c41-853e-3adfc9897890}</Project>
      <Private>True</Private>
    </ProjectReference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
      <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
-      <Name>FSharp.Compiler.Service</Name>
+      <Name>FSharp.Compiler.Service.Internal</Name>
      <Private>True</Private>
    </ProjectReference>
    <ProjectReference Include="..\..\src\FSharp.Editor\FSharp.Editor.fsproj">

--- a/vsintegration/tests/unittests/CompletionProviderTests.fs
+++ b/vsintegration/tests/unittests/CompletionProviderTests.fs
@@ -11,7 +11,7 @@
 //   and capturing large amounts of structured output.
 (*
    cd Debug\net40\bin
-    .\fsc.exe --define:EXE -r:.\Microsoft.Build.Utilities.Core.dll -o VisualFSharp.Unittests.exe -g --optimize- -r .\FSharp.Compiler.dll  -r .\FSharp.Editor.dll -r nunit.framework.dll ..\..\..\tests\service\FsUnit.fs ..\..\..\tests\service\Common.fs /delaysign /keyfile:..\..\..\src\fsharp\msft.pubkey ..\..\..\vsintegration\tests\unittests\CompletionProviderTests.fs 
+    .\fsc.exe --define:EXE -r:.\Microsoft.Build.Utilities.Core.dll -o VisualFSharp.Unittests.exe -g --optimize- -r .\FSharp.Compiler.Service.Internal.dll  -r .\FSharp.Editor.dll -r nunit.framework.dll ..\..\..\tests\service\FsUnit.fs ..\..\..\tests\service\Common.fs /delaysign /keyfile:..\..\..\src\fsharp\msft.pubkey ..\..\..\vsintegration\tests\unittests\CompletionProviderTests.fs 
    .\VisualFSharp.Unittests.exe 
 *)
 // Technique 3: 

--- a/vsintegration/tests/unittests/DocumentHighlightsServiceTests.fs
+++ b/vsintegration/tests/unittests/DocumentHighlightsServiceTests.fs
@@ -11,12 +11,12 @@
 //   and capturing large amounts of structured output.
 (*
    cd Debug\net40\bin
-    .\fsc.exe --define:EXE -r:.\Microsoft.Build.Utilities.Core.dll -o VisualFSharp.Unittests.exe -g --optimize- -r .\FSharp.Compiler.Service.dll  -r .\FSharp.Editor.dll -r nunit.framework.dll ..\..\..\tests\service\FsUnit.fs ..\..\..\tests\service\Common.fs /delaysign /keyfile:..\..\..\src\fsharp\msft.pubkey ..\..\..\vsintegration\tests\unittests\CompletionProviderTests.fs 
+    .\fsc.exe --define:EXE -r:.\Microsoft.Build.Utilities.Core.dll -o VisualFSharp.Unittests.exe -g --optimize- -r .\FSharp.Compiler.Service.Internal.dll  -r .\FSharp.Editor.dll -r nunit.framework.dll ..\..\..\tests\service\FsUnit.fs ..\..\..\tests\service\Common.fs /delaysign /keyfile:..\..\..\src\fsharp\msft.pubkey ..\..\..\vsintegration\tests\unittests\CompletionProviderTests.fs 
    .\VisualFSharp.Unittests.exe 
 *)
 // Technique 3: 
 // 
-//    Use F# Interactive.  This only works for FSharp.Compiler.Service.dll which has a public API
+//    Use F# Interactive.  This only works for FSharp.Compiler.Service.Internal.dll which has a public API

 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 [<NUnit.Framework.Category "Roslyn Services">]

--- a/vsintegration/tests/unittests/GoToDefinitionServiceTests.fs
+++ b/vsintegration/tests/unittests/GoToDefinitionServiceTests.fs
@@ -12,12 +12,12 @@
 //   and capturing large amounts of structured output.
 (*
    cd Debug\net40\bin
-    .\fsc.exe --define:EXE -r:.\Microsoft.Build.Utilities.Core.dll -o VisualFSharp.Unittests.exe -g --optimize- -r .\FSharp.Compiler.Service.dll  -r .\FSharp.Editor.dll -r nunit.framework.dll ..\..\..\tests\service\FsUnit.fs ..\..\..\tests\service\Common.fs /delaysign /keyfile:..\..\..\src\fsharp\msft.pubkey ..\..\..\vsintegration\tests\unittests\GoToDefinitionServiceTests.fs 
+    .\fsc.exe --define:EXE -r:.\Microsoft.Build.Utilities.Core.dll -o VisualFSharp.Unittests.exe -g --optimize- -r .\FSharp.Compiler.Service.Internal.dll  -r .\FSharp.Editor.dll -r nunit.framework.dll ..\..\..\tests\service\FsUnit.fs ..\..\..\tests\service\Common.fs /delaysign /keyfile:..\..\..\src\fsharp\msft.pubkey ..\..\..\vsintegration\tests\unittests\GoToDefinitionServiceTests.fs 
    .\VisualFSharp.Unittests.exe 
 *)
 // Technique 3: 
 // 
-//    Use F# Interactive.  This only works for FSharp.Compiler.Service.dll which has a public API
+//    Use F# Interactive.  This only works for FSharp.Compiler.Service.Internal.dll which has a public API

 namespace Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn


--- a/vsintegration/tests/unittests/QuickInfoProviderTests.fs
+++ b/vsintegration/tests/unittests/QuickInfoProviderTests.fs
@@ -11,12 +11,12 @@
 //   and capturing large amounts of structured output.
 (*
    cd Debug\net40\bin
-    .\fsc.exe --define:EXE -r:.\Microsoft.Build.Utilities.Core.dll -o VisualFSharp.Unittests.exe -g --optimize- -r .\FSharp.Compiler.Service.dll  -r .\FSharp.Editor.dll -r nunit.framework.dll ..\..\..\tests\service\FsUnit.fs ..\..\..\tests\service\Common.fs /delaysign /keyfile:..\..\..\src\fsharp\msft.pubkey ..\..\..\vsintegration\tests\unittests\CompletionProviderTests.fs 
+    .\fsc.exe --define:EXE -r:.\Microsoft.Build.Utilities.Core.dll -o VisualFSharp.Unittests.exe -g --optimize- -r .\FSharp.Compiler.Service.Internal.dll  -r .\FSharp.Editor.dll -r nunit.framework.dll ..\..\..\tests\service\FsUnit.fs ..\..\..\tests\service\Common.fs /delaysign /keyfile:..\..\..\src\fsharp\msft.pubkey ..\..\..\vsintegration\tests\unittests\CompletionProviderTests.fs 
    .\VisualFSharp.Unittests.exe 
 *)
 // Technique 3: 
 // 
-//    Use F# Interactive.  This only works for FSharp.Compiler.Service.dll which has a public API
+//    Use F# Interactive.  This only works for FSharp.Compiler.Service.Internal.dll which has a public API

 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 [<NUnit.Framework.Category "Roslyn Services">]

--- a/vsintegration/tests/unittests/SignatureHelpProviderTests.fs
+++ b/vsintegration/tests/unittests/SignatureHelpProviderTests.fs
@@ -12,12 +12,12 @@
 //   and capturing large amounts of structured output.
 (*
    cd Debug\net40\bin
-    .\fsc.exe --define:EXE -r:.\Microsoft.Build.Utilities.Core.dll -o VisualFSharp.Unittests.exe -g --optimize- -r .\FSharp.Compiler.Service.dll  -r .\FSharp.Editor.dll -r nunit.framework.dll ..\..\..\tests\service\FsUnit.fs ..\..\..\tests\service\Common.fs /delaysign /keyfile:..\..\..\src\fsharp\msft.pubkey ..\..\..\vsintegration\tests\unittests\SignatureHelpProviderTests.fs 
+    .\fsc.exe --define:EXE -r:.\Microsoft.Build.Utilities.Core.dll -o VisualFSharp.Unittests.exe -g --optimize- -r .\FSharp.Compiler.Service.Internal.dll  -r .\FSharp.Editor.dll -r nunit.framework.dll ..\..\..\tests\service\FsUnit.fs ..\..\..\tests\service\Common.fs /delaysign /keyfile:..\..\..\src\fsharp\msft.pubkey ..\..\..\vsintegration\tests\unittests\SignatureHelpProviderTests.fs 
    .\VisualFSharp.Unittests.exe 
 *)
 // Technique 3: 
 // 
-//    Use F# Interactive.  This only works for FSharp.Compiler.Service.dll which has a public API
+//    Use F# Interactive.  This only works for FSharp.Compiler.Service.Internal.dll which has a public API
 [<NUnit.Framework.Category "Roslyn Services">]
 module Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn.SignatureHelpProvider


--- a/vsintegration/tests/unittests/Tests.LanguageService.Script.fs
+++ b/vsintegration/tests/unittests/Tests.LanguageService.Script.fs
@@ -1357,9 +1357,9 @@ type UsingMSBuild() as this =
                        <SpecificVersion>True</SpecificVersion>
                        <HintPath>%s\\FSharp.Compiler.Interactive.Settings.dll</HintPath>
                    </Reference>
-                    <Reference Include=""FSharp.Compiler.Service, Version=%s, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"">
+                    <Reference Include=""FSharp.Compiler.Service.Internal, Version=%s, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"">
                        <SpecificVersion>True</SpecificVersion>
-                        <HintPath>%s\\FSharp.Compiler.Service.dll</HintPath>
+                        <HintPath>%s\\FSharp.Compiler.Service.Internal.dll</HintPath>
                    </Reference>
                </ItemGroup>" fsVersion binariesFolder fsVersion binariesFolder)


--- a/vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj
+++ b/vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj
@@ -347,9 +347,9 @@
      <Project>{702a7979-bcf9-4c41-853e-3adfc9897890}</Project>
      <Private>True</Private>
    </ProjectReference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service.Internal\FSharp.Compiler.Service.Internal.fsproj">
      <Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
-      <Name>FSharp.Compiler.Service</Name>
+      <Name>FSharp.Compiler.Service.Internal</Name>
      <Private>True</Private>
    </ProjectReference>
    <ProjectReference Include="..\Salsa\VisualFSharp.Salsa.fsproj">

--- a/vsintegration/update-vsintegration.cmd
+++ b/vsintegration/update-vsintegration.cmd
@@ -47,7 +47,7 @@ mkdir "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\fsc.exe" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\fsc.exe.config" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\FSharp.Build.dll" "%COMPILERSDKPATH%"
-copy /y "%BINDIR%\FSharp.Compiler.Service.dll" "%COMPILERSDKPATH%"
+copy /y "%BINDIR%\FSharp.Compiler.Service.Internal.dll" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\FSharp.Compiler.Interactive.Settings.dll" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\fsi.exe" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\fsi.exe.config" "%COMPILERSDKPATH%"