From 222818fceba7ca1b93e53e84527d26fd7f9ecc1c Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 19 May 2017 16:17:35 +0100 Subject: [PATCH] converge compiler DLLs --- VisualFSharp.sln | 2 +- build-everything.proj | 4 +- .../FSharp.Compiler.Service.netcore.fsproj | 2 +- .../Makefile | 2 +- mono/config.make.in | 2 +- .../component-groups/Compiler_LangPack.wxs | 6 +- .../component-groups/Compiler_Redist.wxs | 8 +-- .../Microsoft.FSharp.Vsix.Resources/Files.swr | 2 +- src/FSharpSource.targets | 1 + ...fo.FSharp.Compiler.Service.Internal.dll.fs | 66 +++++++++++++++++++ ...ssemblyinfo.FSharp.Compiler.Service.dll.fs | 4 +- .../Microsoft.FSharp.Compiler.netcore.nuspec | 2 +- ...icrosoft.FSharp.Interactive.netcore.nuspec | 2 +- .../FSharp.Compiler.Service.Internal.fsproj} | 8 +-- ....Compiler.Service.Internal.netcore.nuspec} | 2 +- .../InternalsVisibleTo.fs | 0 .../project.json | 0 .../FSharp.Compiler.Unittests.fsproj | 4 +- src/fsharp/Fsc/Fsc.fsproj | 4 +- .../SimulatedMSBuildReferenceResolver.fs | 12 ++-- src/fsharp/fscmain.fs | 2 +- src/fsharp/fsi/Fsi.fsproj | 4 +- src/fsharp/fsi/fsimain.fs | 2 +- src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj | 4 +- src/fsharp/vs/Reactor.fsi | 2 +- .../vs/ServiceInterfaceStubGenerator.fs | 2 + .../vs/ServiceInterfaceStubGenerator.fsi | 2 + src/fsharp/vs/service.fs | 5 ++ src/utils/sformat.fs | 38 +++-------- .../testenv/bin/KnownFailRewriter.fsx | 2 +- .../HostedCompilerServer.fsproj | 4 +- .../LanguageServiceProfiling.fsproj | 4 +- .../Utils/LanguageServiceProfiling/Options.fs | 8 +-- .../Source.extension.vsixmanifest | 2 +- .../VisualFSharpFull/VisualFSharpFull.csproj | 4 +- .../VisualFSharpOpenSource.csproj | 4 +- .../src/FSharp.Editor/FSharp.Editor.fsproj | 4 +- .../FSharp.LanguageService.fsproj | 4 +- .../Project/ProjectSystem.Base.csproj | 4 +- .../ProjectSystem.fsproj | 4 +- .../src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj | 4 +- .../tests/Salsa/VisualFSharp.Salsa.fsproj | 4 +- .../unittests/CompletionProviderTests.fs | 2 +- .../DocumentHighlightsServiceTests.fs | 4 +- .../unittests/GoToDefinitionServiceTests.fs | 4 +- .../tests/unittests/QuickInfoProviderTests.fs | 4 +- .../unittests/SignatureHelpProviderTests.fs | 4 +- .../unittests/Tests.LanguageService.Script.fs | 4 +- .../unittests/VisualFSharp.Unittests.fsproj | 4 +- vsintegration/update-vsintegration.cmd | 2 +- 50 files changed, 166 insertions(+), 108 deletions(-) rename mono/{FSharp.Compiler => FSharp.Compiler.Service.Internal}/Makefile (71%) create mode 100644 src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.Internal.dll.fs rename src/fsharp/{FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj => FSharp.Compiler.Service.Internal/FSharp.Compiler.Service.Internal.fsproj} (98%) rename src/fsharp/{FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.nuspec => FSharp.Compiler.Service.Internal/FSharp.Compiler.Service.Internal.netcore.nuspec} (96%) rename src/fsharp/{FSharp.Compiler.Service => FSharp.Compiler.Service.Internal}/InternalsVisibleTo.fs (100%) rename src/fsharp/{FSharp.Compiler.Service => FSharp.Compiler.Service.Internal}/project.json (100%) diff --git a/VisualFSharp.sln b/VisualFSharp.sln index cd5b1473d..6e0920f96 100644 --- 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 diff --git a/build-everything.proj b/build-everything.proj index e98c458f1..8291ed783 100644 --- a/build-everything.proj +++ b/build-everything.proj @@ -9,7 +9,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.fsproj index a09ed2ab7..ac7ff27da 100644 --- 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);FX_RESHAPED_REFLECTION $(DefineConstants);FX_RESHAPED_REFLECTION_CORECLR $(DefineConstants);FSI_TODO_NETCORE - $(DefineConstants);RESHAPED_MSBUILD + $(DefineConstants);FX_RESHAPED_MSBUILD $(DefineConstants);SIGNED $(DefineConstants);STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY $(NoWarn);44;69;65;54;61;75;62;9;2003; diff --git a/mono/FSharp.Compiler/Makefile b/mono/FSharp.Compiler.Service.Internal/Makefile similarity index 71% rename from mono/FSharp.Compiler/Makefile rename to mono/FSharp.Compiler.Service.Internal/Makefile index 2bdbaa787..ddaa38b3f 100644 --- a/mono/FSharp.Compiler/Makefile +++ b/mono/FSharp.Compiler.Service.Internal/Makefile @@ -1,4 +1,4 @@ -NAME=FSharp.Compiler +NAME=FSharp.Compiler.Service.Internal ASSEMBLY = $(NAME).dll TOKEN=$(SIGN_TOKEN) diff --git a/mono/config.make.in b/mono/config.make.in index d7eb7412c..1212e9783 100644 --- 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/"; \ diff --git a/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs b/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs index 3632ddb24..0e6b94b87 100644 --- a/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs +++ b/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs @@ -6,7 +6,7 @@ - + @@ -21,8 +21,8 @@ - - + + diff --git a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs index 6ee007c5c..31479acda 100644 --- a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs +++ b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs @@ -6,7 +6,7 @@ - + @@ -65,9 +65,9 @@ - - - + + + diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr index e216bce99..8ac5f1c16 100644 --- 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 diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets index dfef928f8..ece439a8e 100644 --- a/src/FSharpSource.targets +++ b/src/FSharpSource.targets @@ -193,6 +193,7 @@ $(DefineConstants);FX_RESHAPED_GLOBALIZATION $(DefineConstants);FX_RESHAPED_REFLECTION $(DefineConstants);FX_JITTRACKING_ISSUE + $(DefineConstants);FX_NO_INDENTED_TEXT_WRITER $(DefineConstants);FX_RESHAPED_REFLECTION_CORECLR $(DefineConstants);FX_RESHAPED_MSBUILD $(DefineConstants);FSI_TODO_NETCORE diff --git a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.Internal.dll.fs b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.Internal.dll.fs new file mode 100644 index 000000000..b4e673922 --- /dev/null +++ b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.Internal.dll.fs @@ -0,0 +1,66 @@ +// 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 + +[] +[] +[] +[] +[] +[] + +#if NO_STRONG_NAMES +[] +[] +[] +[] +[] +[] +[] +[] +[] + +// Note: internals visible to unit test DLLs in Retail (and all) builds. +[] +[] +[] +[] +[] +#endif +#if STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY + +[] +[] +[] +[] +[] +[] +[] +[] +[] +[] +[] +[] +[] +[] +[] +#endif +#if STRONG_NAME_FSHARP_COMPILER_WITH_TEST_KEY +[] +[] +[] +[] +[] +[] +[] +[] +[] +[] +[] +[] +[] +[] +#endif +do() diff --git a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.dll.fs b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.dll.fs index c8b988873..b4e673922 100644 --- 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 -[] +[] [] -[] +[] [] [] [] diff --git 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 index cd7601c34..431cf28af 100644 --- 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 @@ - + diff --git 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 index 2a9483063..29fe8b28a 100644 --- 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 @@ - + diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/src/fsharp/FSharp.Compiler.Service.Internal/FSharp.Compiler.Service.Internal.fsproj similarity index 98% rename from src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj rename to src/fsharp/FSharp.Compiler.Service.Internal/FSharp.Compiler.Service.Internal.fsproj index e61a919ef..97f92c533 100644 --- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/src/fsharp/FSharp.Compiler.Service.Internal/FSharp.Compiler.Service.Internal.fsproj @@ -9,7 +9,7 @@ Debug AnyCPU Library - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal EXTENSIONTYPING;$(DefineConstants) COMPILER;$(DefineConstants) $(NoWarn);62;9 @@ -61,9 +61,9 @@ false false - - - assemblyinfo.FSharp.Compiler.Service.dll.fs + + + assemblyinfo.FSharp.Compiler.Service.Internal.dll.fs FSComp.txt diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.nuspec b/src/fsharp/FSharp.Compiler.Service.Internal/FSharp.Compiler.Service.Internal.netcore.nuspec similarity index 96% rename from src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.nuspec rename to src/fsharp/FSharp.Compiler.Service.Internal/FSharp.Compiler.Service.Internal.netcore.nuspec index 226e498cd..c21f10231 100644 --- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.netcore.nuspec +++ b/src/fsharp/FSharp.Compiler.Service.Internal/FSharp.Compiler.Service.Internal.netcore.nuspec @@ -38,6 +38,6 @@ - + diff --git a/src/fsharp/FSharp.Compiler.Service/InternalsVisibleTo.fs b/src/fsharp/FSharp.Compiler.Service.Internal/InternalsVisibleTo.fs similarity index 100% rename from src/fsharp/FSharp.Compiler.Service/InternalsVisibleTo.fs rename to src/fsharp/FSharp.Compiler.Service.Internal/InternalsVisibleTo.fs diff --git a/src/fsharp/FSharp.Compiler.Service/project.json b/src/fsharp/FSharp.Compiler.Service.Internal/project.json similarity index 100% rename from src/fsharp/FSharp.Compiler.Service/project.json rename to src/fsharp/FSharp.Compiler.Service.Internal/project.json diff --git a/src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj b/src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj index 37c44738a..7fc04d349 100644 --- a/src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj +++ b/src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj @@ -60,8 +60,8 @@ - - FSharp.Compiler.Service + + FSharp.Compiler.Service.Internal {2e4d67b4-522d-4cf7-97e4-ba940f0b18f3} diff --git a/src/fsharp/Fsc/Fsc.fsproj b/src/fsharp/Fsc/Fsc.fsproj index 04ad83795..a4c868496 100644 --- a/src/fsharp/Fsc/Fsc.fsproj +++ b/src/fsharp/Fsc/Fsc.fsproj @@ -58,9 +58,9 @@ - + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal {DED3BBD7-53F4-428A-8C9F-27968E768605} diff --git a/src/fsharp/SimulatedMSBuildReferenceResolver.fs b/src/fsharp/SimulatedMSBuildReferenceResolver.fs index 40f446a2f..7b960c983 100644 --- 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 diff --git a/src/fsharp/fscmain.fs b/src/fsharp/fscmain.fs index 965f2e795..2c7d14dec 100644 --- 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 -[] +[] #endif do () diff --git a/src/fsharp/fsi/Fsi.fsproj b/src/fsharp/fsi/Fsi.fsproj index 761e3bc62..101888fb5 100644 --- a/src/fsharp/fsi/Fsi.fsproj +++ b/src/fsharp/fsi/Fsi.fsproj @@ -65,9 +65,9 @@ - + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal {DED3BBD7-53F4-428A-8C9F-27968E768605} diff --git a/src/fsharp/fsi/fsimain.fs b/src/fsharp/fsi/fsimain.fs index f4e412467..1ae74c8dd 100644 --- 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 -[] do () +[] do () [] do () #endif diff --git a/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj b/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj index 935498072..91cc117f5 100644 --- a/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj +++ b/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj @@ -61,9 +61,9 @@ {d5870cf0-ed51-4cbc-b3d7-6f56da84ac06} True - + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal {DED3BBD7-53F4-428A-8C9F-27968E768605} diff --git a/src/fsharp/vs/Reactor.fsi b/src/fsharp/vs/Reactor.fsi index f8c431974..12fee56b3 100755 --- 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 diff --git a/src/fsharp/vs/ServiceInterfaceStubGenerator.fs b/src/fsharp/vs/ServiceInterfaceStubGenerator.fs index 00e48a068..854cebcf6 100644 --- 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 [] module internal CodeGenerationUtils = open System.IO @@ -909,3 +910,4 @@ module internal InterfaceStubGenerator = None | ParsedInput.ImplFile input -> walkImplFileInput input +#endif diff --git a/src/fsharp/vs/ServiceInterfaceStubGenerator.fsi b/src/fsharp/vs/ServiceInterfaceStubGenerator.fsi index b0ea456e1..f75f7028d 100644 --- 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 [] 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 diff --git a/src/fsharp/vs/service.fs b/src/fsharp/vs/service.fs index 74996c512..70ffdfa98 100644 --- 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 [] diff --git a/src/utils/sformat.fs b/src/utils/sformat.fs index b2e0e8a29..1f7000daa 100644 --- a/src/utils/sformat.fs +++ b/src/utils/sformat.fs @@ -1,11 +1,9 @@ // 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 diff --git a/tests/fsharpqa/testenv/bin/KnownFailRewriter.fsx b/tests/fsharpqa/testenv/bin/KnownFailRewriter.fsx index e2a5ebfb3..b1ae61368 100644 --- 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, false) with diff --git a/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj b/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj index a686c55cc..c0faa4247 100644 --- a/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj +++ b/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj @@ -48,9 +48,9 @@ {DED3BBD7-53F4-428A-8C9F-27968E768605} FSharp.Core - + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal diff --git a/vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj b/vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj index 971a3a05f..7007d7e47 100644 --- a/vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj +++ b/vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj @@ -66,9 +66,9 @@ {ded3bbd7-53f4-428a-8c9f-27968e768605} True - + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal True diff --git a/vsintegration/Utils/LanguageServiceProfiling/Options.fs b/vsintegration/Utils/LanguageServiceProfiling/Options.fs index 873889333..0675a476f 100644 --- 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"; diff --git a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest index f4e208d34..27750d45f 100644 --- a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest @@ -15,7 +15,7 @@ - + diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj index 478152d5c..51ebd1043 100644 --- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj +++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj @@ -123,9 +123,9 @@ DebugSymbolsProjectOutputGroup%3b True - + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b DebugSymbolsProjectOutputGroup%3b True diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj index cc3c0718b..604314057 100644 --- a/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj +++ b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj @@ -122,9 +122,9 @@ DebugSymbolsProjectOutputGroup%3b True - + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b DebugSymbolsProjectOutputGroup%3b True diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index 21ae9044a..2ba5c2f52 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -107,9 +107,9 @@ {1c5c163c-37ea-4a3c-8ccc-0d34b74bf8ef} True - + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal True diff --git a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj index b109cae40..82afe2775 100644 --- a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj +++ b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj @@ -203,9 +203,9 @@ {1c5c163c-37ea-4a3c-8ccc-0d34b74bf8ef} True - + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal True diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj index a4809b9b6..008512b45 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj @@ -296,9 +296,9 @@ {1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF} FSharp.LanguageService.Base - + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal True diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj index 0ae1b854f..6de336544 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj @@ -215,9 +215,9 @@ $(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal True diff --git a/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj b/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj index 62ff79e56..7c999bb67 100644 --- a/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj +++ b/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj @@ -69,8 +69,8 @@ - - FSharp.Compiler.Service + + FSharp.Compiler.Service.Internal {2e4d67b4-522d-4cf7-97e4-ba940f0b18f3} True diff --git a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj index d39a4b908..2a7fbb9d2 100644 --- a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj +++ b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj @@ -163,9 +163,9 @@ {702a7979-bcf9-4c41-853e-3adfc9897890} True - + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal True diff --git a/vsintegration/tests/unittests/CompletionProviderTests.fs b/vsintegration/tests/unittests/CompletionProviderTests.fs index 0e3a23f67..b54abb3a2 100644 --- 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: diff --git a/vsintegration/tests/unittests/DocumentHighlightsServiceTests.fs b/vsintegration/tests/unittests/DocumentHighlightsServiceTests.fs index 7fe90b6f7..30245df01 100644 --- 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. [] diff --git a/vsintegration/tests/unittests/GoToDefinitionServiceTests.fs b/vsintegration/tests/unittests/GoToDefinitionServiceTests.fs index 918f668c4..0965e40a2 100644 --- 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 diff --git a/vsintegration/tests/unittests/QuickInfoProviderTests.fs b/vsintegration/tests/unittests/QuickInfoProviderTests.fs index 2a41b9371..a71e74b68 100644 --- 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. [] diff --git a/vsintegration/tests/unittests/SignatureHelpProviderTests.fs b/vsintegration/tests/unittests/SignatureHelpProviderTests.fs index 70aa4f3fe..5631abacb 100644 --- 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 [] module Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn.SignatureHelpProvider diff --git a/vsintegration/tests/unittests/Tests.LanguageService.Script.fs b/vsintegration/tests/unittests/Tests.LanguageService.Script.fs index 9147c2e53..eee15305c 100644 --- a/vsintegration/tests/unittests/Tests.LanguageService.Script.fs +++ b/vsintegration/tests/unittests/Tests.LanguageService.Script.fs @@ -1357,9 +1357,9 @@ type UsingMSBuild() as this = True %s\\FSharp.Compiler.Interactive.Settings.dll - + True - %s\\FSharp.Compiler.Service.dll + %s\\FSharp.Compiler.Service.Internal.dll " fsVersion binariesFolder fsVersion binariesFolder) diff --git a/vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj b/vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj index 80753ae05..a62ecf267 100644 --- a/vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj +++ b/vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj @@ -347,9 +347,9 @@ {702a7979-bcf9-4c41-853e-3adfc9897890} True - + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Service + FSharp.Compiler.Service.Internal True diff --git a/vsintegration/update-vsintegration.cmd b/vsintegration/update-vsintegration.cmd index 95a72dde5..ee58b4482 100644 --- 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%" -- GitLab