Refactor vsix (#11159)

DEVGUIDE.md

@@ -122,7 +122,7 @@ See (DEVGUIDE.md#Developing on Windows) for instructions to install what is need
 
 ### Quickly see your changes locally
 
-First, ensure that `VisualFSharpFull` is the startup project.
+First, ensure that `VisualFSharpDebug` is the startup project.
 
 Then, use the **f5** or **ctrl+f5** keyboard shortcuts to test your tooling changes. The former will debug a new instance of Visual Studio. The latter will launch a new instance of Visual Studio, but with your changes installed.
 
@@ -136,7 +136,7 @@ If you'd like to "run with your changes", you can produce a VSIX and install it
 
 ```
 VSIXInstaller.exe /u:"VisualFSharp"
-VSIXInstaller.exe artifacts\VSSetup\Release\VisualFSharpFull.vsix
+VSIXInstaller.exe artifacts\VSSetup\Release\VisualFSharpDebug.vsix
 ```
 
 It's important to use `Release` if you want to see if your changes have had a noticeable performance impact.

VisualFSharp.sln

@@ -158,6 +158,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Service", "
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Service.Tests", "tests\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj", "{14F3D3D6-5C8E-43C2-98A2-17EA704D4DEA}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VisualFSharpDebug", "vsintegration\Vsix\VisualFSharpFull\VisualFSharpDebug.csproj", "{A422D673-8E3B-4924-821B-DD3174173426}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -924,6 +926,18 @@ Global
 		{14F3D3D6-5C8E-43C2-98A2-17EA704D4DEA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{14F3D3D6-5C8E-43C2-98A2-17EA704D4DEA}.Release|x86.ActiveCfg = Release|Any CPU
 		{14F3D3D6-5C8E-43C2-98A2-17EA704D4DEA}.Release|x86.Build.0 = Release|Any CPU
+		{A422D673-8E3B-4924-821B-DD3174173426}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A422D673-8E3B-4924-821B-DD3174173426}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A422D673-8E3B-4924-821B-DD3174173426}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A422D673-8E3B-4924-821B-DD3174173426}.Debug|x86.Build.0 = Debug|Any CPU
+		{A422D673-8E3B-4924-821B-DD3174173426}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
+		{A422D673-8E3B-4924-821B-DD3174173426}.Proto|Any CPU.Build.0 = Debug|Any CPU
+		{A422D673-8E3B-4924-821B-DD3174173426}.Proto|x86.ActiveCfg = Debug|Any CPU
+		{A422D673-8E3B-4924-821B-DD3174173426}.Proto|x86.Build.0 = Debug|Any CPU
+		{A422D673-8E3B-4924-821B-DD3174173426}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A422D673-8E3B-4924-821B-DD3174173426}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A422D673-8E3B-4924-821B-DD3174173426}.Release|x86.ActiveCfg = Release|Any CPU
+		{A422D673-8E3B-4924-821B-DD3174173426}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -998,6 +1012,7 @@ Global
 		{0610FB97-7C15-422A-86FD-32335C6DF14D} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
 		{B5A9BBD9-2F45-4722-A6CA-BAE3C64CD4E2} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
 		{14F3D3D6-5C8E-43C2-98A2-17EA704D4DEA} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
+		{A422D673-8E3B-4924-821B-DD3174173426} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {48EDBBBE-C8EE-4E3C-8B19-97184A487B37}

azure-pipelines.yml

@@ -156,7 +156,7 @@ stages:
           - task: PublishBuildArtifacts@1
             displayName: Publish Artifact Nightly
             inputs:
-              PathtoPublish: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(_BuildConfig)\VisualFSharpFull.vsix'
+              PathtoPublish: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(_BuildConfig)\VisualFSharpDebug.vsix'
               ArtifactName: 'Nightly'
             condition: succeeded()
           - task: PublishBuildArtifacts@1

setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj

@@ -41,11 +41,11 @@
     <PropertyGroup>
       <_Line>
 <![CDATA[
-folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\%(_XlfLanguages.Identity)"
-  file source="$(ArtifactsBinDir)FSharp.Build\$(Configuration)\netstandard2.0\%(_XlfLanguages.Identity)\FSharp.Build.resources.dll"
-  file source="$(ArtifactsBinDir)FSharp.Compiler.Interactive.Settings\$(Configuration)\netstandard2.0\%(_XlfLanguages.Identity)\FSharp.Compiler.Interactive.Settings.resources.dll"
-  file source="$(ArtifactsBinDir)FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\%(_XlfLanguages.Identity)\FSharp.Compiler.Service.resources.dll"
-  file source="$(ArtifactsBinDir)FSharp.Core\$(Configuration)\netstandard2.0\%(_XlfLanguages.Identity)\FSharp.Core.resources.dll"
+folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools\%(_XlfLanguages.Identity)"
+  file source="$(BinariesFolder)FSharp.Build\$(Configuration)\netstandard2.0\%(_XlfLanguages.Identity)\FSharp.Build.resources.dll"
+  file source="$(BinariesFolder)FSharp.Compiler.Interactive.Settings\$(Configuration)\netstandard2.0\%(_XlfLanguages.Identity)\FSharp.Compiler.Interactive.Settings.resources.dll"
+  file source="$(BinariesFolder)FSharp.Compiler.Service\$(Configuration)\$(TargetFramework)\%(_XlfLanguages.Identity)\FSharp.Compiler.Service.resources.dll"
+  file source="$(BinariesFolder)FSharp.Core\$(Configuration)\netstandard2.0\%(_XlfLanguages.Identity)\FSharp.Core.resources.dll"
 ]]>
       </_Line>
     </PropertyGroup>
@@ -74,35 +74,37 @@ vs.dependencies
                 version=$(VsixVersion)
                 type=Required
 
-folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp"
-  file source="$(BinariesFolder)\fsc\$(Configuration)\$(TargetFramework)\fsc.exe" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2 vs.file.ngenApplication="[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe"
-  file source="$(BinariesFolder)\fsc\$(Configuration)\$(TargetFramework)\fsc.exe.config"
-  file source="$(BinariesFolder)\fsi\$(Configuration)\$(TargetFramework)\fsi.exe" vs.file.ngen=yes vs.file.ngenArchitecture=X86 vs.file.ngenPriority=2 vs.file.ngenApplication="[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsi.exe"
-  file source="$(BinariesFolder)\fsi\$(Configuration)\$(TargetFramework)\fsi.exe.config"
-  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.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"
-  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\netstandard2.0\FSharp.Build.dll" vs.file.ngen=no vs.file.ngenArchitecture=All vs.file.ngenPriority=2
-  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\netstandard2.0\Microsoft.Portable.FSharp.Targets"
-  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\netstandard2.0\Microsoft.FSharp.NetSdk.props"
-  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"
+folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools"
+  file source="$(BinariesFolder)fsc\$(Configuration)\$(TargetFramework)\fsc.exe" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2 vs.file.ngenApplication="[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools\fsc.exe"
+  file source="$(BinariesFolder)fsc\$(Configuration)\$(TargetFramework)\fsc.exe.config"
+  file source="$(BinariesFolder)fsi\$(Configuration)\$(TargetFramework)\fsi.exe" vs.file.ngen=yes vs.file.ngenArchitecture=X86 vs.file.ngenPriority=2 vs.file.ngenApplication="[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools\fsi.exe"
+  file source="$(BinariesFolder)fsi\$(Configuration)\$(TargetFramework)\fsi.exe.config"
+  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\Tools\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.Interactive.Settings\$(Configuration)\netstandard2.0\FSharp.Compiler.Interactive.Settings.xml"
+  file source="$(BinariesFolder)FSharp.Compiler.Service\$(Configuration)\netstandard2.0\FSharp.Compiler.Service.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
+  file source="$(BinariesFolder)FSharp.Compiler.Service\$(Configuration)\netstandard2.0\FSharp.Compiler.Service.xml"
+  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"
+  file source="$(BinariesFolder)FSharp.Build\$(Configuration)\netstandard2.0\FSharp.Build.dll" vs.file.ngen=no vs.file.ngenArchitecture=All vs.file.ngenPriority=2
+  file source="$(BinariesFolder)FSharp.Build\$(Configuration)\netstandard2.0\Microsoft.Portable.FSharp.Targets"
+  file source="$(BinariesFolder)FSharp.Build\$(Configuration)\netstandard2.0\Microsoft.FSharp.NetSdk.props"
+  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"
 
 @(_BuiltSwrLines)
 ]]>

setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj

@@ -31,8 +31,7 @@
     <_Dependency Include="FSharp.VS.FSI" Version="$(VSAssemblyVersion)" />
   </ItemGroup>
 
-  <Target Name="GenerateDependentAssemblyVersions"
-          AfterTargets="Build">
+  <Target Name="GenerateDependentAssemblyVersions" AfterTargets="Build">
     <PropertyGroup>
       <DevDivPackagesDir>$(InsertionDir)\DevDivPackages</DevDivPackagesDir>
       <DependentAssemblyVersionsFile>$(DevDivPackagesDir)\DependentAssemblyVersions.csv</DependentAssemblyVersionsFile>
@@ -46,4 +45,4 @@
     </ItemGroup>
   </Target>
 
-</Project>
+</Project>

setup/Swix/Microsoft.FSharp.IDE/Package.swr

@@ -8,6 +8,10 @@ vs.dependencies
                 version=$(VsixVersion)
                 type=Required
 
+  vs.dependency id=Microsoft.FSharp.Compiler
+                version=$(VsixVersion)
+                type=Required
+
   vs.dependency id=Microsoft.FSharp.VSIX.Full.Core
                 version=$(VsixVersion)
                 type=Required
@@ -20,4 +24,4 @@ folder "InstallDir:Common7\IDE\NewScriptItems"
 folder "InstallDir:Common7\IDE\NewFileItems"
   file source="$(SetupResourcesDir)\NewFileDialog\General\NewFSharpFileItems.vsdir"
   file source="$(SetupResourcesDir)\NewFileDialog\General\File.fs"
-  file source="$(SetupResourcesDir)\NewFileDialog\General\Script.fsx"
+  file source="$(SetupResourcesDir)\NewFileDialog\General\Script.fsx"

setup/shims/Microsoft.FSharp.NetSdk.Shim.props

@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Condition="'$(FSharpCompilerPath)' != ''" Project="$(FSharpCompilerPath)\Microsoft.FSharp.NetSdk.props" />
-  <Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.NetSdk.props" />
+  <Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools\Microsoft.FSharp.NetSdk.props" />
 
 </Project>

setup/shims/Microsoft.FSharp.NetSdk.Shim.targets

@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Condition="'$(FSharpCompilerPath)' != ''" Project="$(FSharpCompilerPath)\Microsoft.FSharp.NetSdk.targets" />
-  <Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.NetSdk.targets" />
+  <Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools\Microsoft.FSharp.NetSdk.targets" />
 
 </Project>

setup/shims/Microsoft.FSharp.Overrides.NetSdk.Shim.targets

@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Condition="'$(FSharpCompilerPath)' != ''" Project="$(FSharpCompilerPath)\Microsoft.FSharp.Overrides.NetSdk.targets" />
-  <Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.Overrides.NetSdk.targets" />
+  <Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools\Microsoft.FSharp.Overrides.NetSdk.targets" />
 
 </Project>

setup/shims/Microsoft.FSharp.Shim.targets

@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Condition="'$(FSharpCompilerPath)' != ''" Project="$(FSharpCompilerPath)\Microsoft.FSharp.targets" />
-  <Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.FSharp.targets" />
+  <Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools\Microsoft.FSharp.targets" />
 
 </Project>

setup/shims/Microsoft.Portable.FSharp.Shim.targets

@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Condition="'$(FSharpCompilerPath)' != ''" Project="$(FSharpCompilerPath)\Microsoft.Portable.FSharp.targets" />
-  <Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Microsoft.Portable.FSharp.targets" />
+  <Import Condition="'$(FSharpCompilerPath)' == ''" Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools\Microsoft.Portable.FSharp.targets" />
 
 </Project>

src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

@@ -21,25 +21,6 @@
     <FsLexOutputFolder>$(IntermediateOutputPath)$(TargetFramework)\</FsLexOutputFolder>
   </PropertyGroup>
 
-  <Target Name="CopyToBuiltBin" BeforeTargets="BuiltProjectOutputGroup" AfterTargets="CoreCompile">
-    <PropertyGroup>
-      <BuildOutputGroupLocation>$(BaseOutputPath)\$(Configuration)\$(TargetFramework)</BuildOutputGroupLocation>
-    </PropertyGroup>
-    <ItemGroup>
-      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\Microsoft.Build.Framework.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\Microsoft.Build.Utilities.Core.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\Microsoft.Build.Tasks.Core.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.Buffers.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.Collections.Immutable.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.Memory.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.Numerics.Vectors.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.Reflection.Metadata.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.Resources.Extensions.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.Runtime.CompilerServices.Unsafe.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.Threading.Tasks.Dataflow.dll" />
-    </ItemGroup>
-  </Target>
-
   <PropertyGroup>
     <PackageId>FSharp.Compiler.Service</PackageId>
     <NuspecFile>FSharp.Compiler.Service.nuspec</NuspecFile>