From 5109a80a7152bbba7b00810a3e8759b3c59f3414 Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Thu, 14 Jan 2021 21:05:42 -0800 Subject: [PATCH 1/2] Remove FSharp.Compiler.Private --- .gitignore | 32 +- DEVGUIDE.md | 4 +- FSharp.Profiles.props | 1 - FSharp.sln | 19 +- VisualFSharp.sln | 19 +- docs/compiler-guide.md | 8 +- eng/Versions.props | 1 + .../Microsoft.FSharp.Compiler.MSBuild.csproj | 38 +- .../Microsoft.FSharp.IDE.csproj | 3 +- .../FSharp.Compiler.Private.Scripting.fsproj | 3 +- .../FSharp.Compiler.Private.Scripting.nuspec | 6 +- .../Directory.Build.props | 9 - .../FSharp.Compiler.Private.fsproj | 956 ------------------ .../FSharp.Compiler.Service.fsproj | 89 +- .../DependencyProvider.fs | 2 +- .../Microsoft.FSharp.Compiler.nuspec | 4 +- src/fsharp/fsc/fsc.fsproj | 2 +- src/fsharp/fscmain.fs | 2 +- src/fsharp/fsi/fsi.fsproj | 6 +- src/fsharp/fsi/fsimain.fs | 2 +- src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj | 2 +- .../service/ServiceInterfaceStubGenerator.fs | 4 +- .../service/ServiceInterfaceStubGenerator.fsi | 4 +- .../FSharp.Compiler.ComponentTests.fsproj | 2 +- .../SurfaceArea.netstandard.fs | 37 + .../FSharp.Compiler.UnitTests.fsproj | 2 +- .../FSharp.Test.Utilities.fsproj | 2 +- tests/fsharp/FSharpSuite.Tests.fsproj | 2 +- .../testenv/bin/KnownFailRewriter.fsx | 2 +- .../HostedCompilerServer.fsproj | 2 +- .../Source.extension.vsixmanifest | 2 +- .../VisualFSharpFull/VisualFSharpFull.csproj | 26 +- .../src/FSharp.Editor/FSharp.Editor.fsproj | 2 +- .../FSharp.LanguageService.Base.csproj | 2 +- .../FSharp.LanguageService.fsproj | 2 +- .../ProjectSystem.fsproj | 8 +- .../src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj | 6 +- .../tests/Salsa/VisualFSharp.Salsa.fsproj | 2 +- .../UnitTests/CompletionProviderTests.fs | 2 +- .../DocumentHighlightsServiceTests.fs | 4 +- .../UnitTests/FsxCompletionProviderTests.fs | 2 +- .../UnitTests/GoToDefinitionServiceTests.fs | 4 +- .../Tests.LanguageService.Script.fs | 4 +- .../tests/UnitTests/QuickInfoProviderTests.fs | 4 +- .../UnitTests/SignatureHelpProviderTests.fs | 4 +- .../UnitTests/VisualFSharp.UnitTests.fsproj | 2 +- vsintegration/update-vsintegration.cmd | 2 +- 47 files changed, 189 insertions(+), 1154 deletions(-) delete mode 100644 src/fsharp/FSharp.Compiler.Private/Directory.Build.props delete mode 100644 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj diff --git a/.gitignore b/.gitignore index 89681ee5a61..3345325f7a6 100644 --- a/.gitignore +++ b/.gitignore @@ -9,43 +9,19 @@ artifacts/ # Patches that may have been generated by scripts. # (These aren't generally useful to commit directly; if anything, they should be applied.) scripts/*.patch -/fcs/FSharp.Compiler.Service/illex.fs -/fcs/FSharp.Compiler.Service/ilpars.fs -/fcs/FSharp.Compiler.Service/ilpars.fsi -/fcs/FSharp.Compiler.Service/lex.fs -/fcs/FSharp.Compiler.Service/pars.fs -/fcs/FSharp.Compiler.Service/pars.fsi -/fcs/FSharp.Compiler.Service/pplex.fs -/fcs/FSharp.Compiler.Service/pppars.fs -/fcs/FSharp.Compiler.Service/pppars.fsi /src/*.userprefs /src/fsharp/FSStrings.resources /src/fsharp/FSharp.Build/*.resx -/src/fsharp/FSharp.Build-proto/*.resx -/src/fsharp/FSharp.Build-proto/*.resources -/src/fsharp/FSharp.Compiler-proto/*.resx -/src/fsharp/FSharp.Compiler-proto/*.resources -/src/fsharp/FSharp.Compiler-proto/*.sln -/src/fsharp/FSharp.Compiler-proto/*.userprefs /src/fsharp/fsi/*.resx /src/fsharp/FSharp.Compiler.Interactive.Settings/*.resx /src/fsharp/FSharp.Compiler.Server.Shared/*.resx /src/fsharp/fsi/Fsi.sln /src/fsharp/FSharp.Build/*.resources -/src/fsharp/FSharp.Compiler.Private/*.resx -/src/fsharp/FSharp.Compiler.Private/*.resources -/src/fsharp/FSharp.Compiler.Private/*.sln -/src/fsharp/FSharp.Compiler.Private/*.userprefs +/src/fsharp/FSharp.Compiler.Service/*.resx +/src/fsharp/FSharp.Compiler.Service/*.resources +/src/fsharp/FSharp.Compiler.Service/*.sln +/src/fsharp/FSharp.Compiler.Service/*.userprefs /src/*.log -/src/fsharp/Fsc-proto/illex.fs -/src/fsharp/Fsc-proto/ilpars.fs -/src/fsharp/Fsc-proto/ilpars.fsi -/src/fsharp/Fsc-proto/lex.fs -/src/fsharp/Fsc-proto/pars.fs -/src/fsharp/Fsc-proto/pars.fsi -/src/fsharp/Fsc-proto/pplex.fs -/src/fsharp/Fsc-proto/pppars.fs -/src/fsharp/Fsc-proto/pppars.fsi /src/fsharp/FSharp.LanguageService.Compiler/illex.* /src/fsharp/FSharp.LanguageService.Compiler/ilpars.* /src/fsharp/FSharp.LanguageService.Compiler/lex.* diff --git a/DEVGUIDE.md b/DEVGUIDE.md index cc8c7e84a6e..a27eb97a5d4 100644 --- a/DEVGUIDE.md +++ b/DEVGUIDE.md @@ -108,8 +108,8 @@ Running any of the above will build the latest changes and run tests against the If your changes involve modifying the list of language keywords in any way, (e.g. when implementing a new keyword), the XLF localization files need to be synced with the corresponding resx files. This can be done automatically by running - pushd src\fsharp\FSharp.Compiler.Private - msbuild FSharp.Compiler.Private.fsproj /t:UpdateXlf + pushd src\fsharp\FSharp.Compiler.Service + msbuild FSharp.Compiler.Service.fsproj /t:UpdateXlf popd This only works on Windows/.NETStandard framework, so changing this from any other platform requires editing and syncing all of the XLF files manually. diff --git a/FSharp.Profiles.props b/FSharp.Profiles.props index 993512bde43..260bccd3bf9 100644 --- a/FSharp.Profiles.props +++ b/FSharp.Profiles.props @@ -20,7 +20,6 @@ $(DefineConstants);FX_NO_SYSTEM_CONFIGURATION $(DefineConstants);FX_NO_WIN_REGISTRY $(DefineConstants);FX_NO_WINFORMS - $(DefineConstants);FX_NO_INDENTED_TEXT_WRITER $(DefineConstants);FX_RESHAPED_REFEMIT $(OtherFlags) --simpleresolution diff --git a/FSharp.sln b/FSharp.sln index 210dac21ef6..798f881d5e0 100644 --- a/FSharp.sln +++ b/FSharp.sln @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28729.10 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private", "src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}" -EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Server.Shared", "src\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj", "{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}" EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Core", "src\fsharp\FSharp.Core\FSharp.Core.fsproj", "{DED3BBD7-53F4-428A-8C9F-27968E768605}" @@ -76,18 +74,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|x86.ActiveCfg = Debug|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|x86.Build.0 = Debug|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Proto|Any CPU.ActiveCfg = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Proto|Any CPU.Build.0 = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Proto|x86.ActiveCfg = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Proto|x86.Build.0 = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.Build.0 = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|x86.ActiveCfg = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|x86.Build.0 = Release|Any CPU {D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Debug|Any CPU.Build.0 = Debug|Any CPU {D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -345,7 +331,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77} {DED3BBD7-53F4-428A-8C9F-27968E768605} = {3058BC79-8E79-4645-B05D-48CC182FA8A6} {702A7979-BCF9-4C41-853E-3ADFC9897890} = {B8DDA694-7939-42E3-95E5-265C2217C142} {C94C257C-3C0A-4858-B5D8-D746498D1F08} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77} @@ -361,14 +346,14 @@ Global {8B7BF62E-7D8C-4928-BE40-4E392A9EE851} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77} {6771860A-614D-4FDD-A655-4C70EBCC91B0} = {B8DDA694-7939-42E3-95E5-265C2217C142} {4FEDF286-0252-4EBC-9E75-879CCA3B85DC} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77} + {B5A043F8-6D7F-4D4E-B8AD-5880070180B6} = {3058BC79-8E79-4645-B05D-48CC182FA8A6} {FAC5A3BF-C0D6-437A-868A-E962AA00B418} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} {292C4F92-A313-4CAF-9552-731F39C6C21F} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} {FF76050A-415A-4FB4-A0E5-13CBF38D83E0} = {292C4F92-A313-4CAF-9552-731F39C6C21F} {07482B5E-4980-4285-B732-820F15870284} = {FF76050A-415A-4FB4-A0E5-13CBF38D83E0} {25568CD2-E654-4C8F-BE5B-59BABFC5BD20} = {07482B5E-4980-4285-B732-820F15870284} {DDFD06DC-D7F2-417F-9177-107764EEBCD8} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} - {9B4CF83C-C215-4EA0-9F8B-B5A77090F634} = {3058BC79-8E79-4645-B05D-48CC182FA8A6} + {9B4CF83C-C215-4EA0-9F8B-B5A77090F634} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BD5177C7-1380-40E7-94D2-7768E1A8B1B8} diff --git a/VisualFSharp.sln b/VisualFSharp.sln index 629673b8574..561241a5757 100644 --- a/VisualFSharp.sln +++ b/VisualFSharp.sln @@ -28,8 +28,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Legacy", "Legacy", "{CCAB6E EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.VS.FSI", "vsintegration\src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj", "{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private", "src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VisualFSharpFull", "vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj", "{59ADCE46-9740-4079-834D-9A03A3494EBC}" EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Server.Shared", "src\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj", "{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}" @@ -186,18 +184,6 @@ Global {991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Release|Any CPU.Build.0 = Release|Any CPU {991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Release|x86.ActiveCfg = Release|Any CPU {991DCF75-C2EB-42B6-9A0D-AA1D2409D519}.Release|x86.Build.0 = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|x86.ActiveCfg = Debug|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|x86.Build.0 = Debug|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Proto|Any CPU.ActiveCfg = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Proto|Any CPU.Build.0 = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Proto|x86.ActiveCfg = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Proto|x86.Build.0 = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.Build.0 = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|x86.ActiveCfg = Release|Any CPU - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|x86.Build.0 = Release|Any CPU {59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU {59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -977,7 +963,6 @@ Global {35636A82-401A-4C3A-B2AB-EB7DC5E9C268} = {F7876C9B-FB6A-4EFB-B058-D6967DB75FB2} {CCAB6E50-34C6-42AF-A6B0-567C29FCD91B} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D} {991DCF75-C2EB-42B6-9A0D-AA1D2409D519} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D} - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77} {59ADCE46-9740-4079-834D-9A03A3494EBC} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D} {D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06} = {B8DDA694-7939-42E3-95E5-265C2217C142} {DED3BBD7-53F4-428A-8C9F-27968E768605} = {3058BC79-8E79-4645-B05D-48CC182FA8A6} @@ -1039,9 +1024,9 @@ Global {44155269-9B30-43DA-B97F-4F36F887B211} = {12EF27FD-A34B-4373-860A-F9FCE9651859} {B53D9D05-8EF7-43A6-9A5B-0B113CBC54F8} = {12EF27FD-A34B-4373-860A-F9FCE9651859} {2937CBEC-262D-4C94-BE1D-291FAB72E3E8} = {12EF27FD-A34B-4373-860A-F9FCE9651859} - {C2F38485-5F87-4986-985B-55D7ED96D5CE} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77} + {C2F38485-5F87-4986-985B-55D7ED96D5CE} = {3058BC79-8E79-4645-B05D-48CC182FA8A6} {0610FB97-7C15-422A-86FD-32335C6DF14D} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} - {B5A9BBD9-2F45-4722-A6CA-BAE3C64CD4E2} = {3058BC79-8E79-4645-B05D-48CC182FA8A6} + {B5A9BBD9-2F45-4722-A6CA-BAE3C64CD4E2} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77} {14F3D3D6-5C8E-43C2-98A2-17EA704D4DEA} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/docs/compiler-guide.md b/docs/compiler-guide.md index 68831ec4beb..7df7938540a 100644 --- a/docs/compiler-guide.md +++ b/docs/compiler-guide.md @@ -6,17 +6,15 @@ This guide discusses the F# compiler source code and implementation from a techn There are several artifacts involved in the development of F#: -* The [F# compiler library](https://github.com/dotnet/fsharp/tree/master/src/fsharp/FSharp.Compiler.Private), called `FSharp.Compiler.Private`. Contains all logic for F# compilation - including parsing, syntax tree processing, typechecking, constraint solving, optimizations, IL importing, IL writing, pretty printing of F# constructs, and F# metadata format processing - and the F# compiler APIs for tooling. +* The [F# compiler library](https://github.com/dotnet/fsharp/tree/master/src/fsharp/FSharp.Compiler.Service), called `FSharp.Compiler.Service`. Contains all logic for F# compilation - including parsing, syntax tree processing, typechecking, constraint solving, optimizations, IL importing, IL writing, pretty printing of F# constructs, and F# metadata format processing - and the F# compiler APIs for tooling. -* The [F# compiler executable](https://github.com/dotnet/fsharp/tree/master/src/fsharp/fsc), called `fsc`, which is called as a console app. It sets the .NET GC into batch mode and then invokes `FSharp.Compiler.Private` with command-line arguments. +* The [F# compiler executable](https://github.com/dotnet/fsharp/tree/master/src/fsharp/fsc), called `fsc`, which is called as a console app. It sets the .NET GC into batch mode and then invokes `FSharp.Compiler.Service` with command-line arguments. * The [F# Core Library](https://github.com/dotnet/fsharp/tree/master/src/fsharp/FSharp.Core), called `FSharp.Core`. Contains all primitive F# types and logic for how they interact, core data structures and library functions for operating on them, structured printing logic, units of measure for scientific programming, core numeric functionality, F# quotations, F# type reflection logic, and asynchronous programming types and logic. * The [F# Interactive tool](https://github.com/dotnet/fsharp/tree/master/src/fsharp/fsi), called `fsi`. A REPL for F# that supports execution and pretty-printing of F# code and results, loading F# script files, referencing assemblies, and referencing packages from NuGet. -* The [F# Compiler Service](https://github.com/dotnet/fsharp/tree/master/fcs), called `FSharp.Compiler.Service` or abbreviated to FCS. It is mostly identical to `FSharp.Compiler.Private`, but critically contains the "Expression API" that allows other environments to inspect and operate on type-checked F# expressions (such as transpiling F# code to a different runtime target). - -The `FSharp.Compiler.Private` is by far the largest of these components and contains nearly all logic that `fsc` and `fsi` use. It is the primary subject of this guide. +The `FSharp.Compiler.Service` is by far the largest of these components and contains nearly all logic that `fsc` and `fsi` use. It is the primary subject of this guide. ## Resources for learning diff --git a/eng/Versions.props b/eng/Versions.props index fdd67afd311..26971f51e57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,6 +32,7 @@ 2 $(FSRevisionVersion) $(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion) + $(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion).$(FCSRevisionVersion) $(FCSMajorVersion)$(FCSMinorVersion)$(FCSBuildVersion) 4.7.2 diff --git a/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj b/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj index d47d1fa6d74..26456ed2a85 100644 --- a/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj +++ b/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj @@ -9,7 +9,6 @@ - @@ -38,16 +37,14 @@ - + <_Line> @@ -63,11 +60,7 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\%(_XlfLanguages - + <_Lines> @@ -89,18 +82,18 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp" file source="$(BinariesFolder)\fsiAnyCpu\$(Configuration)\$(TargetFramework)\fsiAnyCpu.exe" vs.file.ngen=yes vs.file.ngenArchitecture=X64 vs.file.ngenPriority=2 vs.file.ngenApplication="[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsiAnyCpu.exe" file source="$(BinariesFolder)\fsiAnyCpu\$(Configuration)\$(TargetFramework)\fsiAnyCpu.exe.config" file source="$(BinariesFolder)\FSharp.Compiler.Interactive.Settings\$(Configuration)\netstandard2.0\FSharp.Compiler.Interactive.Settings.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2 - file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\FSharp.Compiler.Private.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2 - file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\System.Buffers.dll" - file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\System.Collections.Immutable.dll" - file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\System.Memory.dll" - file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\System.Numerics.Vectors.dll" - file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\System.Reflection.Metadata.dll" - file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\System.Resources.Extensions.dll" - file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\System.Runtime.CompilerServices.Unsafe.dll" - file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\System.Threading.Tasks.Dataflow.dll" - file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\Microsoft.Build.Framework.dll" - file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\Microsoft.Build.Tasks.Core.dll" - file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\$(TargetFramework)\Microsoft.Build.Utilities.Core.dll" + file source="$(BinariesFolder)\FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\FSharp.Compiler.Service.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2 + file source="$(BinariesFolder)\FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\System.Buffers.dll" + file source="$(BinariesFolder)\FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\System.Collections.Immutable.dll" + file source="$(BinariesFolder)\FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\System.Memory.dll" + file source="$(BinariesFolder)\FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\System.Numerics.Vectors.dll" + file source="$(BinariesFolder)\FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\System.Reflection.Metadata.dll" + file source="$(BinariesFolder)\FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\System.Resources.Extensions.dll" + file source="$(BinariesFolder)\FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\System.Runtime.CompilerServices.Unsafe.dll" + file source="$(BinariesFolder)\FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\System.Threading.Tasks.Dataflow.dll" + file source="$(BinariesFolder)\FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\Microsoft.Build.Framework.dll" + file source="$(BinariesFolder)\FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\Microsoft.Build.Tasks.Core.dll" + file source="$(BinariesFolder)\FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\Microsoft.Build.Utilities.Core.dll" file source="$(BinariesFolder)\FSharp.Compiler.Server.Shared\$(Configuration)\$(TargetFramework)\FSharp.Compiler.Server.Shared.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2 file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\netstandard2.0\FSharp.Core.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2 file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\netstandard2.0\FSharp.Core.xml" @@ -110,7 +103,6 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp" file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\netstandard2.0\Microsoft.FSharp.NetSdk.targets" file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\netstandard2.0\Microsoft.FSharp.Overrides.NetSdk.targets" file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\netstandard2.0\Microsoft.FSharp.Targets" - file source="$(BinariesFolder)\Microsoft.DotNet.DependencyManager\$(Configuration)\netstandard2.0\Microsoft.DotNet.DependencyManager.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2 @(_BuiltSwrLines) ]]> diff --git a/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj b/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj index 88cc12d66fd..8de21df6d95 100644 --- a/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj +++ b/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj @@ -16,8 +16,7 @@ <_Dependency Include="FSharp.Build" Version="$(FSProductVersion)" /> <_Dependency Include="FSharp.Compiler.Interactive.Settings" Version="$(FSProductVersion)" /> - <_Dependency Include="FSharp.Compiler.Private" Version="$(FSProductVersion)" /> - <_Dependency Include="Microsoft.DotNet.DependencyManager" Version="$(FSProductVersion)" /> + <_Dependency Include="FSharp.Compiler.Service" Version="$(FSharpCompilerServiceVersion)" /> <_Dependency Include="FSharp.DependencyManager.Nuget" Version="$(FSProductVersion)" /> <_Dependency Include="FSharp.Compiler.Server.Shared" Version="$(FSProductVersion)" /> <_Dependency Include="FSharp.Core" Version="$(FSCoreVersion)" /> diff --git a/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.fsproj b/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.fsproj index 405bec94b88..64348ed32df 100644 --- a/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.fsproj +++ b/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.fsproj @@ -26,8 +26,7 @@ - - + diff --git a/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.nuspec b/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.nuspec index 823aaf449ec..231fda050b6 100644 --- a/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.nuspec +++ b/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.nuspec @@ -18,10 +18,8 @@ $CommonFileElements$ - - - - + + diff --git a/src/fsharp/FSharp.Compiler.Private/Directory.Build.props b/src/fsharp/FSharp.Compiler.Private/Directory.Build.props deleted file mode 100644 index 7cd41381b5d..00000000000 --- a/src/fsharp/FSharp.Compiler.Private/Directory.Build.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - true - - - - - diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj deleted file mode 100644 index 599862f0ab2..00000000000 --- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +++ /dev/null @@ -1,956 +0,0 @@ - - - - - - Library - net472;netstandard2.0 - netstandard2.0 - FSharp.Compiler.Private - $(NoWarn);45;55;62;75;1204 - true - $(DefineConstants);COMPILER - $(DefineConstants);LOCALIZATION_FCOMP - $(OtherFlags) --warnon:3218 --warnon:1182 /warnon:3390 --maxerrors:20 --extraoptimizationloops:1 - true - - - - $(IntermediateOutputPath)$(TargetFramework)\ - $(IntermediateOutputPath)$(TargetFramework)\ - - - - - $(BaseOutputPath)\$(Configuration)\$(TargetFramework) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - FSComp.txt - - - FSStrings.resx - - - ErrorText\sformat.fsi - - - ErrorText\sformat.fs - - - ErrorText\sr.fsi - - - ErrorText\sr.fs - - - Facilities\Logger.fsi - - - Facilities\Logger.fs - - - Facilities\LanguageFeatures.fsi - - - Facilities\LanguageFeatures.fs - - - LexYaccRuntime\prim-lexing.fsi - - - LexYaccRuntime\prim-lexing.fs - - - LexYaccRuntime\prim-parsing.fsi - - - LexYaccRuntime\prim-parsing.fs - - - Utilities\ResizeArray.fsi - - - Utilities\ResizeArray.fs - - - Utilities\HashMultiMap.fsi - - - Utilities\HashMultiMap.fs - - - Utilities\EditDistance.fsi - - - Utilities\EditDistance.fs - - - Utilities\TaggedCollections.fsi - - - Utilities\TaggedCollections.fs - - - Utilities\FileSystem.fsi - - - Utilities\FileSystem.fs - - - Utilities\ildiag.fsi - - - Utilities\ildiag.fs - - - Utilities\illib.fsi - - - Utilities\illib.fs - - - Utilities\filename.fsi - - - Utilities\filename.fs - - - Utilities\zmap.fsi - - - Utilities\zmap.fs - - - Utilities\zset.fsi - - - Utilities\zset.fs - - - Utilities\bytes.fsi - - - Utilities\bytes.fs - - - Utilities\XmlAdapters.fsi - - - Utilities\XmlAdapters.fs - - - Utilities\InternalCollections.fsi - - - Utilities\InternalCollections.fs - - - Utilities\QueueList.fsi - - - Utilities\QueueList.fs - - - Utilities\lib.fsi - - - Utilities\lib.fs - - - Utilities\rational.fsi - - - Utilities\rational.fs - - - Utilities\PathMap.fsi - - - Utilities\PathMap.fs - - - ErrorLogging\range.fsi - - - ErrorLogging\range.fs - - - ErrorLogging\Diagnostics.fsi - - - ErrorLogging\Diagnostics.fs - - - ErrorLogging\TextLayoutRender.fsi - - - ErrorLogging\TextLayoutRender.fs - - - ErrorLogging\ErrorLogger.fsi - - - ErrorLogging\ErrorLogger.fs - - - ErrorLogging\ErrorResolutionHints.fsi - - - ErrorLogging\ErrorResolutionHints.fs - - - --unicode --lexlib Internal.Utilities.Text.Lexing - AbsIL\illex.fsl - - - AbsIL\FsLex\illex.fsl - - - --module FSharp.Compiler.AbstractIL.Internal.AsciiParser --open FSharp.Compiler.AbstractIL --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing - AbsIL\ilpars.fsy - - - AbsIL\FsYacc\ilpars.fsy - - - AbsIL\il.fsi - - - AbsIL\il.fs - - - AbsIL\ilx.fsi - - - AbsIL\ilx.fs - - - AbsIL\ilascii.fsi - - - AbsIL\ilascii.fs - - - AbsIL\FsYaccOut\ilpars.fs - - - AbsIL\FsLexOut\illex.fs - - - AbsIL\ilprint.fsi - - - AbsIL\ilprint.fs - - - AbsIL\ilmorph.fsi - - - AbsIL\ilmorph.fs - - - AbsIL\ilsign.fsi - - - AbsIL\ilsign.fs - - - AbsIL\ilnativeres.fsi - - - AbsIL\ilnativeres.fs - - - AbsIL\ilsupp.fsi - - - AbsIL\ilsupp.fs - - - AbsIL\ilbinary.fsi - - - AbsIL\ilbinary.fs - - - AbsIL\ilread.fsi - - - AbsIL\ilread.fs - - - AbsIL\ilwritepdb.fsi - - - AbsIL\ilwritepdb.fs - - - AbsIL\ilwrite.fsi - - - AbsIL\ilwrite.fs - - - AbsIL\ilreflect.fsi - - - AbsIL\ilreflect.fs - - - ReferenceResolution\ReferenceResolver.fsi - - - ReferenceResolution\ReferenceResolver.fs - - - - ReferenceResolution/LegacyMSBuildReferenceResolver.fsi - - - ReferenceResolution/LegacyMSBuildReferenceResolver.fs - - - - ReferenceResolution/SimulatedMSBuildReferenceResolver.fsi - - - ReferenceResolution/SimulatedMSBuildReferenceResolver.fs - - - - CompilerLocation\CompilerLocationUtils.fsi - - - CompilerLocation\CompilerLocationUtils.fs - - - PrettyNaming\PrettyNaming.fsi - - - PrettyNaming\PrettyNaming.fs - - - ILXErase\ilxsettings.fs - - - ILXErase\EraseClosures.fsi - - - ILXErase\EraseClosures.fs - - - ILXErase\EraseUnions.fsi - - - ILXErase\EraseUnions.fs - - - --unicode --lexlib Internal.Utilities.Text.Lexing - ParserAndUntypedAST\pplex.fsl - - - --module FSharp.Compiler.PPParser --open FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing - ParserAndUntypedAST\pppars.fsy - - - --unicode --lexlib Internal.Utilities.Text.Lexing - ParserAndUntypedAST\lex.fsl - - - --module FSharp.Compiler.Parser --open FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing - ParserAndUntypedAST\pars.fsy - - - ParserAndUntypedAST\FsLex\pplex.fsl - - - ParserAndUntypedAST\FsLex\lex.fsl - - - ParserAndUntypedAST\FsYacc\pppars.fsy - - - ParserAndUntypedAST\FsYacc\pars.fsy - - - ParserAndUntypedAST\UnicodeLexing.fsi - - - ParserAndUntypedAST\UnicodeLexing.fs - - - ParserAndUntypedAST\XmlDoc.fsi - - - ParserAndUntypedAST\XmlDoc.fs - - - ParserAndUntypedAST\SyntaxTree.fs - - - ParserAndUntypedAST\SyntaxTreeOps.fsi - - - ParserAndUntypedAST\SyntaxTreeOps.fs - - - ParserAndUntypedAST\ParseHelpers.fsi - - - ParserAndUntypedAST\ParseHelpers.fs - - - ParserAndUntypedAST\FsYaccOutput\pppars.fs - - - ParserAndUntypedAST\FsYaccOutput\pars.fs - - - ParserAndUntypedAST\lexhelp.fsi - - - ParserAndUntypedAST\lexhelp.fs - - - ParserAndUntypedAST\FsLexOutput\pplex.fs - - - ParserAndUntypedAST\FsLexOutput\lex.fs - - - ParserAndUntypedAST\LexFilter.fsi - - - ParserAndUntypedAST\LexFilter.fs - - - TypedTree\tainted.fsi - - - TypedTree\tainted.fs - - - TypedTree\ExtensionTyping.fsi - - - TypedTree\ExtensionTyping.fs - - - TypedTree\QuotationPickler.fsi - - - TypedTree\QuotationPickler.fs - - - TypedTree\CompilerGlobalState.fsi - - - TypedTree\CompilerGlobalState.fs - - - TypedTree\TypedTree.fs - - - TypedTree\TypedTreeBasics.fsi - - - TypedTree\TypedTreeBasics.fs - - - TypedTree\TcGlobals.fs - - - TypedTree\TypedTreeOps.fsi - - - TypedTree\TypedTreeOps.fs - - - TypedTree\TypedTreePickle.fsi - - - TypedTree\TypedTreePickle.fs - - - Logic\import.fsi - - - Logic\import.fs - - - Logic\infos.fsi - - - Logic\infos.fs - - - Logic\AccessibilityLogic.fsi - - - Logic\AccessibilityLogic.fs - - - Logic\AttributeChecking.fsi - - - Logic\AttributeChecking.fs - - - Logic\TypeRelations.fsi - - - Logic\TypeRelations.fs - - - Logic\InfoReader.fsi - - - Logic\InfoReader.fs - - - Logic\NicePrint.fsi - - - Logic\NicePrint.fs - - - Logic\AugmentWithHashCompare.fsi - - - Logic\AugmentWithHashCompare.fs - - - Logic\NameResolution.fsi - - - Logic\NameResolution.fs - - - Logic\SignatureConformance.fsi - - - Logic\SignatureConformance.fs - - - Logic\MethodOverrides.fsi - - - Logic\MethodOverrides.fs - - - Logic\MethodCalls.fsi - - - Logic\MethodCalls.fs - - - Logic\PatternMatchCompilation.fsi - - - Logic\PatternMatchCompilation.fs - - - Logic\ConstraintSolver.fsi - - - Logic\ConstraintSolver.fs - - - Logic\CheckFormatStrings.fsi - - - Logic\CheckFormatStrings.fs - - - Logic\FindUnsolved.fsi - - - Logic\FindUnsolved.fs - - - Logic\QuotationTranslator.fsi - - - Logic\QuotationTranslator.fs - - - Logic\PostInferenceChecks.fsi - - - Logic\PostInferenceChecks.fs - - - Logic\CheckExpressions.fsi - - - Logic\CheckExpressions.fs - - - Logic\CheckComputationExpressions.fsi - - - Logic\CheckComputationExpressions.fs - - - Logic\CheckDeclarations.fsi - - - Logic\CheckDeclarations.fs - - - Optimize\Optimizer.fsi - - - Optimize\Optimizer.fs - - - Optimize\DetupleArgs.fsi - - - Optimize\DetupleArgs.fs - - - Optimize\InnerLambdasToTopLevelFuncs.fsi - - - Optimize\InnerLambdasToTopLevelFuncs.fs - - - Optimize\LowerCallsAndSeqs.fsi - - - Optimize\LowerCallsAndSeqs.fs - - - Optimize\autobox.fsi - - - Optimize\autobox.fs - - - CodeGen\IlxGen.fsi - - - CodeGen\IlxGen.fs - - - Driver\FxResolver.fs - - - Driver\CompilerConfig.fsi - - - Driver\CompilerConfig.fs - - - Driver\CompilerImports.fsi - - - Driver\CompilerImports.fs - - - Driver\CompilerDiagnostics.fsi - - - Driver\CompilerDiagnostics.fs - - - Driver\ParseAndCheckInputs.fsi - - - Driver\ParseAndCheckInputs.fs - - - Driver\ScriptClosure.fsi - - - Driver\ScriptClosure.fs - - - Driver\CompilerOptions.fsi - - - Driver\CompilerOptions.fs - - - Driver\OptimizeInputs.fsi - - - Driver\OptimizeInputs.fs - - - Driver\XmlDocFileWriter.fsi - - - Driver\XmlDocFileWriter.fs - - - Driver\BinaryResourceFormats.fsi - - - Driver\BinaryResourceFormats.fs - - - Driver\StaticLinking.fsi - - - Driver\StaticLinking.fs - - - Driver\CreateILModule.fsi - - - Driver\CreateILModule.fs - - - Driver\fsc.fsi - - - Driver\fsc.fs - - - - - Symbols/SymbolHelpers.fsi - - - Symbols/SymbolHelpers.fs - - - Symbols/Symbols.fsi - - - Symbols/Symbols.fs - - - Symbols/Exprs.fsi - - - Symbols/Exprs.fs - - - Symbols/SymbolPatterns.fsi - - - Symbols/SymbolPatterns.fs - - - Service/Reactor.fsi - - - Service/Reactor.fs - - - - - Service/SemanticClassification.fsi - - - Service/SemanticClassification.fs - - - Service/ItemKey.fsi - - - Service/ItemKey.fs - - - Service/IncrementalBuild.fsi - - - Service/IncrementalBuild.fs - - - Service/ServiceCompilerDiagnostics.fsi - - - Service/ServiceCompilerDiagnostics.fs - - - Service/ServiceConstants.fs - - - Service/ServiceDeclarationLists.fsi - - - Service/ServiceDeclarationLists.fs - - - Service/ServiceLexing.fsi - - - Service/ServiceLexing.fs - - - Service/ServiceParseTreeWalk.fsi - - - Service/ServiceParseTreeWalk.fs - - - Service/ServiceNavigation.fsi - - - Service/ServiceNavigation.fs - - - Service/ServiceParamInfoLocations.fsi - - - Service/ServiceParamInfoLocations.fs - - - Service/ServiceUntypedParse.fsi - - - Service/ServiceUntypedParse.fs - - - Service/ServiceAssemblyContent.fsi - - - Service/ServiceAssemblyContent.fs - - - Service/ServiceXmlDocParser.fsi - - - Service/ServiceXmlDocParser.fs - - - Service/ExternalSymbol.fsi - - - Service/ExternalSymbol.fs - - - Service/QuickParse.fsi - - - Service/QuickParse.fs - - - Service/FSharpCheckerResults.fsi - - - Service/FSharpCheckerResults.fs - - - Service/service.fsi - - - Service/service.fs - - - Service/ServiceErrorResolutionHints.fsi - - - Service/ServiceErrorResolutionHints.fs - - - Service/ServiceInterfaceStubGenerator.fsi - - - Service/ServiceInterfaceStubGenerator.fs - - - Service/ServiceStructure.fsi - - - Service/ServiceStructure.fs - - - Service/ServiceAnalysis.fsi - - - Service/ServiceAnalysis.fs - - - - - FSIstrings.txt - - - InteractiveSession/fsi.fsi - - - InteractiveSession/fsi.fs - - - - - Misc/LegacyHostedCompilerForTesting.fs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index 915015b4cbf..6326f51ccb0 100644 --- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -1,21 +1,47 @@ - + + - netstandard2.0 - $(NoWarn);44;62;69;65;54;61;75;62;9;2003;NU5125 + net472;netstandard2.0 + Library + $(NoWarn);44;45;54;55;61;62;69;65;75;1204;2003;NU5125 + FSharp.Compiler.Service true - $(DefineConstants);COMPILER_SERVICE_AS_DLL $(DefineConstants);COMPILER $(DefineConstants);ENABLE_MONO_SUPPORT - $(OtherFlags) /warnon:3218 /warnon:1182 /warnon:3390 --times - true - + $(OtherFlags) /warnon:3218 /warnon:1182 /warnon:3390 --maxerrors:20 --extraoptimizationloops:1 --times + true true + $(IntermediateOutputPath)$(TargetFramework)\ + $(IntermediateOutputPath)$(TargetFramework)\ + + $(IntermediateOutputPath)$(TargetFramework)\ $(IntermediateOutputPath)$(TargetFramework)\ + + + + + $(BaseOutputPath)\$(Configuration)\$(TargetFramework) + + + + + + + + + + + + + + + + FSharp.Compiler.Service FSharp.Compiler.Service.nuspec true @@ -57,6 +83,8 @@ + + @@ -257,10 +285,16 @@ --unicode --lexlib Internal.Utilities.Text.Lexing AbsIL\illex.fsl + + AbsIL\illex.fsl + --module FSharp.Compiler.AbstractIL.Internal.AsciiParser --open FSharp.Compiler.AbstractIL --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing AbsIL\ilpars.fsy + + AbsIL\FsYacc\ilpars.fsy + AbsIL\il.fsi @@ -279,6 +313,12 @@ AbsIL\ilascii.fs + + AbsIL\FsYaccOut\ilpars.fs + + + AbsIL\FsLexOut\illex.fs + AbsIL\ilprint.fsi @@ -309,12 +349,6 @@ AbsIL\ilsupp.fs - - AbsIL\FsYaccOut\ilpars.fs - - - AbsIL\FsLexOut\illex.fs - AbsIL\ilbinary.fsi @@ -351,6 +385,13 @@ ReferenceResolution\ReferenceResolver.fs + + + ReferenceResolution/LegacyMSBuildReferenceResolver.fsi + + + ReferenceResolution/LegacyMSBuildReferenceResolver.fs + ReferenceResolution/SimulatedMSBuildReferenceResolver.fsi @@ -401,6 +442,18 @@ --module FSharp.Compiler.Parser --open FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing ParserAndUntypedAST\pars.fsy + + ParserAndUntypedAST\FsLex\pplex.fsl + + + ParserAndUntypedAST\FsLex\lex.fsl + + + ParserAndUntypedAST\FsYacc\pppars.fsy + + + ParserAndUntypedAST\FsYacc\pars.fsy + ParserAndUntypedAST\UnicodeLexing.fsi @@ -441,9 +494,9 @@ ParserAndUntypedAST\lexhelp.fs - ParserAndUntypedAST\FsLexOutput\pplex.fsl + ParserAndUntypedAST\FsLexOutput\pplex.fs - + ParserAndUntypedAST\FsLexOutput\lex.fs @@ -918,6 +971,11 @@ InteractiveSession/fsi.fs + + + + Misc/LegacyHostedCompilerForTesting.fs + @@ -959,4 +1017,5 @@ + diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fs b/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fs index 3398c743a55..9879ef41502 100644 --- a/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fs +++ b/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fs @@ -293,7 +293,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr | null -> { new IDisposable with member _.Dispose() = () } | _ -> new AssemblyResolveHandler(assemblyProbingPaths) :> IDisposable - // Resolution Path = Location of FSharp.Compiler.Private.dll + // Resolution Path = Location of FSharp.Compiler.Service.dll let assemblySearchPaths = lazy ( [ let assemblyLocation = typeof.GetTypeInfo().Assembly.Location diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec index 3b9e6af39b4..65c303d9685 100644 --- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec +++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec @@ -50,7 +50,7 @@ - + @@ -69,7 +69,7 @@ - diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj index ad7fd4b4ede..2bda8c54ff2 100644 --- a/src/fsharp/fsc/fsc.fsproj +++ b/src/fsharp/fsc/fsc.fsproj @@ -34,7 +34,7 @@ - + diff --git a/src/fsharp/fscmain.fs b/src/fsharp/fscmain.fs index 6aeb5ada453..52ee5c03d21 100644 --- a/src/fsharp/fscmain.fs +++ b/src/fsharp/fscmain.fs @@ -15,7 +15,7 @@ open FSharp.Compiler.Driver open FSharp.Compiler.ErrorLogger open FSharp.Compiler.Text -[] +[] do () [] diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj index d8823c027b0..900a5fb4e30 100644 --- a/src/fsharp/fsi/fsi.fsproj +++ b/src/fsharp/fsi/fsi.fsproj @@ -31,12 +31,8 @@ - + - - - - diff --git a/src/fsharp/fsi/fsimain.fs b/src/fsharp/fsi/fsimain.fs index df6968265c4..38a56a0a2c4 100644 --- a/src/fsharp/fsi/fsimain.fs +++ b/src/fsharp/fsi/fsimain.fs @@ -31,7 +31,7 @@ open FSharp.Compiler.Interactive.Shell.Settings // Hardbinding dependencies should we NGEN fsi.exe -[] do () +[] do () [] do () // Standard attributes [] diff --git a/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj b/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj index d39051b414c..e80ed1da56b 100644 --- a/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj +++ b/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj @@ -30,7 +30,7 @@ - + diff --git a/src/fsharp/service/ServiceInterfaceStubGenerator.fs b/src/fsharp/service/ServiceInterfaceStubGenerator.fs index 278f31019f4..85b284773a4 100644 --- a/src/fsharp/service/ServiceInterfaceStubGenerator.fs +++ b/src/fsharp/service/ServiceInterfaceStubGenerator.fs @@ -12,8 +12,7 @@ open FSharp.Compiler.SyntaxTree open FSharp.Compiler.SyntaxTreeOps open FSharp.Compiler.Text open FSharp.Compiler.Text.Range - -#if !FX_NO_INDENTED_TEXT_WRITER + [] module internal CodeGenerationUtils = open System.IO @@ -928,4 +927,3 @@ module InterfaceStubGenerator = None | ParsedInput.ImplFile input -> walkImplFileInput input -#endif diff --git a/src/fsharp/service/ServiceInterfaceStubGenerator.fsi b/src/fsharp/service/ServiceInterfaceStubGenerator.fsi index 2009b444e21..a6f154f8430 100644 --- a/src/fsharp/service/ServiceInterfaceStubGenerator.fsi +++ b/src/fsharp/service/ServiceInterfaceStubGenerator.fsi @@ -6,8 +6,7 @@ open FSharp.Compiler open FSharp.Compiler.SourceCodeServices open FSharp.Compiler.SyntaxTree open FSharp.Compiler.Text - -#if !FX_NO_INDENTED_TEXT_WRITER + /// Capture information about an interface in ASTs [] type InterfaceData = @@ -39,4 +38,3 @@ module InterfaceStubGenerator = /// Find corresponding interface declaration at a given position val tryFindInterfaceDeclaration: pos -> parsedInput: ParsedInput -> InterfaceData option -#endif diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj index 62254811bc5..51f726c5b6a 100644 --- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj +++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj @@ -91,7 +91,7 @@ - + diff --git a/tests/FSharp.Compiler.Service.Tests/SurfaceArea.netstandard.fs b/tests/FSharp.Compiler.Service.Tests/SurfaceArea.netstandard.fs index 20a1eab5459..900c716c10d 100644 --- a/tests/FSharp.Compiler.Service.Tests/SurfaceArea.netstandard.fs +++ b/tests/FSharp.Compiler.Service.Tests/SurfaceArea.netstandard.fs @@ -1522,6 +1522,8 @@ FSharp.Compiler.Interactive.Shell: FSharp.Compiler.Interactive.Shell+FsiEvaluati FSharp.Compiler.Interactive.Shell: FSharp.Compiler.Interactive.Shell+FsiEvaluationSessionHostConfig FSharp.Compiler.Interactive.Shell: FSharp.Compiler.Interactive.Shell+FsiValue FSharp.Compiler.Interactive.Shell: FSharp.Compiler.Interactive.Shell+Settings +FSharp.Compiler.LegacyMSBuildReferenceResolver +FSharp.Compiler.LegacyMSBuildReferenceResolver: FSharp.Compiler.LegacyReferenceResolver getResolver() FSharp.Compiler.LegacyReferenceResolver FSharp.Compiler.SourceCodeServices.AssemblyContentProvider FSharp.Compiler.SourceCodeServices.AssemblyContentProvider: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SourceCodeServices.AssemblySymbol] getAssemblyContent(Microsoft.FSharp.Core.FSharpFunc`2[Microsoft.FSharp.Core.FSharpFunc`2[FSharp.Compiler.SourceCodeServices.IAssemblyContentCache,Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SourceCodeServices.AssemblySymbol]],Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SourceCodeServices.AssemblySymbol]], FSharp.Compiler.SourceCodeServices.AssemblyContentType, Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SourceCodeServices.FSharpAssembly]) @@ -4958,6 +4960,41 @@ FSharp.Compiler.SourceCodeServices.InsertContext: Int32 GetHashCode() FSharp.Compiler.SourceCodeServices.InsertContext: Int32 GetHashCode(System.Collections.IEqualityComparer) FSharp.Compiler.SourceCodeServices.InsertContext: System.String ToString() FSharp.Compiler.SourceCodeServices.InsertContext: Void .ctor(FSharp.Compiler.SourceCodeServices.ScopeKind, FSharp.Compiler.Text.Pos) +FSharp.Compiler.SourceCodeServices.InterfaceData +FSharp.Compiler.SourceCodeServices.InterfaceData+Interface: Microsoft.FSharp.Core.FSharpOption`1[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTree+SynMemberDefn]] Item2 +FSharp.Compiler.SourceCodeServices.InterfaceData+Interface: Microsoft.FSharp.Core.FSharpOption`1[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTree+SynMemberDefn]] get_Item2() +FSharp.Compiler.SourceCodeServices.InterfaceData+Interface: SynType Item1 +FSharp.Compiler.SourceCodeServices.InterfaceData+Interface: SynType get_Item1() +FSharp.Compiler.SourceCodeServices.InterfaceData+ObjExpr: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTree+SynBinding] Item2 +FSharp.Compiler.SourceCodeServices.InterfaceData+ObjExpr: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTree+SynBinding] get_Item2() +FSharp.Compiler.SourceCodeServices.InterfaceData+ObjExpr: SynType Item1 +FSharp.Compiler.SourceCodeServices.InterfaceData+ObjExpr: SynType get_Item1() +FSharp.Compiler.SourceCodeServices.InterfaceData+Tags: Int32 Interface +FSharp.Compiler.SourceCodeServices.InterfaceData+Tags: Int32 ObjExpr +FSharp.Compiler.SourceCodeServices.InterfaceData: Boolean IsInterface +FSharp.Compiler.SourceCodeServices.InterfaceData: Boolean IsObjExpr +FSharp.Compiler.SourceCodeServices.InterfaceData: Boolean get_IsInterface() +FSharp.Compiler.SourceCodeServices.InterfaceData: Boolean get_IsObjExpr() +FSharp.Compiler.SourceCodeServices.InterfaceData: FSharp.Compiler.SourceCodeServices.InterfaceData NewInterface(SynType, Microsoft.FSharp.Core.FSharpOption`1[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTree+SynMemberDefn]]) +FSharp.Compiler.SourceCodeServices.InterfaceData: FSharp.Compiler.SourceCodeServices.InterfaceData NewObjExpr(SynType, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.SyntaxTree+SynBinding]) +FSharp.Compiler.SourceCodeServices.InterfaceData: FSharp.Compiler.SourceCodeServices.InterfaceData+Interface +FSharp.Compiler.SourceCodeServices.InterfaceData: FSharp.Compiler.SourceCodeServices.InterfaceData+ObjExpr +FSharp.Compiler.SourceCodeServices.InterfaceData: FSharp.Compiler.SourceCodeServices.InterfaceData+Tags +FSharp.Compiler.SourceCodeServices.InterfaceData: FSharp.Compiler.Text.Range Range +FSharp.Compiler.SourceCodeServices.InterfaceData: FSharp.Compiler.Text.Range get_Range() +FSharp.Compiler.SourceCodeServices.InterfaceData: Int32 Tag +FSharp.Compiler.SourceCodeServices.InterfaceData: Int32 get_Tag() +FSharp.Compiler.SourceCodeServices.InterfaceData: System.String ToString() +FSharp.Compiler.SourceCodeServices.InterfaceData: System.String[] TypeParameters +FSharp.Compiler.SourceCodeServices.InterfaceData: System.String[] get_TypeParameters() +FSharp.Compiler.SourceCodeServices.InterfaceStubGenerator +FSharp.Compiler.SourceCodeServices.InterfaceStubGenerator: Boolean hasNoInterfaceMember(FSharp.Compiler.SourceCodeServices.FSharpEntity) +FSharp.Compiler.SourceCodeServices.InterfaceStubGenerator: Boolean isInterface(FSharp.Compiler.SourceCodeServices.FSharpEntity) +FSharp.Compiler.SourceCodeServices.InterfaceStubGenerator: Microsoft.FSharp.Collections.FSharpList`1[System.Tuple`2[System.String,FSharp.Compiler.Text.Range]] getMemberNameAndRanges(FSharp.Compiler.SourceCodeServices.InterfaceData) +FSharp.Compiler.SourceCodeServices.InterfaceStubGenerator: Microsoft.FSharp.Control.FSharpAsync`1[Microsoft.FSharp.Collections.FSharpSet`1[System.String]] getImplementedMemberSignatures(Microsoft.FSharp.Core.FSharpFunc`2[System.Tuple`2[System.String,FSharp.Compiler.Text.Range],Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.SourceCodeServices.FSharpSymbolUse]], FSharp.Compiler.SourceCodeServices.FSharpDisplayContext, FSharp.Compiler.SourceCodeServices.InterfaceData) +FSharp.Compiler.SourceCodeServices.InterfaceStubGenerator: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.SourceCodeServices.InterfaceData] tryFindInterfaceDeclaration(FSharp.Compiler.Text.Pos, ParsedInput) +FSharp.Compiler.SourceCodeServices.InterfaceStubGenerator: System.Collections.Generic.IEnumerable`1[System.Tuple`2[FSharp.Compiler.SourceCodeServices.FSharpMemberOrFunctionOrValue,System.Collections.Generic.IEnumerable`1[System.Tuple`2[FSharp.Compiler.SourceCodeServices.FSharpGenericParameter,FSharp.Compiler.SourceCodeServices.FSharpType]]]] getInterfaceMembers(FSharp.Compiler.SourceCodeServices.FSharpEntity) +FSharp.Compiler.SourceCodeServices.InterfaceStubGenerator: System.String formatInterface(Int32, Int32, System.String[], System.String, System.String, FSharp.Compiler.SourceCodeServices.FSharpDisplayContext, Microsoft.FSharp.Collections.FSharpSet`1[System.String], FSharp.Compiler.SourceCodeServices.FSharpEntity, Boolean) FSharp.Compiler.SourceCodeServices.LookupType FSharp.Compiler.SourceCodeServices.LookupType+Tags: Int32 Fuzzy FSharp.Compiler.SourceCodeServices.LookupType+Tags: Int32 Precise diff --git a/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj b/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj index 996ee46b4a3..193e98123e7 100644 --- a/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj +++ b/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj @@ -79,7 +79,7 @@ - + diff --git a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj index 0bfdf0255f4..504caaa6796 100644 --- a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj +++ b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj @@ -31,7 +31,7 @@ Make sure they are getting built with the Utilities. --> - + diff --git a/tests/fsharp/FSharpSuite.Tests.fsproj b/tests/fsharp/FSharpSuite.Tests.fsproj index c67895f0e24..fe433e35f2c 100644 --- a/tests/fsharp/FSharpSuite.Tests.fsproj +++ b/tests/fsharp/FSharpSuite.Tests.fsproj @@ -87,7 +87,7 @@ - + diff --git a/tests/fsharpqa/testenv/bin/KnownFailRewriter.fsx b/tests/fsharpqa/testenv/bin/KnownFailRewriter.fsx index df8ec8f2ad8..e2a5ebfb331 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.Private.dll") + let path = System.IO.Path.Combine( o :?> string, "FSharp.Compiler.Service.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 f89e94f3e05..9dd20258416 100644 --- a/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj +++ b/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj @@ -19,7 +19,7 @@ - + diff --git a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest index ddefbd74b71..fa140b9ba55 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 909788af067..eec721f744c 100644 --- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj +++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj @@ -66,9 +66,9 @@ True TargetFramework=$(DependencyTargetFramework) - - {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} - FSharp.Compiler.Private + + {A59DB8AE-8044-41A5-848A-800A7FF31C93} + FSharp.Compiler.Service BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b DebugSymbolsProjectOutputGroup%3b true @@ -77,26 +77,6 @@ True TargetFramework=$(DependencyTargetFramework) - - FSharp.DependencyManager.Nuget - BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b - DebugSymbolsProjectOutputGroup%3b - true - All - 2 - True - TargetFramework=netstandard2.0 - - - Microsoft.DotNet.DependencyManager - BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b - DebugSymbolsProjectOutputGroup%3b - true - All - 2 - True - TargetFramework=netstandard2.0 - {DED3BBD7-53F4-428A-8C9F-27968E768605} FSharp.Core diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index f9667f0bb22..474b952c478 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -126,7 +126,7 @@ - + diff --git a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj index 9396c8c41b7..f1c0a01c586 100644 --- a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj +++ b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj @@ -41,7 +41,7 @@ - + diff --git a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj index 7692f24fcb1..d88f68bb7a7 100644 --- a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj +++ b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj @@ -47,7 +47,7 @@ - + diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj index 8408b7a2989..a027b115110 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj @@ -79,9 +79,9 @@ $PackageFolder$\FSharp.ProjectSystem.FSharp.dll - FSharp.Compiler.Private - $(FSProductVersion) - $PackageFolder$\FSharp.Compiler.Private.dll + FSharp.Compiler.Service + $(FSharpCompilerServiceVersion) + $PackageFolder$\FSharp.Compiler.Service.dll FSharp.Compiler.Server.Shared @@ -104,7 +104,7 @@ - + diff --git a/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj b/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj index 7df8e60ebd3..d1079f44b01 100644 --- a/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj +++ b/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj @@ -45,8 +45,8 @@ - - + + @@ -75,7 +75,7 @@ - + diff --git a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj index c3473e7b184..afda8489615 100644 --- a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj +++ b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj @@ -33,7 +33,7 @@ - + diff --git a/vsintegration/tests/UnitTests/CompletionProviderTests.fs b/vsintegration/tests/UnitTests/CompletionProviderTests.fs index fcf0865c41b..9fbbfc82637 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.Private.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.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 cff60a98ee0..c370a3cf315 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.Private.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.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.Private.dll which has a public API +// Use F# Interactive. This only works for FSharp.Compiler.Service.dll which has a public API // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. [] diff --git a/vsintegration/tests/UnitTests/FsxCompletionProviderTests.fs b/vsintegration/tests/UnitTests/FsxCompletionProviderTests.fs index 27b8de5cc7b..7530bf46ec8 100644 --- a/vsintegration/tests/UnitTests/FsxCompletionProviderTests.fs +++ b/vsintegration/tests/UnitTests/FsxCompletionProviderTests.fs @@ -10,7 +10,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.Private.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\FsxCompletionProviderTests.fs + .\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\FsxCompletionProviderTests.fs .\VisualFSharp.UnitTests.exe *) // Technique 3: diff --git a/vsintegration/tests/UnitTests/GoToDefinitionServiceTests.fs b/vsintegration/tests/UnitTests/GoToDefinitionServiceTests.fs index 11f5ba78c07..7d577ae0607 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.Private.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.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.Private.dll which has a public API +// Use F# Interactive. This only works for FSharp.Compiler.Service.dll which has a public API namespace Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs index ec5f5f29188..bb6d75df47b 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs @@ -1345,8 +1345,8 @@ type UsingMSBuild() as this = %s\\FSharp.Compiler.Interactive.Settings.dll - - %s\\FSharp.Compiler.Private.dll + + %s\\FSharp.Compiler.Service.dll " binariesFolder binariesFolder) diff --git a/vsintegration/tests/UnitTests/QuickInfoProviderTests.fs b/vsintegration/tests/UnitTests/QuickInfoProviderTests.fs index 5b498a67075..8c4eabc9b66 100644 --- a/vsintegration/tests/UnitTests/QuickInfoProviderTests.fs +++ b/vsintegration/tests/UnitTests/QuickInfoProviderTests.fs @@ -14,12 +14,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.Private.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.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.Private.dll which has a public API +// Use F# Interactive. This only works for FSharp.Compiler.Service.dll which has a public API // // ------------------------------------------------------------------------------------------------------------------------ diff --git a/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs b/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs index ed365c6142d..b46d60d9725 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.Private.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.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.Private.dll which has a public API +// Use F# Interactive. This only works for FSharp.Compiler.Service.dll which has a public API [] module Microsoft.VisualStudio.FSharp.Editor.Tests.Roslyn.SignatureHelpProvider diff --git a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj index 9ffc92b6f09..d2161ed8a4b 100644 --- a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj +++ b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj @@ -124,7 +124,7 @@ - + diff --git a/vsintegration/update-vsintegration.cmd b/vsintegration/update-vsintegration.cmd index c4a4471e109..3a7da14f77d 100644 --- a/vsintegration/update-vsintegration.cmd +++ b/vsintegration/update-vsintegration.cmd @@ -216,7 +216,7 @@ if "!BIN_AVAILABLE!" == "true" ( CALL :backupAndOrCopy fsc.exe "!COMPILERSDKPATH!" CALL :backupAndOrCopy fsc.exe.config "%COMPILERSDKPATH%" CALL :backupAndOrCopy FSharp.Build.dll "%COMPILERSDKPATH%" - CALL :backupAndOrCopy FSharp.Compiler.Private.dll "%COMPILERSDKPATH%" + CALL :backupAndOrCopy FSharp.Compiler.Service.dll "%COMPILERSDKPATH%" CALL :backupAndOrCopy FSharp.Compiler.Interactive.Settings.dll "%COMPILERSDKPATH%" CALL :backupAndOrCopy fsi.exe "%COMPILERSDKPATH%" CALL :backupAndOrCopy fsi.exe.config "%COMPILERSDKPATH%" From d3b67a06e7174d60681fb09039c075451577c3ff Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Thu, 14 Jan 2021 22:52:03 -0800 Subject: [PATCH 2/2] Tweak ngen --- src/fsharp/FSharp.Build/FSharp.Build.fsproj | 1 - .../FSharp.Compiler.Interactive.Settings.fsproj | 1 - .../FSharp.Compiler.Server.Shared.fsproj | 1 - .../FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj | 1 - .../testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj | 1 + 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index 3d36804a7a8..91d95379a48 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -10,7 +10,6 @@ $(NoWarn);45;55;62;75;1204 true $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 - true $(DefineConstants);LOCALIZATION_FSBUILD NU1701;FS0075 true diff --git a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj index 1f568805b13..6238ce79e8c 100644 --- a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj +++ b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj @@ -9,7 +9,6 @@ $(NoWarn);45;55;62;75;1182;1204 true $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 - true diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj index 75a7353bb96..8241f891960 100644 --- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj +++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj @@ -3,7 +3,6 @@ - true net472 FSharp.Compiler.Server.Shared true diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index 6326f51ccb0..d093302b70e 100644 --- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -12,7 +12,6 @@ $(DefineConstants);ENABLE_MONO_SUPPORT $(OtherFlags) /warnon:3218 /warnon:1182 /warnon:3390 --maxerrors:20 --extraoptimizationloops:1 --times true - true $(IntermediateOutputPath)$(TargetFramework)\ $(IntermediateOutputPath)$(TargetFramework)\ diff --git a/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj b/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj index 9dd20258416..d86f33fd995 100644 --- a/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj +++ b/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj @@ -10,6 +10,7 @@ $(RepoRoot)tests\fsharpqa\testenv\bin AnyCPU true + true