diff --git a/.gitignore b/.gitignore
index 9ab09dfa936..28d53ff4e47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,7 @@
-# Downloaded packages and build tools.
-/lkg
-/packages
-/Tools
+# output location
+artifacts/
 
 /tests/scripts/current
-/release
-/debug
-/Proto
 
 # auto-generated during the build
 global.json
@@ -88,9 +83,6 @@ lib/bootstrap/4.1/policy*
 obj/
 bin/
 aclocal.m4
-Debug
-Release
-Proto
 sign_temp
 .libs
 configure
@@ -114,7 +106,6 @@ ossreadme*.txt
 *.cto
 *.vstman
 project.lock.json
-Tools/
 Backup/
 tests/fsharp/core/array/dont.run.peverify
 tests/fsharp/core/innerpoly/dont.run.peverify
@@ -123,7 +114,6 @@ times
 /tests/fsharpqa/testenv/bin/System.ValueTuple.dll
 source_link.json
 .vs/
-/VSRelease/net40/bin
 System.ValueTuple.dll
 tests/fsharpqa/testenv/bin/System.ValueTuple.dll
 */.fake
diff --git a/.vsts-pr.yaml b/.vsts-pr.yaml
index 37246474bf7..44c277a3943 100644
--- a/.vsts-pr.yaml
+++ b/.vsts-pr.yaml
@@ -17,7 +17,7 @@ jobs:
   - script: $(_command) $(_args)
   - task: PublishBuildArtifacts@1
     inputs:
-      PathtoPublish: '$(Build.SourcesDirectory)/tests/TestResults'
+      PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults'
       ArtifactName: 'Linux $(_command) $(_args)'
       publishLocation: Container
     continueOnError: true
@@ -26,7 +26,7 @@ jobs:
 - job: Windows
   pool:
     vmImage: vs2017-win2016
-  timeoutInMinutes: 90
+  timeoutInMinutes: 120
   strategy:
     maxParallel: 7
     matrix:
@@ -55,7 +55,7 @@ jobs:
   - script: $(_command) $(_args)
   - task: PublishBuildArtifacts@1
     inputs:
-      PathtoPublish: '$(Build.SourcesDirectory)\tests\TestResults'
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\TestResults'
       ArtifactName: 'Windows $(_command) $(_args)'
       publishLocation: Container
     continueOnError: true
diff --git a/.vsts-signed.yaml b/.vsts-signed.yaml
index 82b5d247362..25d7642cf09 100644
--- a/.vsts-signed.yaml
+++ b/.vsts-signed.yaml
@@ -29,7 +29,7 @@ jobs:
     displayName: Publish nightly package to MyGet
     inputs:
       scriptName: 'setup\publish-assets.ps1'
-      arguments: '-binariesPath $(MSBuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
+      arguments: '-binariesPath artifacts\bin -configuration $(MSBuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
     condition: and(succeeded(), contains(variables['PB_PublishType'], 'myget'))
 
   # Publish packages to Azure Blob Storage
@@ -44,7 +44,7 @@ jobs:
   - task: PublishBuildArtifacts@1
     displayName: Create static drop
     inputs:
-      PathtoPublish: '$(MSBuildConfiguration)'
+      PathtoPublish: 'artifacts'
       ArtifactName: '$(Build.BuildNumber)'
       publishLocation: FilePath
       TargetPath: '$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)'
@@ -58,7 +58,7 @@ jobs:
     inputs:
       SymbolsPath: '$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
       SearchPattern: '**\*.dll;**\*.exe;**\*.pdb'
-      SymbolsFolder: '$(Build.SourcesDirectory)\$(MSBuildConfiguration)'
+      SymbolsFolder: '$(Build.SourcesDirectory)\artifacts\SymStore'
       TreatNotIndexedAsWarning: true
       SymbolsProduct: '$(Build.DefinitionName)'
       SymbolsVersion: '$(Build.BuildNumber)'
@@ -69,7 +69,7 @@ jobs:
   - task: ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
     displayName: Upload VSTS Drop
     inputs:
-      DropFolder: '$(Build.SourcesDirectory)\$(MSBuildConfiguration)\insertion'
+      DropFolder: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(MSBuildConfiguration)\Insertion'
     condition: and(succeeded(), contains(variables['PB_PublishType'], 'vsts'))
 
   # Execute cleanup tasks
@@ -91,6 +91,6 @@ jobs:
     displayName: Publish symbols to SymWeb
     inputs:
       symbolServiceURI: 'https://microsoft.artifacts.visualstudio.com/DefaultCollection'
-      sourcePath: '$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
+      sourcePath: '$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\SymStore'
       usePat: false
     condition: and(succeeded(), contains(variables['PB_PublishType'], 'symweb'))
diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props
index 81701799796..c5e4108181c 100644
--- a/FSharpBuild.Directory.Build.props
+++ b/FSharpBuild.Directory.Build.props
@@ -10,9 +10,16 @@
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
     <FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
-    <ToolsRoot>$(RepoRoot)Tools</ToolsRoot>
-    <ProtoOutputPath Condition="'$(OS)' != 'Unix'">$(RepoRoot)Proto\net40\bin</ProtoOutputPath>
-    <ProtoOutputPath Condition="'$(OS)' == 'Unix'">$(RepoRoot)Proto\coreclr\bin</ProtoOutputPath>
+    <ArtifactsDir>$(RepoRoot)artifacts</ArtifactsDir>
+    <ToolsRoot>$(ArtifactsDir)\toolset</ToolsRoot>
+    <ArtifactsBinDir>$(ArtifactsDir)\bin</ArtifactsBinDir>
+    <ArtifactsObjDir>$(ArtifactsDir)\obj</ArtifactsObjDir>
+    <ArtifactsPackagesDir>$(ArtifactsDir)\packages</ArtifactsPackagesDir>
+    <BaseOutputPath>$(ArtifactsBinDir)\$(MSBuildProjectName)</BaseOutputPath>
+    <BaseIntermediateOutputPath>$(ArtifactsObjDir)\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <SymStoreDirectory>$(ArtifactsDir)\SymStore</SymStoreDirectory>
+    <ProtoOutputPath Condition="'$(OS)' != 'Unix'">$(ArtifactsBinDir)\fsc\Proto\net46</ProtoOutputPath>
+    <ProtoOutputPath Condition="'$(OS)' == 'Unix'">$(ArtifactsBinDir)/fsc/Proto/netcoreapp2.1</ProtoOutputPath>
     <ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>
   </PropertyGroup>
 
diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets
index 375416e5cf3..ef7f82861c5 100644
--- a/FSharpBuild.Directory.Build.targets
+++ b/FSharpBuild.Directory.Build.targets
@@ -34,42 +34,6 @@
     </CreateItem>
   </Target>
 
-  <Target Name="ComputeFinalOutputPaths">
-    <!--
-    Ideally we'd set <OutputPath> to `$(Configuration)\[net40|coreclr]\bin`, but the calculation of `[net40|coreclr]`
-    depends on the `$(TargetFramework)` variable which is set by the individual project files, but by the time we have
-    that value (e.g., in this file) it's too late; some targets, particularly from the VsSDK have already used the
-    values of $(OutputPath)/$(OutDir).
-
-    The fix is to not set `$(Outputpath)` and simply copy stuff there after the fact.
-    -->
-
-    <PropertyGroup>
-      <TargetDotnetProfile Condition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('netcoreapp'))">coreclr</TargetDotnetProfile>
-      <TargetDotnetProfile Condition="$(TargetFramework.StartsWith('net4'))">net40</TargetDotnetProfile>
-      <ActualOutputPath Condition="'$(Language)' != 'VB'">$(MSBuildProjectDirectory)\$(OutputPath)</ActualOutputPath>
-      <ActualOutputPath Condition="'$(Language)' == 'VB'">$(OutputPath)</ActualOutputPath>
-      <FinalOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\bin</FinalOutputPath>
-      <FinalIntermediateOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\obj</FinalIntermediateOutputPath>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="HACK_CopyOutputsToTheProperLocation"
-          AfterTargets="AfterBuild"
-          DependsOnTargets="ComputeFinalOutputPaths"
-          Condition="'$(DisableOutputPathCopying)' != 'true'">
-
-    <ItemGroup>
-      <OutputFilesToCopy Include="$(ActualOutputPath)**" />
-      <IntermediateFilesToCopy Include="$(IntermediateOutputPath)\**" />
-    </ItemGroup>
-
-    <Message Text="Copying build artifacts to $(FinalOutputPath)" />
-    <MakeDir Directories="$(FinalOutputPath);$(FinalIntermediateOutputPath)" />
-    <Copy SourceFiles="@(OutputFilesToCopy)" DestinationFolder="$(FinalOutputPath)\%(RecursiveDir)" />
-    <Copy SourceFiles="@(IntermediateFilesToCopy)" DestinationFolder="$(FinalIntermediateOutputPath)\%(RecursiveDir)" />
-  </Target>
-
   <Import Project="build\targets\ConvertPortablePdbs.targets" />
   <Import Project="build\targets\GenerateAssemblyAttributes.targets" />
   <Import Project="build\targets\GenerateInternalsVisibleTo.targets" />
diff --git a/FSharpTests.Directory.Build.props b/FSharpTests.Directory.Build.props
index eb20065bec2..d9fc35fc05d 100644
--- a/FSharpTests.Directory.Build.props
+++ b/FSharpTests.Directory.Build.props
@@ -1,48 +1,43 @@
 <Project>
 
-  <!-- SDK targets override -->
-  <PropertyGroup Condition=" '$(FSharpTestCompilerVersion)' == 'net40' ">
-    <_FSharpCompilerPath>$(MSBuildThisFileDirectory)$(Configuration)/net40/bin</_FSharpCompilerPath>
-
+  <PropertyGroup Condition="'$(FSharpTestCompilerVersion)' == 'net40'">
     <DisableAutoSetFscCompilerPath>true</DisableAutoSetFscCompilerPath>
 
-    <FscToolPath>$(_FSharpCompilerPath)</FscToolPath>
+    <FscToolPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\net46</FscToolPath>
     <FscToolExe>fsc.exe</FscToolExe>
     <DotnetFscCompilerPath></DotnetFscCompilerPath>
 
-    <FsiToolPath>$(_FSharpCompilerPath)</FsiToolPath>
+    <FsiToolPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\net46</FsiToolPath>
     <FsiToolExe>fsi.exe</FsiToolExe>
     <DotnetFsiCompilerPath></DotnetFsiCompilerPath>
   </PropertyGroup>
 
-  <!-- SDK targets override -->
-  <PropertyGroup Condition=" '$(FSharpTestCompilerVersion)' == 'coreclr' ">
-    <_FSharpCompilerPath>$(MSBuildThisFileDirectory)$(Configuration)/coreclr/bin</_FSharpCompilerPath>
-
+  <PropertyGroup Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">
     <DisableAutoSetFscCompilerPath>true</DisableAutoSetFscCompilerPath>
-    <FscToolPath>$(MSBuildThisFileDirectory)Tools/dotnet20</FscToolPath>
+
+    <FscToolPath>$(MSBuildThisFileDirectory)artifacts\toolset\dotnet</FscToolPath>
     <FscToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FscToolExe>
     <FscToolExe Condition="'$(OS)' == 'Unix'">dotnet</FscToolExe>
-    <DotnetFscCompilerPath>$(_FSharpCompilerPath)/fsc.exe</DotnetFscCompilerPath>
+    <DotnetFscCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\netcoreapp2.1\fsc.exe</DotnetFscCompilerPath>
 
-    <FsiToolPath>$(MSBuildThisFileDirectory)Tools/dotnet20</FsiToolPath>
+    <FsiToolPath>$(MSBuildThisFileDirectory)artifacts\toolset\dotnet</FsiToolPath>
     <FsiToolExe Condition="'$(OS)' != 'Unix'">dotnet.exe</FsiToolExe>
     <FsiToolExe Condition="'$(OS)' == 'Unix'">dotnet</FsiToolExe>
-    <DotnetFsiCompilerPath>$(_FSharpCompilerPath)/fsi.exe</DotnetFsiCompilerPath>
+    <DotnetFsiCompilerPath>$(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\netcoreapp2.0\fsi.exe</DotnetFsiCompilerPath>
   </PropertyGroup>
 
   <!-- SDK targets override -->
   <PropertyGroup>
-    <FSharpTargetsPath>$(_FSharpCompilerPath)/Microsoft.FSharp.Targets</FSharpTargetsPath>
-    <FSharpPropsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
-    <FSharpTargetsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
-    <FSharpOverridesTargetsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
-  </PropertyGroup>
+    <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'net40'">net46</_FSharpBuildTargetFramework>
+    <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netstandard2.0</_FSharpBuildTargetFramework>
+    <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\FSharp.Build\$(Configuration)\$(_FSharpBuildTargetFramework)</_FSharpBuildBinPath>
 
+    <FSharpBuildAssemblyFile>$(_FSharpBuildBinPath)\FSharp.Build.dll</FSharpBuildAssemblyFile>
 
-  <!-- We are running under netcore so even though we will use the fsc compiler we can't use the desktop version of the fsharp.build tasks -->
-  <PropertyGroup>
-    <FSharpBuildAssemblyFile Condition = " '$(DOTNET_HOST_PATH)' != '' ">$(MSBuildThisFileDirectory)$(Configuration)\coreclr\bin\FSharp.Build.dll</FSharpBuildAssemblyFile>
-    <FSharpBuildAssemblyFile Condition = " '$(DOTNET_HOST_PATH)' == '' ">$(MSBuildThisFileDirectory)$(Configuration)\net40\bin\FSharp.Build.dll</FSharpBuildAssemblyFile>
+    <FSharpTargetsPath>$(_FSharpBuildBinPath)/Microsoft.FSharp.Targets</FSharpTargetsPath>
+    <FSharpPropsShim>$(_FSharpBuildBinPath)/Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
+    <FSharpTargetsShim>$(_FSharpBuildBinPath)/Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
+    <FSharpOverridesTargetsShim>$(_FSharpBuildBinPath)/Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/Makefile b/Makefile
index d596299cb57..e402025e0ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 Configuration ?= release
 DotNetVersion = `cat DotnetCLIToolsVersion.txt`
-DotNetExe = "$(CURDIR)/Tools/dotnet20/dotnet"
+DotNetToolPath = $(CURDIR)/artifacts/toolset/dotnet
+DotNetExe = "$(DotNetToolPath)/dotnet"
 
 all: proto restore build test
 
 tools:
-	$(CURDIR)/scripts/dotnet-install.sh --version $(DotNetVersion) --install-dir $(CURDIR)/Tools/dotnet20
+	$(CURDIR)/scripts/dotnet-install.sh --version $(DotNetVersion) --install-dir "$(DotNetToolPath)"
 
 global.json: tools
 	echo { \"sdk\": { \"version\": \"$(DotNetVersion)\" } }>global.json
@@ -14,18 +15,18 @@ proto: global.json
 	$(DotNetExe) build-server shutdown
 	$(DotNetExe) restore src/buildtools/buildtools.proj
 	$(DotNetExe) restore src/fsharp/FSharp.Build/FSharp.Build.fsproj
-	$(DotNetExe) restore src/fsharp/Fsc/Fsc.fsproj
+	$(DotNetExe) restore src/fsharp/fsc/fsc.fsproj
 	$(DotNetExe) build src/buildtools/buildtools.proj -c Proto
 	$(DotNetExe) build src/fsharp/FSharp.Build/FSharp.Build.fsproj -f netstandard2.0 -c Proto
-	$(DotNetExe) build src/fsharp/Fsc/Fsc.fsproj -f netcoreapp2.1 -c Proto
+	$(DotNetExe) build src/fsharp/fsc/fsc.fsproj -f netcoreapp2.1 -c Proto
 
 restore: global.json
 	$(DotNetExe) restore src/fsharp/FSharp.Core/FSharp.Core.fsproj
 	$(DotNetExe) restore src/fsharp/FSharp.Build/FSharp.Build.fsproj
 	$(DotNetExe) restore src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
-	$(DotNetExe) restore src/fsharp/Fsc/Fsc.fsproj
+	$(DotNetExe) restore src/fsharp/fsc/fsc.fsproj
 	$(DotNetExe) restore src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
-	$(DotNetExe) restore src/fsharp/fsi/Fsi.fsproj
+	$(DotNetExe) restore src/fsharp/fsi/fsi.fsproj
 	$(DotNetExe) restore tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
 	$(DotNetExe) restore tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj
 
@@ -34,9 +35,9 @@ build: proto restore
 	$(DotNetExe) build -c $(Configuration) -f netstandard1.6 src/fsharp/FSharp.Core/FSharp.Core.fsproj
 	$(DotNetExe) build -c $(Configuration) -f netstandard2.0 src/fsharp/FSharp.Build/FSharp.Build.fsproj
 	$(DotNetExe) build -c $(Configuration) -f netstandard1.6 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
-	$(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 src/fsharp/Fsc/Fsc.fsproj
+	$(DotNetExe) build -c $(Configuration) -f netcoreapp2.1 src/fsharp/fsc/fsc.fsproj
 	$(DotNetExe) build -c $(Configuration) -f netstandard1.6 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
-	$(DotNetExe) build -c $(Configuration) -f netcoreapp2.0 src/fsharp/fsi/Fsi.fsproj
+	$(DotNetExe) build -c $(Configuration) -f netcoreapp2.0 src/fsharp/fsi/fsi.fsproj
 	$(DotNetExe) build -c $(Configuration) -f netcoreapp2.0 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
 	$(DotNetExe) build -c $(Configuration) -f netcoreapp2.0 tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj
 
@@ -45,6 +46,4 @@ test: build
 	$(DotNetExe) test -f netcoreapp2.0 -c $(Configuration) --no-restore --no-build tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj -l "trx;LogFileName=$(CURDIR)/tests/TestResults/FSharp.Build.UnitTests.coreclr.trx"
 
 clean:
-	rm -rf $(CURDIR)/Proto
-	rm -rf $(CURDIR)/debug
-	rm -rf $(CURDIR)/release
+	rm -rf $(CURDIR)/artifacts
diff --git a/PublishToBlob.proj b/PublishToBlob.proj
index 00bcee63359..71fbfad44ed 100644
--- a/PublishToBlob.proj
+++ b/PublishToBlob.proj
@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <!-- this should pick up both *.nupkg and *.symbols.nupkg -->
-    <NuGetPackages Include="$(MSBuildThisFileDirectory)$(Configuration)\artifacts\Microsoft.FSharp.Compiler.*.nupkg" />
+    <NuGetPackages Include="$(MSBuildThisFileDirectory)\artifacts\packages\$(Configuration)\Microsoft.FSharp.Compiler.*.nupkg" />
   </ItemGroup>
 
   <Target Name="Build">
diff --git a/artifacts/.gitignore b/artifacts/.gitignore
deleted file mode 100644
index 72e8ffc0db8..00000000000
--- a/artifacts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/build.cmd b/build.cmd
index 504616ccab2..389679d5ba4 100644
--- a/build.cmd
+++ b/build.cmd
@@ -63,7 +63,7 @@ set BUILD_CORECLR=0
 set BUILD_FROMSOURCE=0
 set BUILD_VS=0
 set BUILD_FCS=0
-set BUILD_CONFIG=release
+set BUILD_CONFIG=Release
 set BUILD_DIAG=
 set BUILD_PUBLICSIGN=0
 
@@ -228,8 +228,8 @@ if /i "%ARG%" == "microbuild" (
     set CI=1
 
     REM redirecting TEMP directories
-    set TEMP=%~dp0%BUILD_CONFIG%\TEMP
-    set TMP=%~dp0%BUILD_CONFIG%\TEMP
+    set TEMP=%~dp0artifacts\tmp
+    set TMP=%~dp0artifacts\tmp
 )
 
 if /i "%ARG%" == "nuget" (
@@ -319,11 +319,11 @@ if /i "%ARG%" == "diag" (
 )
 
 if /i "%ARG%" == "debug" (
-    set BUILD_CONFIG=debug
+    set BUILD_CONFIG=Debug
 )
 
 if /i "%ARG%" == "release" (
-    set BUILD_CONFIG=release
+    set BUILD_CONFIG=Release
 )
 
 if /i "%ARG%" == "test-sign" (
@@ -614,13 +614,13 @@ echo { "sdk": { "version": "%DOTNET_TOOLS_VERSION%" } }>global.json
 
 :: Restore the Tools directory
 call "%~dp0init-tools.cmd"
-set _dotnetexe=%~dp0Tools\dotnet20\dotnet.exe
-set path=%~dp0Tools\dotnet20\;%path%
+set _dotnetexe=%~dp0artifacts\toolset\dotnet\dotnet.exe
+set path=%~dp0artifacts\toolset\dotnet;%path%
 
 if not "%PB_PackageVersionPropsUrl%" == "" (
     echo ----------- do dependency uptake check -----------
 
-    set dependencyUptakeDir=%~dp0Tools\dependencyUptake
+    set dependencyUptakeDir=%~dp0artifacts\dependencyUptake
     if not exist "!dependencyUptakeDir!" mkdir "!dependencyUptakeDir!"
 
     :: download package version overrides
@@ -647,19 +647,19 @@ if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (
 )
 
 echo ---------------- Done with package restore, starting proto ------------------------
-set logdir=%~dp0%BUILD_CONFIG%\logs
+set logdir=%~dp0artifacts\log\%BUILD_CONFIG%
 if not exist "!logdir!" mkdir "!logdir!"
 
 rem Build Proto
 if "%BUILD_PROTO%" == "1" (
-    rmdir /s /q Proto
+    rmdir /s /q artifacts/bin/fsc/Proto
 
-    echo %_msbuildexe% proto.proj /t:Restore /bl:%~dp0Proto\proto.proj.restore.binlog
-         %_msbuildexe% proto.proj /t:Restore /bl:%~dp0Proto\proto.proj.restore.binlog
+    echo %_msbuildexe% proto.proj /t:Restore /bl:%~dp0artifacts\log\Proto\proto.proj.restore.binlog
+         %_msbuildexe% proto.proj /t:Restore /bl:%~dp0artifacts\log\Proto\proto.proj.restore.binlog
     @if ERRORLEVEL 1 echo Error restoring proto failed && goto :failure
 
-    echo %_msbuildexe% proto.proj /t:Build /bl:%~dp0Proto\proto.proj.build.binlog
-         %_msbuildexe% proto.proj /t:Build /bl:%~dp0Proto\proto.proj.build.binlog
+    echo %_msbuildexe% proto.proj /t:Build /bl:%~dp0artifacts\log\Proto\proto.proj.build.binlog
+         %_msbuildexe% proto.proj /t:Build /bl:%~dp0artifacts\log\Proto\proto.proj.build.binlog
     @if ERRORLEVEL 1 echo Error building proto failed && goto :failure
 )
 
@@ -667,11 +667,11 @@ echo ---------------- Done with SDK restore, starting build --------------------
 
 if "%BUILD_PHASE%" == "1" (
 
-    echo %_msbuildexe% fsharp.proj /t:Restore /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\fsharp.proj.restore.binlog
-         %_msbuildexe% fsharp.proj /t:Restore /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\fsharp.proj.restore.binlog
+    echo %_dotnetexe% restore fsharp.proj /p:Configuration=%BUILD_CONFIG% /bl:!logdir!\fsharp.proj.restore.binlog
+         %_dotnetexe% restore fsharp.proj /p:Configuration=%BUILD_CONFIG% /bl:!logdir!\fsharp.proj.restore.binlog
 
-    echo %_msbuildexe% fsharp.proj /t:Build /p:Configuration=%BUILD_CONFIG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN% /bl:%~dp0%BUILD_CONFIG%\fsharp.proj.build.binlog
-         %_msbuildexe% fsharp.proj /t:Build /p:Configuration=%BUILD_CONFIG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN% /bl:%~dp0%BUILD_CONFIG%\fsharp.proj.build.binlog
+    echo %_msbuildexe% fsharp.proj /t:Build /p:Configuration=%BUILD_CONFIG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN% /bl:!logdir!\fsharp.proj.build.binlog
+         %_msbuildexe% fsharp.proj /t:Build /p:Configuration=%BUILD_CONFIG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN% /bl:!logdir!\fsharp.proj.build.binlog
 
    @if ERRORLEVEL 1 echo Error build failed && goto :failure
 )
@@ -681,8 +681,8 @@ set asmvercheckpath=%~dp0tests\fsharpqa\testenv\src\AssemblyVersionCheck
 
 if "%BUILD_NET40%" == "1" (
   echo #r @"%USERPROFILE%\.nuget\packages\Newtonsoft.Json\9.0.1\lib\net45\Newtonsoft.Json.dll">%asmvercheckpath%\assemblies.fsx
-  echo "%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe" "%asmvercheckpath%\AssemblyVersionCheck.fsx" -- "%~dp0build\config\AssemblySignToolData.json" "%~dp0%BUILD_CONFIG%"
-       "%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe" "%asmvercheckpath%\AssemblyVersionCheck.fsx" -- "%~dp0build\config\AssemblySignToolData.json" "%~dp0%BUILD_CONFIG%"
+  echo "%~dp0artifacts\bin\fsi\%BUILD_CONFIG%\net46\fsi.exe" "%asmvercheckpath%\AssemblyVersionCheck.fsx" -- "%~dp0build\config\AssemblySignToolData.json" "%~dp0artifacts\bin"
+       "%~dp0artifacts\bin\fsi\%BUILD_CONFIG%\net46\fsi.exe" "%asmvercheckpath%\AssemblyVersionCheck.fsx" -- "%~dp0build\config\AssemblySignToolData.json" "%~dp0artifacts\bin"
   if ERRORLEVEL 1 echo Error verifying assembly versions and commit hashes. && goto :failure
 )
 
@@ -692,56 +692,46 @@ if not "%SIGN_TYPE%" == "" (
     echo %_msbuildexe% build\projects\Signing.proj /t:Restore
          %_msbuildexe% build\projects\Signing.proj /t:Restore
 
-    echo %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:ConfigFile=%~dp0build\config\AssemblySignToolData.json
-         %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:ConfigFile=%~dp0build\config\AssemblySignToolData.json
+    echo %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasePath=%~dp0artifacts\bin /p:ConfigFile=%~dp0build\config\AssemblySignToolData.json
+         %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasePath=%~dp0artifacts\bin /p:ConfigFile=%~dp0build\config\AssemblySignToolData.json
 
     if ERRORLEVEL 1 echo Error running sign tool && goto :failure
 )
 
 echo ---------------- Done with assembly signing, start package creation ---------------
 
-echo %_msbuildexe% %msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG% /t:Pack /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-nuget-packages.build.%BUILD_CONFIG%.binlog
-     %_msbuildexe% %msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG% /t:Pack /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-nuget-packages.build.%BUILD_CONFIG%.binlog
+echo %_msbuildexe% %msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG% /t:Pack /bl:!logdir!\msbuild.build-nuget-packages.build.%BUILD_CONFIG%.binlog
+     %_msbuildexe% %msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG% /t:Pack /bl:!logdir!\msbuild.build-nuget-packages.build.%BUILD_CONFIG%.binlog
 if ERRORLEVEL 1 echo Error building NuGet packages && goto :failure
 
 if not "%SIGN_TYPE%" == "" (
-    echo %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:ConfigFile=%~dp0build\config\PackageSignToolData.json
-         %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:ConfigFile=%~dp0build\config\PackageSignToolData.json
+    echo %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasepath=%~dp0artifacts\packages\%BUILD_CONFIG% /p:ConfigFile=%~dp0build\config\PackageSignToolData.json
+         %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasepath=%~dp0artifacts\packages\%BUILD_CONFIG% /p:ConfigFile=%~dp0build\config\PackageSignToolData.json
     if ERRORLEVEL 1 echo Error running sign tool && goto :failure
 )
 
 if "%BUILD_SETUP%" == "1" (
-    echo %_msbuildexe% %msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG%  /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-insertion.build.%BUILD_CONFIG%.binlog
-         %_msbuildexe% %msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG%  /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-insertion.build.%BUILD_CONFIG%.binlog
+    echo %_msbuildexe% %msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG%  /bl:!logdir!\msbuild.build-insertion.build.%BUILD_CONFIG%.binlog
+         %_msbuildexe% %msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG%  /bl:!logdir!\msbuild.build-insertion.build.%BUILD_CONFIG%.binlog
     if ERRORLEVEL 1 echo Error building insertion packages && goto :failure
 )
 
 if not "%SIGN_TYPE%" == "" (
-    echo %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:ConfigFile=%~dp0build\config\InsertionSignToolData.json
-         %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:ConfigFile=%~dp0build\config\InsertionSignToolData.json
+    echo %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasepath=%~dp0artifacts\VSSetup\%BUILD_CONFIG%\Insertion /p:ConfigFile=%~dp0build\config\InsertionSignToolData.json
+         %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasePath=%~dp0artifacts\VSSetup\%BUILD_CONFIG%\Insertion /p:ConfigFile=%~dp0build\config\InsertionSignToolData.json
     if ERRORLEVEL 1 echo Error running sign tool && goto :failure
 )
 
 echo ---------------- Done with signing, building insertion files ---------------
 
 if "%BUILD_SETUP%" == "1" (
-    echo %_msbuildexe% %msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.setup-swix.build.%BUILD_CONFIG%.binlog
-         %_msbuildexe% %msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.setup-swix.build.%BUILD_CONFIG%.binlog
+    echo %_msbuildexe% %msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG% /bl:!logdir!\msbuild.setup-swix.build.%BUILD_CONFIG%.binlog
+         %_msbuildexe% %msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG% /bl:!logdir!\msbuild.setup-swix.build.%BUILD_CONFIG%.binlog
     if ERRORLEVEL 1 echo Error building .vsmanproj && goto :failure
 )
 
 echo ---------------- Done building insertion files, starting pack/update/prepare ---------------
 
-if "%BUILD_NET40_FSHARP_CORE%" == "1" (
-  echo ----------------  start update.cmd ---------------
-  call src\update.cmd %BUILD_CONFIG% -ngen
-)
-
-if "%COPY_FSCOMP_RESOURCE_FOR_BUILD_FROM_SOURCES%" == "1" (
-  echo ----------------  copy fscomp resource for build from sources ---------------
-  copy /y src\fsharp\FSharp.Compiler.Private\obj\%BUILD_CONFIG%\net40\FSComp.* src\buildfromsource\FSharp.Compiler.Private
-)
-
 set X86_PROGRAMFILES=%ProgramFiles%
 if "%OSARCH%"=="AMD64" set X86_PROGRAMFILES=%ProgramFiles(x86)%
 
@@ -787,21 +777,19 @@ if not exist "%link_exe%" (
 
 if /I not "%single_threaded%" == "true" (set PARALLEL_ARG=-procs:%NUMBER_OF_PROCESSORS%) else set PARALLEL_ARG=-procs:0
 
-set FSCBINPATH=%~dp0%BUILD_CONFIG%\net40\bin
-set RESULTSDIR=%~dp0tests\TestResults
-if not exist "%RESULTSDIR%" (mkdir "%RESULTSDIR%")
+set FSCBINPATH=%~dp0artifacts\bin\fsc\%BUILD_CONFIG%\net46
 
 ECHO FSCBINPATH=%FSCBINPATH%
-ECHO RESULTSDIR=%RESULTSDIR%
 ECHO link_exe=%link_exe%
 
 REM ---------------- test-net40-fsharp  -----------------------
 
+set TESTLOGDIR=%~dp0artifacts\TestResults\%BUILD_CONFIG%
 if "%TEST_NET40_FSHARP_SUITE%" == "1" (
 
-    set LOGFILE=%~dp0tests\TestResults\FSharp.Tests.FSharpSuite.net40.trx
-    echo "%_dotnetexe%" test "%~dp0tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" -o "%~dp0%BUILD_CONFIG%\net40\bin"
-         "%_dotnetexe%" test "%~dp0tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" -o "%~dp0%BUILD_CONFIG%\net40\bin"
+    set LOGFILE=%TESTLOGDIR%\FSharp.Tests.FSharpSuite_net46.trx
+    echo "%_dotnetexe%" test "%~dp0tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
+         "%_dotnetexe%" test "%~dp0tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
 
     if errorlevel 1 (
         echo --------------------------------------------------------------
@@ -809,13 +797,20 @@ if "%TEST_NET40_FSHARP_SUITE%" == "1" (
         echo --------------------------------------------------------------
         goto :failure
     )
+
+    if not exist "!LOGFILE!" (
+        echo --------------------------------------------------------
+        echo Test results file !LOGFILE! not found, ensure tests ran.
+        echo --------------------------------------------------------
+        goto :failure
+    )
 )
 
 REM ---------------- test-fcs  -----------------------
 
 if "%TEST_FCS%" == "1" (
 
-    set LOGFILE=%~dp0tests\TestResults\FSharp.Compiler.Service.Tests.net40.trx
+    set LOGFILE=%TESTLOGDIR%\FSharp.Compiler.Service.Tests_net46.trx
     echo "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
          "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
 
@@ -826,7 +821,14 @@ if "%TEST_FCS%" == "1" (
         goto :failure
     )
 
-    set LOGFILE=%~dp0tests\TestResults\FSharp.Compiler.Service.Tests.coreclr.trx
+    if not exist "!LOGFILE!" (
+        echo --------------------------------------------------------
+        echo Test results file !LOGFILE! not found, ensure tests ran.
+        echo --------------------------------------------------------
+        goto :failure
+    )
+
+    set LOGFILE=%TESTLOGDIR%\FSharp.Compiler.Service.Tests_netcoreapp2.0.trx
     echo "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!"
          "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!"
 
@@ -836,6 +838,13 @@ if "%TEST_FCS%" == "1" (
         echo --------------------------------------------------------------
         goto :failure
     )
+
+    if not exist "!LOGFILE!" (
+        echo --------------------------------------------------------
+        echo Test results file !LOGFILE! not found, ensure tests ran.
+        echo --------------------------------------------------------
+        goto :failure
+    )
 )
 
 REM ---------------- end2end  -----------------------
@@ -871,6 +880,7 @@ if "%TEST_NET40_FSHARPQA_SUITE%" == "1" (
     set perlexe=%USERPROFILE%\.nuget\packages\StrawberryPerl64\5.22.2.1\Tools\perl\bin\perl.exe
     if not exist !perlexe! (echo Error: perl was not downloaded from check the packages directory: !perlexe! && goto :failure )
 
+    set RESULTSDIR=%~dp0artifacts\TestResults\%BUILD_CONFIG%
     set OUTPUTFILE=test-net40-fsharpqa-results.log
     set ERRORFILE=test-net40-fsharpqa-errors.log
     set FAILENV=test-net40-fsharpqa-errors
@@ -881,9 +891,10 @@ if "%TEST_NET40_FSHARPQA_SUITE%" == "1" (
 
     popd
     if ERRORLEVEL 1 (
-        type "%RESULTSDIR%\!OUTPUTFILE!"
         echo -----------------------------------------------------------------
-        type "%RESULTSDIR%\!ERRORFILE!"
+        type "!RESULTSDIR!\!OUTPUTFILE!"
+        echo -----------------------------------------------------------------
+        type "!RESULTSDIR!\!ERRORFILE!"
         echo -----------------------------------------------------------------
         echo Error: Running tests net40-fsharpqa failed, see logs above -- FAILED
         echo -----------------------------------------------------------------
@@ -895,7 +906,7 @@ REM ---------------- net40-compilerunit  -----------------------
 
 if "%TEST_NET40_COMPILERUNIT_SUITE%" == "1" (
 
-    set LOGFILE=%~dp0tests\TestResults\FSharp.Compiler.UnitTests.net40.trx
+    set LOGFILE=%TESTLOGDIR%\FSharp.Compiler.UnitTests_net46.trx
     echo "%_dotnetexe%" test "%~dp0tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
          "%_dotnetexe%" test "%~dp0tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
 
@@ -906,7 +917,14 @@ if "%TEST_NET40_COMPILERUNIT_SUITE%" == "1" (
         goto :failure
     )
 
-    set LOGFILE=%~dp0tests\TestResults\FSharp.Build.UnitTests.net40.trx
+    if not exist "!LOGFILE!" (
+        echo --------------------------------------------------------
+        echo Test results file !LOGFILE! not found, ensure tests ran.
+        echo --------------------------------------------------------
+        goto :failure
+    )
+
+    set LOGFILE=%TESTLOGDIR%\FSharp.Build.UnitTests_net46.trx
     echo "%_dotnetexe%" test "%~dp0tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
          "%_dotnetexe%" test "%~dp0tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
 
@@ -916,13 +934,20 @@ if "%TEST_NET40_COMPILERUNIT_SUITE%" == "1" (
         echo -----------------------------------------------------------------
         goto :failure
     )
+
+    if not exist "!LOGFILE!" (
+        echo --------------------------------------------------------
+        echo Test results file !LOGFILE! not found, ensure tests ran.
+        echo --------------------------------------------------------
+        goto :failure
+    )
 )
 
 REM ---------------- net40-coreunit  -----------------------
 
 if "%TEST_NET40_COREUNIT_SUITE%" == "1" (
 
-    set LOGFILE=%~dp0tests\TestResults\FSharp.Core.UnitTests.net40.trx
+    set LOGFILE=%TESTLOGDIR%\FSharp.Core.UnitTests_net46.trx
     echo "%_dotnetexe%" test "%~dp0tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
          "%_dotnetexe%" test "%~dp0tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
 
@@ -932,13 +957,20 @@ if "%TEST_NET40_COREUNIT_SUITE%" == "1" (
         echo -----------------------------------------------------------------
         goto :failure
     )
+
+    if not exist "!LOGFILE!" (
+        echo --------------------------------------------------------
+        echo Test results file !LOGFILE! not found, ensure tests ran.
+        echo --------------------------------------------------------
+        goto :failure
+    )
 )
 
 REM  ---------------- coreclr-coreunit  -----------------------
 
 if "%TEST_CORECLR_COREUNIT_SUITE%" == "1" (
 
-    set LOGFILE=%~dp0tests\TestResults\FSharp.Build.UnitTests.coreclr.trx
+    set LOGFILE=%TESTLOGDIR%\FSharp.Build.UnitTests_netcoreapp2.0.trx
     echo "%_dotnetexe%" test "%~dp0tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!"
          "%_dotnetexe%" test "%~dp0tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!"
 
@@ -949,7 +981,14 @@ if "%TEST_CORECLR_COREUNIT_SUITE%" == "1" (
         goto :failure
     )
 
-    set LOGFILE=%~dp0tests\TestResults\FSharp.Core.UnitTests.coreclr.trx
+    if not exist "!LOGFILE!" (
+        echo --------------------------------------------------------
+        echo Test results file !LOGFILE! not found, ensure tests ran.
+        echo --------------------------------------------------------
+        goto :failure
+    )
+
+    set LOGFILE=%TESTLOGDIR%\FSharp.Core.UnitTests_netcoreapp2.0.trx
     echo "%_dotnetexe%" test "%~dp0tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!"
          "%_dotnetexe%" test "%~dp0tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!"
 
@@ -959,14 +998,21 @@ if "%TEST_CORECLR_COREUNIT_SUITE%" == "1" (
         echo ------------------------------------------------------------------
         goto :failure
     )
+
+    if not exist "!LOGFILE!" (
+        echo --------------------------------------------------------
+        echo Test results file !LOGFILE! not found, ensure tests ran.
+        echo --------------------------------------------------------
+        goto :failure
+    )
 )
 
 REM ---------------- coreclr-fsharp  -----------------------
 
 if "%TEST_CORECLR_FSHARP_SUITE%" == "1" (
-    set LOGFILE=%~dp0tests\TestResults\FSharp.Tests.FSharpSuite.coreclr.trx
-    echo "%_dotnetexe%" test "%~dp0tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!" -o "%~dp0%BUILD_CONFIG%\coreclr\bin"
-         "%_dotnetexe%" test "%~dp0tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!" -o "%~dp0%BUILD_CONFIG%\coreclr\bin"
+    set LOGFILE=%TESTLOGDIR%\FSharp.Tests.FSharpSuite_netcoreapp2.0.trx
+    echo "%_dotnetexe%" test "%~dp0tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!"
+         "%_dotnetexe%" test "%~dp0tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!"
 
     if errorlevel 1 (
         echo ----------------------------------------------------------------
@@ -974,12 +1020,19 @@ if "%TEST_CORECLR_FSHARP_SUITE%" == "1" (
         echo ----------------------------------------------------------------
         goto :failure
     )
+
+    if not exist "!LOGFILE!" (
+        echo --------------------------------------------------------
+        echo Test results file !LOGFILE! not found, ensure tests ran.
+        echo --------------------------------------------------------
+        goto :failure
+    )
 )
 
 REM ---------------- vs-ideunit  -----------------------
 
 if "%TEST_VS_IDEUNIT_SUITE%" == "1" (
-    set LOGFILE=%~dp0tests\TestResults\GetTypesVSUnitTests.net40.trx
+    set LOGFILE=%TESTLOGDIR%\GetTypesVSUnitTests_net46.trx
     echo "%_dotnetexe%" test "%~dp0vsintegration\tests\GetTypesVSUnitTests\GetTypesVSUnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
          "%_dotnetexe%" test "%~dp0vsintegration\tests\GetTypesVSUnitTests\GetTypesVSUnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
 
@@ -990,15 +1043,29 @@ if "%TEST_VS_IDEUNIT_SUITE%" == "1" (
         goto :failure
     )
 
-    set LOGFILE=%~dp0tests\TestResults\VisualFSharp.UnitTests.net40.trx
-    echo "%_dotnetexe%" test "%~dp0vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" -o "%~dp0%BUILD_CONFIG%\net40\bin"
-         "%_dotnetexe%" test "%~dp0vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" -o "%~dp0%BUILD_CONFIG%\net40\bin"
+    if not exist "!LOGFILE!" (
+        echo --------------------------------------------------------
+        echo Test results file !LOGFILE! not found, ensure tests ran.
+        echo --------------------------------------------------------
+        goto :failure
+    )
+
+    set LOGFILE=%TESTLOGDIR%\VisualFSharp.UnitTests_net46.trx
+    echo "%_dotnetexe%" test "%~dp0vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
+         "%_dotnetexe%" test "%~dp0vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!"
     if errorlevel 1 (
         echo ------------------------------------------------------------
         echo Error: Running tests vs-ideunit failed, see file `!LOGFILE!`
         echo ------------------------------------------------------------
         goto :failure
     )
+
+    if not exist "!LOGFILE!" (
+        echo --------------------------------------------------------
+        echo Test results file !LOGFILE! not found, ensure tests ran.
+        echo --------------------------------------------------------
+        goto :failure
+    )
 )
 
 goto :success
diff --git a/build/config/AssemblySignToolData.json b/build/config/AssemblySignToolData.json
index 6857a57f0dd..3cd0f5b61c1 100644
--- a/build/config/AssemblySignToolData.json
+++ b/build/config/AssemblySignToolData.json
@@ -4,55 +4,45 @@
       "certificate": "Microsoft",
       "strongName": "StrongName",
       "values": [
-        "net40\\bin\\FSharp.Core.dll",
-        "net40\\bin\\*\\FSharp.Core.resources.dll",
-        "net40\\bin\\FSharp.Build.dll",
-        "net40\\bin\\*\\FSharp.Build.resources.dll",
-        "net40\\bin\\FSharp.Compiler.Private.dll",
-        "net40\\bin\\*\\FSharp.Compiler.Private.resources.dll",
-        "net40\\bin\\FSharp.Compiler.Server.Shared.dll",
-        "net40\\bin\\FSharp.Compiler.Interactive.Settings.dll",
-        "net40\\bin\\*\\FSharp.Compiler.Interactive.Settings.resources.dll",
-        "net40\\bin\\fsc.exe",
-        "net40\\bin\\fsi.exe",
-        "net40\\bin\\fsiAnyCpu.exe",
-        "net40\\bin\\FSharp.VS.FSI.dll",
-        "net40\\bin\\*\\FSharp.VS.FSI.resources.dll",
-        "net40\\bin\\FSharp.LanguageService.Base.dll",
-        "net40\\bin\\*\\FSharp.LanguageService.Base.resources.dll",
-        "net40\\bin\\FSharp.LanguageService.dll",
-        "net40\\bin\\*\\FSharp.LanguageService.resources.dll",
-        "net40\\bin\\FSharp.UIResources.dll",
-        "net40\\bin\\*\\FSharp.UIResources.resources.dll",
-        "net40\\bin\\FSharp.Editor.dll",
-        "net40\\bin\\*\\FSharp.Editor.resources.dll",
-        "net40\\bin\\FSharp.ProjectSystem.Base.dll",
-        "net40\\bin\\*\\FSharp.ProjectSystem.Base.resources.dll",
-        "net40\\bin\\FSharp.ProjectSystem.PropertyPages.dll",
-        "net40\\bin\\*\\FSharp.ProjectSystem.PropertyPages.resources.dll",
-        "net40\\bin\\FSharp.ProjectSystem.FSharp.dll",
-        "net40\\bin\\*\\FSharp.ProjectSystem.FSharp.resources.dll",
-        "net40\\bin\\FSharp.PatternMatcher.dll",
-        "coreclr\\bin\\FSharp.Core.dll",
-        "coreclr\\bin\\*\\FSharp.Core.resources.dll",
-        "coreclr\\bin\\FSharp.Build.dll",
-        "coreclr\\bin\\*\\FSharp.Build.resources.dll",
-        "coreclr\\bin\\FSharp.Compiler.Private.dll",
-        "coreclr\\bin\\*\\FSharp.Compiler.Private.resources.dll",
-        "coreclr\\bin\\FSharp.Compiler.Interactive.Settings.dll",
-        "coreclr\\bin\\*\\FSharp.Compiler.Interactive.Settings.resources.dll",
-        "coreclr\\bin\\fsc.exe",
-        "coreclr\\bin\\fsi.exe"
+        "FSharp.Core\\*\\*\\FSharp.Core.dll",
+        "FSharp.Core\\*\\*\\*\\FSharp.Core.resources.dll",
+        "FSharp.Build\\*\\*\\FSharp.Build.dll",
+        "FSharp.Build\\*\\*\\*\\FSharp.Build.resources.dll",
+        "FSharp.Compiler.Private\\*\\*\\FSharp.Compiler.Private.dll",
+        "FSharp.Compiler.Private\\*\\*\\*\\FSharp.Compiler.Private.resources.dll",
+        "FSharp.Compiler.Server.Shared\\*\\*\\FSharp.Compiler.Server.Shared.dll",
+        "FSharp.Compiler.Interactive.Settings\\*\\*\\FSharp.Compiler.Interactive.Settings.dll",
+        "FSharp.Compiler.Interactive.Settings\\*\\*\\*\\FSharp.Compiler.Interactive.Settings.resources.dll",
+        "fsc\\*\\*\\fsc.exe",
+        "fsi\\*\\*\\fsi.exe",
+        "fsiAnyCpu\\*\\*\\fsiAnyCpu.exe",
+        "FSharp.VS.FSI\\*\\*\\FSharp.VS.FSI.dll",
+        "FSharp.VS.FSI\\*\\*\\*\\FSharp.VS.FSI.resources.dll",
+        "FSharp.LanguageService.Base\\*\\*\\FSharp.LanguageService.Base.dll",
+        "FSharp.LanguageService.Base\\*\\*\\*\\FSharp.LanguageService.Base.resources.dll",
+        "FSharp.LanguageService\\*\\*\\FSharp.LanguageService.dll",
+        "FSharp.LanguageService\\*\\*\\*\\FSharp.LanguageService.resources.dll",
+        "FSharp.UIResources\\*\\*\\FSharp.UIResources.dll",
+        "FSharp.UIResources\\*\\*\\*\\FSharp.UIResources.resources.dll",
+        "FSharp.Editor\\*\\*\\FSharp.Editor.dll",
+        "FSharp.Editor\\*\\*\\*\\FSharp.Editor.resources.dll",
+        "FSharp.ProjectSystem.Base\\*\\*\\FSharp.ProjectSystem.Base.dll",
+        "FSharp.ProjectSystem.Base\\*\\*\\*\\FSharp.ProjectSystem.Base.resources.dll",
+        "FSharp.ProjectSystem.PropertyPages\\*\\*\\FSharp.ProjectSystem.PropertyPages.dll",
+        "FSharp.ProjectSystem.PropertyPages\\*\\*\\*\\FSharp.ProjectSystem.PropertyPages.resources.dll",
+        "FSharp.ProjectSystem.FSharp\\*\\*\\FSharp.ProjectSystem.FSharp.dll",
+        "FSharp.ProjectSystem.FSharp\\*\\*\\*\\FSharp.ProjectSystem.FSharp.resources.dll",
+        "FSharp.PatternMatcher\\*\\*\\FSharp.PatternMatcher.dll"
       ]
     },
     {
       "certificate": "VsixSHA2",
       "strongName": null,
       "values": [
-        "net40\\bin\\VisualFSharpFull.vsix",
-        "net40\\bin\\VisualFSharpTemplate.vsix",
-        "insertion\\Microsoft.FSharp.Dependencies.vsix",
-        "insertion\\Microsoft.FSharp.VSIX.Full.Resources.*.vsix"
+        "VisualFSharpFull\\*\\*VisualFSharpFull.vsix",
+        "VisualFSharpTemplates\\*\\*\\VisualFSharpTemplate.vsix",
+        "..\\VSSetup\\*\\Insertion\\Microsoft.FSharp.Dependencies.vsix",
+        "..\\VSSetup\\*\\Insertion\\Microsoft.FSharp.VSIX.Full.Resources.*.vsix"
       ]
     }
   ],
diff --git a/build/config/InsertionSignToolData.json b/build/config/InsertionSignToolData.json
index ec8432ca9ad..d81579b12c9 100644
--- a/build/config/InsertionSignToolData.json
+++ b/build/config/InsertionSignToolData.json
@@ -4,11 +4,11 @@
       "certificate": "VsixSHA2",
       "strongName": null,
       "values": [
-        "insertion\\Microsoft.FSharp.Compiler.vsix",
-        "insertion\\Microsoft.FSharp.Compiler.Resources.*.vsix",
-        "insertion\\Microsoft.FSharp.Dependencies.vsix",
-        "insertion\\Microsoft.FSharp.IDE.vsix",
-        "insertion\\Microsoft.FSharp.SDK.vsix"
+        "Microsoft.FSharp.Compiler.vsix",
+        "Microsoft.FSharp.Compiler.Resources.*.vsix",
+        "Microsoft.FSharp.Dependencies.vsix",
+        "Microsoft.FSharp.IDE.vsix",
+        "Microsoft.FSharp.SDK.vsix"
       ]
     }
   ],
diff --git a/build/config/PackageSignToolData.json b/build/config/PackageSignToolData.json
index 20007f59e36..5bc74386355 100644
--- a/build/config/PackageSignToolData.json
+++ b/build/config/PackageSignToolData.json
@@ -4,8 +4,7 @@
         "certificate": "NuGet",
         "strongName": null,
         "values": [
-          "artifacts\\*.nupkg",
-          "artifacts\\*\\*.nupkg"
+          "*.nupkg"
         ]
       }
     ],
diff --git a/build/projects/Signing.proj b/build/projects/Signing.proj
index 4999fb6d085..9e981e135ec 100644
--- a/build/projects/Signing.proj
+++ b/build/projects/Signing.proj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <!-- necessary for package restore -->
     <TargetFramework>net46</TargetFramework>
-    <BinaryLocation>$(RepoRoot)$(Configuration)</BinaryLocation>
     <SignToolExe>$(NuGetPackageRoot)RoslynTools.SignTool\$(RoslynToolsSignToolPackageVersion)\tools\SignTool.exe</SignToolExe>
     <SignToolArgs>-msbuildPath "$(MSBuildBinPath)\msbuild.exe" -nugetPackagesPath "$(NuGetPackageRoot.TrimEnd('\'))" -config "$(ConfigFile)"</SignToolArgs>
     <SignToolArgs Condition="'$(SignType)' == 'test'">-testSign $(SignToolArgs)</SignToolArgs>
@@ -17,11 +16,12 @@
   <Target Name="ValidateArguments">
     <Error Message="Configuration must be manually specified." Condition="'$(Configuration)' == ''" />
     <Error Message="Configuration file must be manually specified." Condition="'$(ConfigFile)' == ''" />
+    <Error Message="BinaryBasePath must be manually specified." Condition="'$(BinaryBasePath)' == ''" />
   </Target>
 
   <Target Name="DoSigning"
           DependsOnTargets="ValidateArguments">
-    <Exec Command='"$(SignToolExe)" $(SignToolArgs) "$(BinaryLocation)"' />
+    <Exec Command='"$(SignToolExe)" $(SignToolArgs) "$(BinaryBasePath)"' />
   </Target>
 
 </Project>
diff --git a/build/targets/ConvertPortablePdbs.targets b/build/targets/ConvertPortablePdbs.targets
index 474fe091a5d..c43042a499e 100644
--- a/build/targets/ConvertPortablePdbs.targets
+++ b/build/targets/ConvertPortablePdbs.targets
@@ -6,20 +6,33 @@
 
   <Target Name="ConvertPortablePdbs"
           AfterTargets="AfterBuild"
-          DependsOnTargets="ComputeFinalOutputPaths"
           Condition="'$(OS)' != 'Unix' AND
                      Exists('$(TargetPath)') AND
                      ('$(DebugType)' == 'portable' OR '$(DebugType)' == 'embedded') AND
                      $(TargetFramework.StartsWith('net4')) AND
                      '$(Configuration)' != 'Proto'">
     <PropertyGroup>
-      <ConvertedPdbsDirectory>$(FinalOutputPath)\ConvertedPdbs</ConvertedPdbsDirectory>
       <PdbConverterExe>$(NuGetPackageRoot)Pdb2Pdb\$(Pdb2PdbPackageVersion)\tools\Pdb2Pdb.exe</PdbConverterExe>
-      <PdbConverterArgs>"$(TargetPath)" /out "$(ConvertedPdbsDirectory)\$(TargetName).pdb" /srcsvrvar SRC_INDEX=public</PdbConverterArgs>
+      <PdbConverterArgs>"$(TargetPath)" /out "$(SymStoreDirectory)\$(TargetName).pdb" /srcsvrvar SRC_INDEX=public</PdbConverterArgs>
     </PropertyGroup>
 
-    <MakeDir Directories="$(ConvertedPdbsDirectory)" />
+    <MakeDir Directories="$(SymStoreDirectory)" />
     <Exec Command='"$(PdbConverterExe)" $(PdbConverterArgs)' />
   </Target>
 
+  <Target Name="CopyExtantFullPdbs"
+          AfterTargets="AfterBuild"
+          Condition="'$(OS)' != 'Unix' AND
+                     Exists('$(TargetPath)') AND
+                     '$(DebugType)' == 'full' AND
+                     $(TargetFramework.StartsWith('net4')) AND
+                     '$(Configuration)' != 'Proto'">
+    <PropertyGroup>
+      <PdbFileName>$(TargetDir)\$(TargetName).pdb</PdbFileName>
+    </PropertyGroup>
+
+    <MakeDir Directories="$(SymStoreDirectory)" />
+    <Copy SourceFiles="$(PdbFileName)" DestinationFolder="$(SymStoreDirectory)" />
+  </Target>
+
 </Project>
diff --git a/build/targets/GenerateAssemblyAttributes.targets b/build/targets/GenerateAssemblyAttributes.targets
index 1be6bdb8315..7b747c9dd92 100644
--- a/build/targets/GenerateAssemblyAttributes.targets
+++ b/build/targets/GenerateAssemblyAttributes.targets
@@ -82,8 +82,7 @@
           Inputs="$(MSBuildThisFileFullPath);$(MSBuildProjectFile)"
           Outputs="$(GeneratedFSharpAssemblyVersionFile)"
           DependsOnTargets="PrepareGenerateAssemblyFileVersion;PrepareForBuild"
-          BeforeTargets="CoreCompile"
-          Condition="'$(Configuration)' != 'Proto'">
+          BeforeTargets="CoreCompile">
 
     <WriteCodeFragment AssemblyAttributes="@(_AssemblyVersionAttributes)"
                        Language="$(Language)"
diff --git a/build/targets/PackageVersions.props b/build/targets/PackageVersions.props
index e678f7ec6dc..42a2305f6fd 100644
--- a/build/targets/PackageVersions.props
+++ b/build/targets/PackageVersions.props
@@ -17,7 +17,7 @@
 
     <!-- synchronized build package sources -->
     <RestoreSources Condition="'$(PB_RestoreSource)' != ''">$(PB_RestoreSource);$(RestoreSources)</RestoreSources>
-    <DotNetPackageVersionPropsPath>$(MSBuildThisFileDirectory)..\..\Tools\dependencyUptake\PackageVersions.props</DotNetPackageVersionPropsPath>
+    <DotNetPackageVersionPropsPath>$(MSBuildThisFileDirectory)..\..\artifacts\dependencyUptake\PackageVersions.props</DotNetPackageVersionPropsPath>
 
     <!-- version numbers from files -->
     <RoslynPackageVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\..\RoslynPackageVersion.txt').Trim())</RoslynPackageVersion>
diff --git a/fcs/Directory.Build.props b/fcs/Directory.Build.props
index cdcbdd4b8b3..6535dbd2aea 100644
--- a/fcs/Directory.Build.props
+++ b/fcs/Directory.Build.props
@@ -4,17 +4,19 @@
     <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' AND '$(OS)' != 'Windows_NT'">$(HOME)/.nuget/packages/</NuGetPackageRoot>
     <NuGetPackageRoot Condition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' == 'Windows_NT'">$(NuGetPackageRoot)\</NuGetPackageRoot>
     <NuGetPackageRoot Condition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' != 'Windows_NT'">$(NuGetPackageRoot)/</NuGetPackageRoot>
+    <ArtifactsDir>$(MSBuildThisFileDirectory)..\artifacts</ArtifactsDir>
+    <ArtifactsBinDir>$(ArtifactsDir)\bin</ArtifactsBinDir>
+    <ArtifactsObjDir>$(ArtifactsDir)\obj</ArtifactsObjDir>
+    <OutputPath>$(ArtifactsBinDir)\fcs</OutputPath>
+    <IntermediateOutputPath>$(ArtifactsObjDir)\fcs</IntermediateOutputPath>
   </PropertyGroup>
 
   <!-- SDK targets override -->
   <PropertyGroup>
-    <ProtoOutputPath>$(MSBuildThisFileDirectory)..\Proto\net40\bin</ProtoOutputPath>
+    <ProtoOutputPath>$(ArtifactsBinDir)\FSharp.Build\Proto\net46</ProtoOutputPath>
   </PropertyGroup>
 
   <PropertyGroup Condition="Exists('$(ProtoOutputPath)')">
-    <!-- <FscToolPath>$(ProtoOutputPath)\</FscToolPath>
-    <FscToolExe>fsc.exe</FscToolExe>
-    <DotnetFscCompilerPath>- -nologo</DotnetFscCompilerPath> -->
     <FSharpTargetsPath>$(ProtoOutputPath)\Microsoft.FSharp.Targets</FSharpTargetsPath>
     <FSharpPropsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
     <FSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
diff --git a/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj b/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj
index 42b99d95a05..1126a60f2b6 100644
--- a/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj
+++ b/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj
@@ -7,7 +7,6 @@
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
-    <OutputPath>..\..\$(Configuration.ToLower())\fcs</OutputPath>
     <DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
     <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
   </PropertyGroup>
diff --git a/fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj b/fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj
index 1bf41b7bf27..c132ae80bb1 100644
--- a/fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj
+++ b/fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj
@@ -1,13 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\src</FSharpSourcesRoot>
-  </PropertyGroup>
   <Import Project="..\fcs.props" />
   <Import Project="..\netfx.props" />
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
-    <OutputPath>..\..\$(Configuration.ToLower())\fcs</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <Description>Legacy project file cracker for the F# compiler service.</Description>
@@ -25,8 +21,8 @@
     </Compile>
     <Compile Include="ProjectCracker.fs" />
     <Content Include="..\FSharp.Compiler.Service.ProjectCrackerTool\FSharp.Compiler.Service.ProjectCracker.targets" PackagePath="build\net45" />
-    <Content Include="..\..\release\fcs\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe" PackagePath="utilities\net45" />
-    <Content Include="..\..\release\fcs\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" PackagePath="utilities\net45" />
+    <Content Include="$(ArtifactsBinDir)\fcs\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe" PackagePath="utilities\net45" />
+    <Content Include="$(ArtifactsBinDir)\fcs\net45\FSharp.Compiler.Service.ProjectCrackerTool.exe.config" PackagePath="utilities\net45" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Runtime" />
diff --git a/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj b/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj
index 9dddb1cb616..9f690c58ea1 100644
--- a/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj
+++ b/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj
@@ -13,7 +13,6 @@
     <OtherFlags>$(OtherFlags) --staticlink:FSharp.Core</OtherFlags>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsPackable>false</IsPackable>
-    <OutputPath>..\..\$(Configuration.ToLower())\fcs</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ProjectCrackerOptions.fs" />
diff --git a/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
index 8d09c3a26f1..abe71b6159a 100644
--- a/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
+++ b/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
@@ -76,7 +76,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
     <PackageReference Include="NUnit" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
-    <PackageReference Include="Dotnet.ProjInfo" Version="0.9.0" />
+    <PackageReference Include="Dotnet.ProjInfo" Version="0.20.0" />
     <ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
index c5f1122386c..c5357aab06b 100644
--- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
+++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
@@ -12,7 +12,6 @@
     <DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
     <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
     <DefineConstants>$(DefineConstants);NO_STRONG_NAMES</DefineConstants>
-    <OutputPath>..\..\$(Configuration.ToLower())\fcs</OutputPath>
     <FsLexOutputFolder Condition="'$(TargetFramework)' != ''">$(TargetFramework)\</FsLexOutputFolder>
     <FsYaccOutputFolder Condition="'$(TargetFramework)' != ''">$(TargetFramework)\</FsYaccOutputFolder>
     <OtherFlags>$(OtherFlags) /warnon:1182</OtherFlags>
diff --git a/fcs/build.fsx b/fcs/build.fsx
index 204faa244ab..7f9f96f3574 100644
--- a/fcs/build.fsx
+++ b/fcs/build.fsx
@@ -13,8 +13,8 @@ open Fake.ReleaseNotesHelper
 #if MONO
 // prevent incorrect output encoding (e.g. https://github.com/fsharp/FAKE/issues/1196)
 System.Console.OutputEncoding <- System.Text.Encoding.UTF8
-CleanDir (__SOURCE_DIRECTORY__ + "/../tests/TestResults") 
-File.WriteAllText(__SOURCE_DIRECTORY__ + "/../tests/TestResults/notestsyet.txt","No tests yet")
+CleanDir (__SOURCE_DIRECTORY__ + "/../artifacts/TestResults") 
+File.WriteAllText(__SOURCE_DIRECTORY__ + "/../artifacts/TestResults/notestsyet.txt","No tests yet")
 let isMono = true
 #else
 let isMono = false
@@ -54,7 +54,7 @@ let runCmdIn workDir (exe:string) = Printf.ksprintf (fun (args:string) ->
 // The rest of the code is standard F# build script
 // --------------------------------------------------------------------------------------
 
-let releaseDir = Path.Combine(__SOURCE_DIRECTORY__, "../release/fcs")
+let releaseDir = Path.Combine(__SOURCE_DIRECTORY__, "../artifacts/bin/fcs")
 
 // Read release notes & version info from RELEASE_NOTES.md
 let release = LoadReleaseNotes (__SOURCE_DIRECTORY__ + "/RELEASE_NOTES.md")
diff --git a/fsharp.proj b/fsharp.proj
index 42d2f15b16f..e695da391c9 100644
--- a/fsharp.proj
+++ b/fsharp.proj
@@ -41,25 +41,25 @@
     <!-- product binaries -->
 
     <ItemGroup Condition="'$(BuildCompiler)' == 'true' OR '$(_RunningRestore)' == 'true'">
-      <Projects Include="src\fsharp\FSharp.Core\FSharp.Core.fsproj" />
-      <Projects Include="src\fsharp\FSharp.Build\FSharp.Build.fsproj" />
-      <Projects Include="src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
-      <Projects Include="src\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj" />
-      <Projects Include="src\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
-      <Projects Include="src\fsharp\Fsc\Fsc.fsproj" />
-      <Projects Include="src\fsharp\fsi\Fsi.fsproj" />
-      <Projects Include="src\fsharp\fsiAnyCpu\FsiAnyCPU.fsproj" />
-
-      <NugetProjects Include="src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.csproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Core\FSharp.Core.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Build\FSharp.Build.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)src\fsharp\fsc\fsc.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)src\fsharp\fsi\fsi.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)src\fsharp\fsiAnyCpu\fsiAnyCPU.fsproj" />
+
+      <NugetProjects Include="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(BuildVS)' == 'true' OR '$(_RunningRestore)' == 'true'">
-      <Projects Include="vsintegration\fsharp-vsintegration-src-build.proj" />
-      <Projects Include="vsintegration\fsharp-vsintegration-unittests-build.proj" />
-      <Projects Include="vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj" />
-      <Projects Include="vsintegration\fsharp-vsintegration-item-templates-build.proj" />
-      <Projects Include="vsintegration\fsharp-vsintegration-project-templates-build.proj" />
-      <Projects Include="vsintegration\fsharp-vsintegration-vsix-build.proj" />
+      <Projects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-src-build.proj" />
+      <Projects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-unittests-build.proj" />
+      <Projects Include="$(MSBuildThisFileDirectory)vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-item-templates-build.proj" />
+      <Projects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-project-templates-build.proj" />
+      <Projects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-vsix-build.proj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(BuildFCS)' == 'true' OR '$(_RunningRestore)' == 'true'">
@@ -70,41 +70,40 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(BuildSetup)' == 'true' OR '$(_RunningRestore)' == 'true'">
-      <Projects Include="setup\fsharp-setup-build.csproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)setup\fsharp-setup-build.csproj" />
     </ItemGroup>
 
     <!-- test binaries -->
 
     <ItemGroup Condition="'$(TestCompiler)' == 'true' OR '$(_RunningRestore)' == 'true'">
-      <Projects Include="tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" />
-      <Projects Include="tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" />
-      <Projects Include="tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TestFSharpSuite)' == 'true' OR '$(_RunningRestore)' == 'true'">
-      <Projects Include="tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" />
-      <Projects Include="tests\fsharp\SDKTests\AllSdkTargetsTests.proj" />
-      <Projects Include="tests\fsharpqa\testenv\src\PEVerify\PEVerify.csproj" />
-      <Projects Include="src\fsharp\FSharp.Compiler.nuget\Testing.FSharp.Compiler.csproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)tests\fsharp\FSharp.Tests.FSharpSuite.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)tests\fsharp\SDKTests\AllSdkTargetsTests.proj" />
+      <Projects Include="$(MSBuildThisFileDirectory)tests\fsharpqa\testenv\src\PEVerify\PEVerify.csproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Compiler.nuget\Testing.FSharp.Compiler.csproj" />
 
-      <NugetProjects Include="src\fsharp\FSharp.Compiler.nuget\Testing.FSharp.Compiler.csproj" />
+      <NugetProjects Include="$(MSBuildThisFileDirectory)src\fsharp\FSharp.Compiler.nuget\Testing.FSharp.Compiler.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TestFSharpQASuite)' == 'true' OR '$(_RunningRestore)' == 'true'">
-      <Projects Include="tests\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj" />
-      <Projects Include="tests\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj" />
-      <Projects Include="tests\fsharpqa\testenv\src\PEVerify\PEVerify.csproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)tests\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)tests\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)tests\fsharpqa\testenv\src\PEVerify\PEVerify.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TestFCS)' == 'true' OR '$(_RunningRestore)' == 'true'">
-      <Projects Include="fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" />
-      <Projects Include="tests\projects\Sample_NETCoreSDK_FSharp_Library_netstandard2_0\Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj" />
-      <Projects Include="tests\projects\Sample_NETCoreSDK_FSharp_Library_netstandard2_0\Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj" />
-      <Projects Include="fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)tests\projects\Sample_NETCoreSDK_FSharp_Library_netstandard2_0\Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj" />
+      <Projects Include="$(MSBuildThisFileDirectory)fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TestIDE)' == 'true' OR '$(_RunningRestore)' == 'true'">
-      <Projects Include="vsintegration\fsharp-vsintegration-unittests-build.proj" />
+      <Projects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-unittests-build.proj" />
     </ItemGroup>
 
   </Target>
@@ -116,24 +115,20 @@
   </Target>
 
   <Target Name="Build" DependsOnTargets="CollectProjects">
-    <ItemGroup>
-      <Projects Include="@(NugetProjects)" />
-    </ItemGroup>
-
-    <MSBuild Projects="@(Projects)" Targets="Build" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
+    <MSBuild Projects="@(Projects);@(NugetProjects)" Targets="Build" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
     <MSBuild Projects="@(NugetProjects)" Targets="Pack" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
   </Target>
 
   <Target Name="Rebuild" DependsOnTargets="CollectProjects">
-    <MSBuild Projects="@(Projects)" Targets="Rebuild" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
+    <MSBuild Projects="@(Projects);@(NugetProjects)" Targets="Rebuild" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
   </Target>
 
   <Target Name="Clean" DependsOnTargets="CollectProjects">
-    <MSBuild Projects="@(Projects)" Targets="Clean" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
+    <MSBuild Projects="@(Projects);@(NugetProjects)" Targets="Clean" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
   </Target>
 
   <Target Name="Restore" DependsOnTargets="_BeforeRestore;CollectProjects">
-    <MSBuild Projects="@(Projects)" Targets="Restore" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
+    <MSBuild Projects="@(Projects);@(NugetProjects)" Targets="Restore" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
   </Target>
 
 </Project>
diff --git a/init-tools.cmd b/init-tools.cmd
index 2c1b6d60bdb..cbdeb27afef 100644
--- a/init-tools.cmd
+++ b/init-tools.cmd
@@ -2,7 +2,7 @@
 setlocal enabledelayedexpansion
 
 set /p DOTNET_TOOLS_VERSION=<"%~dp0DotnetCLIToolsVersion.txt"
-set DOTNET_TOOLS_PATH=%~dp0Tools\dotnet20
+set DOTNET_TOOLS_PATH=%~dp0artifacts\toolset\dotnet
 set dotnetexe=%DOTNET_TOOLS_PATH%\dotnet.exe
 set sdksentinel=%DOTNET_TOOLS_PATH%\sdk-version.txt
 
diff --git a/proto.proj b/proto.proj
index 96f223470ec..c3a704496ee 100644
--- a/proto.proj
+++ b/proto.proj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <Projects Include="src\buildtools\buildtools.proj" />
     <Projects Include="src\fsharp\FSharp.Build\FSharp.Build.fsproj" />
-    <Projects Include="src\fsharp\Fsc\Fsc.fsproj" />
+    <Projects Include="src\fsharp\fsc\fsc.fsproj" />
   </ItemGroup>
 
   <Target Name="Build">
diff --git a/setup/Directory.Build.props b/setup/Directory.Build.props
index 64b72eafc9f..bd233e75785 100644
--- a/setup/Directory.Build.props
+++ b/setup/Directory.Build.props
@@ -1,12 +1,21 @@
 <Project>
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-  <Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildCorePackageVersion)\build\MicroBuild.Core.props" />
-  <Import Project="FSharp.Setup.props" />
+  <Import Project="Localization.props" />
 
   <PropertyGroup>
     <DisableOutputPathCopying>true</DisableOutputPathCopying>
     <EnableXlfLocalization>false</EnableXlfLocalization>
+    <SetupRootFolder>$(MSBuildThisFileDirectory)</SetupRootFolder>
+    <SetupResourcesDirectory>$(SetupRootFolder)resources</SetupResourcesDirectory>
+    <BinariesDir>$(SetupRootFolder)..\artifacts\bin</BinariesDir>
+    <OutputPath>$(ArtifactsDir)\VSSetup\$(Configuration)</OutputPath>
+    <IntermediateOutputPath>$(ArtifactsDir)\VSSetup.obj\$(Configuration)\$(MSBuildProjectName)</IntermediateOutputPath>
+    <VsixBuildLocation>$(SetupRootFolder)..\artifacts\VSSetup\$(Configuration)</VsixBuildLocation>
+    <InsertionDir>$(SetupRootFolder)..\artifacts\VSSetup\$(Configuration)\Insertion</InsertionDir>
+
+    <!-- FSharpPackageVersion should be {VS version}.{today's date}.{build number}. Example: 15.6.20160901.3 -->
+    <FSharpPackageVersion>$(VSMajorVersion).$(VSMinorVersion).$(BUILD_BUILDNUMBER)</FSharpPackageVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/setup/Directory.Build.targets b/setup/Directory.Build.targets
index 0619a12001e..ccd47cc0a9a 100644
--- a/setup/Directory.Build.targets
+++ b/setup/Directory.Build.targets
@@ -1,4 +1,3 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
-  <Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildCorePackageVersion)\build\MicroBuild.Core.targets" />
 </Project>
diff --git a/setup/FSharp.Setup.props b/setup/FSharp.Setup.props
deleted file mode 100644
index 25398779040..00000000000
--- a/setup/FSharp.Setup.props
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<Project>
-    <PropertyGroup>
-        <SetupRootFolder>$(MSBuildThisFileDirectory)</SetupRootFolder>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <!-- FSharpPackageVersion should be {VS version}.{today's date}.{build number}. Example: 15.6.20160901.3 -->
-        <FSharpPackageVersion>$(VSMajorVersion).$(VSMinorVersion).$(BUILD_BUILDNUMBER)</FSharpPackageVersion>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <BinariesDir>$(SetupRootFolder)\..\$(Configuration)</BinariesDir>
-        <VsixBuildLocation>$(BinariesDir)\net40\bin\</VsixBuildLocation>
-        <InsertionDir>$(BinariesDir)\insertion</InsertionDir>
-        <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-        <OutputPath Condition="'$(Lang)' == ''">$(BinariesDir)\setup</OutputPath>
-        <OutputPath Condition="'$(Lang)' != ''">$(BinariesDir)\setup\$(Lang)</OutputPath>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <SetupLanguages Include="ENU">
-            <LocaleCode>ENU</LocaleCode>
-            <LocaleId>1033</LocaleId>
-            <LocaleParentId>9</LocaleParentId>
-            <LocaleParentCulture>en</LocaleParentCulture>
-            <LocaleSpecificCulture>en-US</LocaleSpecificCulture>
-            <IsLangPack>false</IsLangPack>
-        </SetupLanguages>
-        <SetupLanguages Include="CHT">
-            <LocaleCode>CHT</LocaleCode>
-            <LocaleId>1028</LocaleId>
-            <LocaleParentId>31748</LocaleParentId>
-            <LocaleParentCulture>zh-Hant</LocaleParentCulture>
-            <LocaleSpecificCulture>zh-TW</LocaleSpecificCulture>
-            <IsLangPack>true</IsLangPack>
-        </SetupLanguages>
-        <SetupLanguages Include="CSY">
-            <LocaleCode>CSY</LocaleCode>
-            <LocaleId>1029</LocaleId>
-            <LocaleParentId>5</LocaleParentId>
-            <LocaleParentCulture>cs</LocaleParentCulture>
-            <LocaleSpecificCulture>cs-CZ</LocaleSpecificCulture>
-            <IsLangPack>true</IsLangPack>
-        </SetupLanguages>
-        <SetupLanguages Include="DEU">
-            <LocaleCode>DEU</LocaleCode>
-            <LocaleId>1031</LocaleId>
-            <LocaleParentId>7</LocaleParentId>
-            <LocaleParentCulture>de</LocaleParentCulture>
-            <LocaleSpecificCulture>de-DE</LocaleSpecificCulture>
-            <IsLangPack>true</IsLangPack>
-        </SetupLanguages>
-        <SetupLanguages Include="FRA">
-            <LocaleCode>FRA</LocaleCode>
-            <LocaleId>1036</LocaleId>
-            <LocaleParentId>12</LocaleParentId>
-            <LocaleParentCulture>fr</LocaleParentCulture>
-            <LocaleSpecificCulture>fr-FR</LocaleSpecificCulture>
-            <IsLangPack>true</IsLangPack>
-        </SetupLanguages>
-        <SetupLanguages Include="ITA">
-            <LocaleCode>ITA</LocaleCode>
-            <LocaleId>1040</LocaleId>
-            <LocaleParentId>16</LocaleParentId>
-            <LocaleParentCulture>it</LocaleParentCulture>
-            <LocaleSpecificCulture>it-IT</LocaleSpecificCulture>
-            <IsLangPack>true</IsLangPack>
-        </SetupLanguages>
-        <SetupLanguages Include="JPN">
-            <LocaleCode>JPN</LocaleCode>
-            <LocaleId>1041</LocaleId>
-            <LocaleParentId>17</LocaleParentId>
-            <LocaleParentCulture>ja</LocaleParentCulture>
-            <LocaleSpecificCulture>ja-JP</LocaleSpecificCulture>
-            <IsLangPack>true</IsLangPack>
-        </SetupLanguages>
-        <SetupLanguages Include="KOR">
-            <LocaleCode>KOR</LocaleCode>
-            <LocaleId>1042</LocaleId>
-            <LocaleParentId>18</LocaleParentId>
-            <LocaleParentCulture>ko</LocaleParentCulture>
-            <LocaleSpecificCulture>ko-KR</LocaleSpecificCulture>
-            <IsLangPack>true</IsLangPack>
-        </SetupLanguages>
-        <SetupLanguages Include="PLK">
-            <LocaleCode>PLK</LocaleCode>
-            <LocaleId>1045</LocaleId>
-            <LocaleParentId>21</LocaleParentId>
-            <LocaleParentCulture>pl</LocaleParentCulture>
-            <LocaleSpecificCulture>pl-PL</LocaleSpecificCulture>
-            <IsLangPack>true</IsLangPack>
-        </SetupLanguages>
-        <SetupLanguages Include="PTB">
-            <LocaleCode>PTB</LocaleCode>
-            <LocaleId>1046</LocaleId>
-            <LocaleParentId>1046</LocaleParentId>
-            <LocaleParentCulture>pt-BR</LocaleParentCulture>
-            <LocaleSpecificCulture>pt-BR</LocaleSpecificCulture>
-            <IsLangPack>true</IsLangPack>
-        </SetupLanguages>
-        <SetupLanguages Include="RUS">
-            <LocaleCode>RUS</LocaleCode>
-            <LocaleId>1049</LocaleId>
-            <LocaleParentId>25</LocaleParentId>
-            <LocaleParentCulture>ru</LocaleParentCulture>
-            <LocaleSpecificCulture>ru-RU</LocaleSpecificCulture>
-            <IsLangPack>true</IsLangPack>
-        </SetupLanguages>
-        <SetupLanguages Include="TRK">
-            <LocaleCode>TRK</LocaleCode>
-            <LocaleId>1055</LocaleId>
-            <LocaleParentId>31</LocaleParentId>
-            <LocaleParentCulture>tr</LocaleParentCulture>
-            <LocaleSpecificCulture>tr-TR</LocaleSpecificCulture>
-            <IsLangPack>true</IsLangPack>
-        </SetupLanguages>
-        <SetupLanguages Include="CHS">
-            <LocaleCode>CHS</LocaleCode>
-            <LocaleId>2052</LocaleId>
-            <LocaleParentId>4</LocaleParentId>
-            <LocaleParentCulture>zh-Hans</LocaleParentCulture>
-            <LocaleSpecificCulture>zh-CN</LocaleSpecificCulture>
-            <IsLangPack>true</IsLangPack>
-        </SetupLanguages>
-        <SetupLanguages Include="ESN">
-            <LocaleCode>ESN</LocaleCode>
-            <LocaleId>3082</LocaleId>
-            <LocaleParentId>10</LocaleParentId>
-            <LocaleParentCulture>es</LocaleParentCulture>
-            <LocaleSpecificCulture>es-ES</LocaleSpecificCulture>
-            <IsLangPack>true</IsLangPack>
-        </SetupLanguages>
-    </ItemGroup>
-
-</Project>
diff --git a/setup/Localization.props b/setup/Localization.props
new file mode 100644
index 00000000000..37c13afcd2c
--- /dev/null
+++ b/setup/Localization.props
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
+<Project>
+
+  <ItemGroup>
+    <SetupLanguages Include="ENU">
+      <LocaleCode>ENU</LocaleCode>
+      <LocaleId>1033</LocaleId>
+      <LocaleParentId>9</LocaleParentId>
+      <LocaleParentCulture>en</LocaleParentCulture>
+      <LocaleSpecificCulture>en-US</LocaleSpecificCulture>
+      <IsLangPack>false</IsLangPack>
+    </SetupLanguages>
+    <SetupLanguages Include="CHT">
+      <LocaleCode>CHT</LocaleCode>
+      <LocaleId>1028</LocaleId>
+      <LocaleParentId>31748</LocaleParentId>
+      <LocaleParentCulture>zh-Hant</LocaleParentCulture>
+      <LocaleSpecificCulture>zh-TW</LocaleSpecificCulture>
+      <IsLangPack>true</IsLangPack>
+    </SetupLanguages>
+    <SetupLanguages Include="CSY">
+      <LocaleCode>CSY</LocaleCode>
+      <LocaleId>1029</LocaleId>
+      <LocaleParentId>5</LocaleParentId>
+      <LocaleParentCulture>cs</LocaleParentCulture>
+      <LocaleSpecificCulture>cs-CZ</LocaleSpecificCulture>
+      <IsLangPack>true</IsLangPack>
+    </SetupLanguages>
+    <SetupLanguages Include="DEU">
+      <LocaleCode>DEU</LocaleCode>
+      <LocaleId>1031</LocaleId>
+      <LocaleParentId>7</LocaleParentId>
+      <LocaleParentCulture>de</LocaleParentCulture>
+      <LocaleSpecificCulture>de-DE</LocaleSpecificCulture>
+      <IsLangPack>true</IsLangPack>
+    </SetupLanguages>
+    <SetupLanguages Include="FRA">
+      <LocaleCode>FRA</LocaleCode>
+      <LocaleId>1036</LocaleId>
+      <LocaleParentId>12</LocaleParentId>
+      <LocaleParentCulture>fr</LocaleParentCulture>
+      <LocaleSpecificCulture>fr-FR</LocaleSpecificCulture>
+      <IsLangPack>true</IsLangPack>
+    </SetupLanguages>
+    <SetupLanguages Include="ITA">
+      <LocaleCode>ITA</LocaleCode>
+      <LocaleId>1040</LocaleId>
+      <LocaleParentId>16</LocaleParentId>
+      <LocaleParentCulture>it</LocaleParentCulture>
+      <LocaleSpecificCulture>it-IT</LocaleSpecificCulture>
+      <IsLangPack>true</IsLangPack>
+    </SetupLanguages>
+    <SetupLanguages Include="JPN">
+      <LocaleCode>JPN</LocaleCode>
+      <LocaleId>1041</LocaleId>
+      <LocaleParentId>17</LocaleParentId>
+      <LocaleParentCulture>ja</LocaleParentCulture>
+      <LocaleSpecificCulture>ja-JP</LocaleSpecificCulture>
+      <IsLangPack>true</IsLangPack>
+    </SetupLanguages>
+    <SetupLanguages Include="KOR">
+      <LocaleCode>KOR</LocaleCode>
+      <LocaleId>1042</LocaleId>
+      <LocaleParentId>18</LocaleParentId>
+      <LocaleParentCulture>ko</LocaleParentCulture>
+      <LocaleSpecificCulture>ko-KR</LocaleSpecificCulture>
+      <IsLangPack>true</IsLangPack>
+    </SetupLanguages>
+    <SetupLanguages Include="PLK">
+      <LocaleCode>PLK</LocaleCode>
+      <LocaleId>1045</LocaleId>
+      <LocaleParentId>21</LocaleParentId>
+      <LocaleParentCulture>pl</LocaleParentCulture>
+      <LocaleSpecificCulture>pl-PL</LocaleSpecificCulture>
+      <IsLangPack>true</IsLangPack>
+    </SetupLanguages>
+    <SetupLanguages Include="PTB">
+      <LocaleCode>PTB</LocaleCode>
+      <LocaleId>1046</LocaleId>
+      <LocaleParentId>1046</LocaleParentId>
+      <LocaleParentCulture>pt-BR</LocaleParentCulture>
+      <LocaleSpecificCulture>pt-BR</LocaleSpecificCulture>
+      <IsLangPack>true</IsLangPack>
+    </SetupLanguages>
+    <SetupLanguages Include="RUS">
+      <LocaleCode>RUS</LocaleCode>
+      <LocaleId>1049</LocaleId>
+      <LocaleParentId>25</LocaleParentId>
+      <LocaleParentCulture>ru</LocaleParentCulture>
+      <LocaleSpecificCulture>ru-RU</LocaleSpecificCulture>
+      <IsLangPack>true</IsLangPack>
+    </SetupLanguages>
+    <SetupLanguages Include="TRK">
+      <LocaleCode>TRK</LocaleCode>
+      <LocaleId>1055</LocaleId>
+      <LocaleParentId>31</LocaleParentId>
+      <LocaleParentCulture>tr</LocaleParentCulture>
+      <LocaleSpecificCulture>tr-TR</LocaleSpecificCulture>
+      <IsLangPack>true</IsLangPack>
+    </SetupLanguages>
+    <SetupLanguages Include="CHS">
+      <LocaleCode>CHS</LocaleCode>
+      <LocaleId>2052</LocaleId>
+      <LocaleParentId>4</LocaleParentId>
+      <LocaleParentCulture>zh-Hans</LocaleParentCulture>
+      <LocaleSpecificCulture>zh-CN</LocaleSpecificCulture>
+      <IsLangPack>true</IsLangPack>
+    </SetupLanguages>
+    <SetupLanguages Include="ESN">
+      <LocaleCode>ESN</LocaleCode>
+      <LocaleId>3082</LocaleId>
+      <LocaleParentId>10</LocaleParentId>
+      <LocaleParentCulture>es</LocaleParentCulture>
+      <LocaleSpecificCulture>es-ES</LocaleSpecificCulture>
+      <IsLangPack>true</IsLangPack>
+    </SetupLanguages>
+  </ItemGroup>
+
+</Project>
diff --git a/setup/Swix/Directory.Build.props b/setup/Swix/Directory.Build.props
index 92203d4e217..f64df1d29de 100644
--- a/setup/Swix/Directory.Build.props
+++ b/setup/Swix/Directory.Build.props
@@ -1,14 +1,14 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  <Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildCorePackageVersion)\build\MicroBuild.Core.props" />
 
   <PropertyGroup>
+    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <OutputArchitecture>neutral</OutputArchitecture>
     <OutputLocalized>false</OutputLocalized>
     <OutputType>vsix</OutputType>
     <IsPackage>true</IsPackage>
-    <BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
-    <OutputPath>$(BinariesFolder)\insertion</OutputPath>
-    <IntermediateOutputPath>$(MSBuildProjectDirectory)\obj</IntermediateOutputPath>
+    <BinariesFolder>$(ArtifactsBinDir)</BinariesFolder>
   </PropertyGroup>
 
 </Project>
diff --git a/setup/Swix/Directory.Build.targets b/setup/Swix/Directory.Build.targets
index 14437118703..974c6da4f1b 100644
--- a/setup/Swix/Directory.Build.targets
+++ b/setup/Swix/Directory.Build.targets
@@ -1,3 +1,10 @@
 <Project>
+
+  <PropertyGroup>
+    <!-- for everything else, $(PackageOutputPath) is interpreted as a directory, but for the SWIX toolset a file name -->
+    <PackageOutputPath>$(ArtifactsDir)\VSSetup\$(Configuration)\Insertion\$(OutputName).vsix</PackageOutputPath>
+  </PropertyGroup>
+
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+  <Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildCorePackageVersion)\build\MicroBuild.Core.targets" />
 </Project>
diff --git a/setup/Swix/Microsoft.FSharp.Compiler.Resources/Files.swr b/setup/Swix/Microsoft.FSharp.Compiler.Resources/Files.swr
index 464fdd774ee..f3f60d490b9 100644
--- a/setup/Swix/Microsoft.FSharp.Compiler.Resources/Files.swr
+++ b/setup/Swix/Microsoft.FSharp.Compiler.Resources/Files.swr
@@ -5,7 +5,7 @@ package name=Microsoft.FSharp.Compiler.Resources
         vs.package.language=$(LocaleSpecificCulture)
 
 folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\$(LocaleParentCulture)"
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Build.resources.dll"
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Compiler.Interactive.Settings.resources.dll"
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Compiler.Private.resources.dll"
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Core.resources.dll"
+  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\net46\$(LocaleParentCulture)\FSharp.Build.resources.dll"
+  file source="$(BinariesFolder)\FSharp.Compiler.Interactive.Settings\$(Configuration)\net46\$(LocaleParentCulture)\FSharp.Compiler.Interactive.Settings.resources.dll"
+  file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\net46\$(LocaleParentCulture)\FSharp.Compiler.Private.resources.dll"
+  file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\$(LocaleParentCulture)\FSharp.Core.resources.dll"
diff --git a/setup/Swix/Microsoft.FSharp.Compiler.Resources/Microsoft.FSharp.Compiler.Resources.swixproj b/setup/Swix/Microsoft.FSharp.Compiler.Resources/Microsoft.FSharp.Compiler.Resources.swixproj
index 166cbb2d519..ac8e74d4854 100644
--- a/setup/Swix/Microsoft.FSharp.Compiler.Resources/Microsoft.FSharp.Compiler.Resources.swixproj
+++ b/setup/Swix/Microsoft.FSharp.Compiler.Resources/Microsoft.FSharp.Compiler.Resources.swixproj
@@ -10,6 +10,7 @@
 
   <PropertyGroup>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);Configuration=$(Configuration)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleParentCulture=$(LocaleParentCulture)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleSpecificCulture=$(LocaleSpecificCulture)</PackagePreprocessorDefinitions>
diff --git a/setup/Swix/Microsoft.FSharp.Compiler/Files.swr b/setup/Swix/Microsoft.FSharp.Compiler/Files.swr
index 58129a51ee0..b56667d2465 100644
--- a/setup/Swix/Microsoft.FSharp.Compiler/Files.swr
+++ b/setup/Swix/Microsoft.FSharp.Compiler/Files.swr
@@ -5,35 +5,35 @@ package name=Microsoft.FSharp.Compiler
 
 folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp"
 
-  file source=$(BinariesFolder)\net40\bin\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)\net40\bin\fsc.exe.config"
+  file source=$(BinariesFolder)\fsc\$(Configuration)\net46\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)\net46\fsc.exe.config"
 
-  file source=$(BinariesFolder)\net40\bin\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)\net40\bin\fsi.exe.config"
+  file source=$(BinariesFolder)\fsi\$(Configuration)\net46\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)\net46\fsi.exe.config"
 
-  file source="$(BinariesFolder)\net40\bin\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)\net40\bin\fsiAnyCpu.exe.config"
+  file source="$(BinariesFolder)\fsiAnyCpu\$(Configuration)\net46\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)\net46\fsiAnyCpu.exe.config"
 
-  file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Interactive.Settings.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
-  file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Private.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
-  file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Server.Shared.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
+  file source="$(BinariesFolder)\FSharp.Compiler.Interactive.Settings\$(Configuration)\net46\FSharp.Compiler.Interactive.Settings.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
+  file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\net46\FSharp.Compiler.Private.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
+  file source="$(BinariesFolder)\FSharp.Compiler.Server.Shared\$(Configuration)\net46\FSharp.Compiler.Server.Shared.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
 
-  file source="$(BinariesFolder)\net40\bin\FSharp.Core.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
-  file source="$(BinariesFolder)\net40\bin\FSharp.Core.optdata"
-  file source="$(BinariesFolder)\net40\bin\FSharp.Core.sigdata"
+  file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\FSharp.Core.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
+  file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\FSharp.Core.optdata"
+  file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\FSharp.Core.sigdata"
 
-  file source="$(BinariesFolder)\net40\bin\FSharp.Build.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
+  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\net46\FSharp.Build.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
 
   file source="$(PackagesFolder)\Microsoft.VisualFSharp.Type.Providers.Redist\$(MicrosoftVisualFSharpTypeProvidersRedistPackageVersion)\content\4.3.0.0\FSharp.Data.TypeProviders.dll"
-  file source="$(BinariesFolder)\net40\bin\Microsoft.Build.dll"
-  file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Framework.dll"
-  file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Tasks.Core.dll"
-  file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Utilities.Core.dll"
-  file source="$(BinariesFolder)\net40\bin\Microsoft.Portable.FSharp.Targets"
-  file source="$(BinariesFolder)\net40\bin\System.Collections.Immutable.dll"
-  file source="$(BinariesFolder)\net40\bin\System.Reflection.Metadata.dll"
-  file source="$(BinariesFolder)\net40\bin\System.ValueTuple.dll"
-  file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.props"
-  file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.targets"
-  file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.Overrides.NetSdk.targets"
-  file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.Targets"
+  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\net46\Microsoft.Build.dll"
+  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\net46\Microsoft.Build.Framework.dll"
+  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\net46\Microsoft.Build.Tasks.Core.dll"
+  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\net46\Microsoft.Build.Utilities.Core.dll"
+  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\net46\Microsoft.Portable.FSharp.Targets"
+  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\net46\System.Collections.Immutable.dll"
+  file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\net46\System.Reflection.Metadata.dll"
+  file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\net46\System.ValueTuple.dll"
+  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\net46\Microsoft.FSharp.NetSdk.props"
+  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\net46\Microsoft.FSharp.NetSdk.targets"
+  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\net46\Microsoft.FSharp.Overrides.NetSdk.targets"
+  file source="$(BinariesFolder)\FSharp.Build\$(Configuration)\net46\Microsoft.FSharp.Targets"
diff --git a/setup/Swix/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.swixproj b/setup/Swix/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.swixproj
index 955da213a71..f256dd46779 100644
--- a/setup/Swix/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.swixproj
+++ b/setup/Swix/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.swixproj
@@ -10,6 +10,7 @@
 
   <PropertyGroup>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);Configuration=$(Configuration)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);PackagesFolder=$(NuGetPackageRoot)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpTreeRoot=$(FSharpTreeRoot)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr b/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr
index 6ded7ba325f..c1ec9568099 100644
--- a/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr
+++ b/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr
@@ -4,16 +4,16 @@ package name=Microsoft.FSharp.Dependencies
         version=$(FSharpPackageVersion)
 
 folder "InstallDir:MSBuild\Microsoft\VisualStudio\v$(VSGeneralVersion)\FSharp"
-  file "Microsoft.FSharp.targets" source="$(BinariesFolder)\setup\$(TargetFramework)\resources\Microsoft.FSharp.Shim.targets"
-  file "Microsoft.Portable.FSharp.targets" source="$(BinariesFolder)\setup\$(TargetFramework)\resources\Microsoft.Portable.FSharp.Shim.targets"
-  file "Microsoft.FSharp.NetSdk.targets" source="$(BinariesFolder)\setup\$(TargetFramework)\resources\Microsoft.FSharp.NetSdk.Shim.targets"
-  file "Microsoft.FSharp.Overrides.NetSdk.targets" source="$(BinariesFolder)\setup\$(TargetFramework)\resources\Microsoft.FSharp.Overrides.NetSdk.Shim.targets"
-  file "Microsoft.FSharp.NetSdk.props" source="$(BinariesFolder)\setup\$(TargetFramework)\resources\Microsoft.FSharp.NetSdk.Shim.props"
+  file "Microsoft.FSharp.targets" source="$(SetupShimsDir)\Microsoft.FSharp.Shim.targets"
+  file "Microsoft.Portable.FSharp.targets" source="$(SetupShimsDir)\Microsoft.Portable.FSharp.Shim.targets"
+  file "Microsoft.FSharp.NetSdk.targets" source="$(SetupShimsDir)\Microsoft.FSharp.NetSdk.Shim.targets"
+  file "Microsoft.FSharp.Overrides.NetSdk.targets" source="$(SetupShimsDir)\Microsoft.FSharp.Overrides.NetSdk.Shim.targets"
+  file "Microsoft.FSharp.NetSdk.props" source="$(SetupShimsDir)\Microsoft.FSharp.NetSdk.Shim.props"
 
 folder "InstallDir:Common7\IDE\PublicAssemblies"
-  file source="$(BinariesFolder)\net40\bin\FSharp.Core.dll" vs.file.ngen=yes
-  file source="$(BinariesFolder)\net40\bin\FSharp.Core.optdata"
-  file source="$(BinariesFolder)\net40\bin\FSharp.Core.sigdata"
+  file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\FSharp.Core.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\FSharp.Core.optdata"
+  file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\FSharp.Core.sigdata"
 
 folder "InstallDir:Common7\Tools\VsDevCmd\Ext"
   file source="fsharp.bat"
diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj
index dd1452bbefc..e30eaaf0fe1 100644
--- a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj
+++ b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj
@@ -10,7 +10,9 @@
 
   <PropertyGroup>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);Configuration=$(Configuration)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);SetupShimsDir=$(MSBuildThisFileDirectory)..\..\shims</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);TargetFramework=$(TargetFramework)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);VSGeneralVersion=$(VSGeneralVersion)</PackagePreprocessorDefinitions>
   </PropertyGroup>
diff --git a/setup/Swix/Microsoft.FSharp.IDE/Files.swr b/setup/Swix/Microsoft.FSharp.IDE/Files.swr
index 0d47c502090..2e0ee2bcf3b 100644
--- a/setup/Swix/Microsoft.FSharp.IDE/Files.swr
+++ b/setup/Swix/Microsoft.FSharp.IDE/Files.swr
@@ -4,10 +4,10 @@ package name=Microsoft.FSharp.IDE
         version=$(FSharpPackageVersion)
 
 folder "InstallDir:Common7\IDE\NewScriptItems"
-  file source="$(BinariesFolder)\setup\$(TargetFramework)\resources\NewFileDialog\Script\NewFSharpScriptItems.vsdir"
-  file source="$(BinariesFolder)\setup\$(TargetFramework)\resources\NewFileDialog\Script\Script.fsx"
+  file source="$(SetupResourcesDir)\NewFileDialog\Script\NewFSharpScriptItems.vsdir"
+  file source="$(SetupResourcesDir)\NewFileDialog\Script\Script.fsx"
 
 folder "InstallDir:Common7\IDE\NewFileItems"
-  file source="$(BinariesFolder)\setup\$(TargetFramework)\resources\NewFileDialog\General\NewFSharpFileItems.vsdir"
-  file source="$(BinariesFolder)\setup\$(TargetFramework)\resources\NewFileDialog\General\File.fs"
-  file source="$(BinariesFolder)\setup\$(TargetFramework)\resources\NewFileDialog\General\Script.fsx"
+  file source="$(SetupResourcesDir)\NewFileDialog\General\NewFSharpFileItems.vsdir"
+  file source="$(SetupResourcesDir)\NewFileDialog\General\File.fs"
+  file source="$(SetupResourcesDir)\NewFileDialog\General\Script.fsx"
diff --git a/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.swixproj b/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.swixproj
index b26924e23c2..223a7262fcb 100644
--- a/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.swixproj
+++ b/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.swixproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);SetupResourcesDir=$(MSBuildThisFileDirectory)..\..\resources</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);TargetFramework=$(TargetFramework)</PackagePreprocessorDefinitions>
   </PropertyGroup>
 
diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr
index a8c5becc80e..f3b95d49900 100644
--- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr
+++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr
@@ -5,16 +5,16 @@ package name=Microsoft.FSharp.VSIX.Full.Resources
         vs.package.language=$(LocaleSpecificCulture)
 
 folder "InstallDir:Common7\IDE\PublicAssemblies\$(LocaleParentCulture)"
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Core.resources.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\$(LocaleParentCulture)\FSharp.Core.resources.dll" vs.file.ngen=yes
 
 folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\$(LocaleParentCulture)"
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Compiler.Private.resources.dll" vs.file.ngen=yes
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Core.resources.dll" vs.file.ngen=yes
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Editor.resources.dll" vs.file.ngen=yes
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.LanguageService.Base.resources.dll" vs.file.ngen=yes
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.LanguageService.resources.dll" vs.file.ngen=yes
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.ProjectSystem.Base.resources.dll" vs.file.ngen=yes
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.ProjectSystem.FSharp.resources.dll" vs.file.ngen=yes
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.ProjectSystem.PropertyPages.resources.dll" vs.file.ngen=yes
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.UIResources.resources.dll" vs.file.ngen=yes
-  file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.VS.FSI.resources.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\FSharp.Compiler.Private\$(Configuration)\net46\$(LocaleParentCulture)\FSharp.Compiler.Private.resources.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\FSharp.Core\$(Configuration)\net45\$(LocaleParentCulture)\FSharp.Core.resources.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\FSharp.Editor\$(Configuration)\net46\$(LocaleParentCulture)\FSharp.Editor.resources.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\FSharp.LanguageService.Base\$(Configuration)\net46\$(LocaleParentCulture)\FSharp.LanguageService.Base.resources.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\FSharp.LanguageService\$(Configuration)\net46\$(LocaleParentCulture)\FSharp.LanguageService.resources.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\ProjectSystem.Base\$(Configuration)\net46\$(LocaleParentCulture)\FSharp.ProjectSystem.Base.resources.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\ProjectSystem\$(Configuration)\net46\$(LocaleParentCulture)\FSharp.ProjectSystem.FSharp.resources.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\FSharp.PropertiesPages\$(Configuration)\net46\$(LocaleParentCulture)\FSharp.ProjectSystem.PropertyPages.resources.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\FSharp.UIResources\$(Configuration)\net46\$(LocaleParentCulture)\FSharp.UIResources.resources.dll" vs.file.ngen=yes
+  file source="$(BinariesFolder)\FSharp.VS.FSI\$(Configuration)\net46\$(LocaleParentCulture)\FSharp.VS.FSI.resources.dll" vs.file.ngen=yes
diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj
index fd39c147b4c..d8952b40fe7 100644
--- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj
+++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);Configuration=$(Configuration)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode)</PackagePreprocessorDefinitions>
diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Templates.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Templates.swr
index 770d904e226..5de89f0cadd 100644
--- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Templates.swr
+++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Templates.swr
@@ -6,8 +6,8 @@ package name=Microsoft.FSharp.VSIX.Full.Resources
 
 folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)"
   folder "ConsoleApplication"
-    file source="$(BinariesFolder)\net40\bin\ProjectTemplates\FSharp\$(LocaleParentId)\ConsoleApplication.zip"
+    file source="$(BinariesFolder)\ConsoleProject\$(Configuration)\$(LocaleParentId)\ConsoleApplication.zip"
   folder "Library"
-    file source="$(BinariesFolder)\net40\bin\ProjectTemplates\FSharp\$(LocaleParentId)\Library.zip"
+    file source="$(BinariesFolder)\LibraryProject\$(Configuration)\$(LocaleParentId)\Library.zip"
   folder "Tutorial"
-    file source="$(BinariesFolder)\net40\bin\ProjectTemplates\FSharp\$(LocaleParentId)\Tutorial.zip"
+    file source="$(BinariesFolder)\TutorialProject\$(Configuration)\$(LocaleParentId)\Tutorial.zip"
diff --git a/setup/Swix/Microsoft.FSharp.vsmanproj b/setup/Swix/Microsoft.FSharp.vsmanproj
index d2b0388c272..ec9461e1137 100644
--- a/setup/Swix/Microsoft.FSharp.vsmanproj
+++ b/setup/Swix/Microsoft.FSharp.vsmanproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <FinalizeManifest>true</FinalizeManifest>
     <FinalizeSkipLayout>true</FinalizeSkipLayout>
-    <InsertionDir>$(OutputPath)</InsertionDir>
+    <InsertionDir>$(OutputPath)\Insertion</InsertionDir>
     <ManifestBuildVersion>$(FSharpPackageVersion)</ManifestBuildVersion>
   </PropertyGroup>
 
@@ -23,17 +23,17 @@
 
   <Target Name="IncludeFSharpManifests" DependsOnTargets="CopyInsertionItems">
     <ItemGroup>
-      <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Compiler.json" />
-      <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Compiler.Resources.%(SetupLanguages.LocaleCode).json" />
+      <MergeManifest Include="$(InsertionDir)\Microsoft.FSharp.Compiler.json" />
+      <MergeManifest Include="$(InsertionDir)\Microsoft.FSharp.Compiler.Resources.%(SetupLanguages.LocaleCode).json" />
 
-      <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.json" />
+      <MergeManifest Include="$(InsertionDir)\Microsoft.FSharp.SDK.json" />
 
-      <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Full.Core.json" />
-      <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Full.Resources.%(SetupLanguages.LocaleCode).json" />
+      <MergeManifest Include="$(InsertionDir)\Microsoft.FSharp.Vsix.Full.Core.json" />
+      <MergeManifest Include="$(InsertionDir)\Microsoft.FSharp.Vsix.Full.Resources.%(SetupLanguages.LocaleCode).json" />
 
-      <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.VSIX.Templates.json" />
-      <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Dependencies.json" />
-      <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.IDE.json" />
+      <MergeManifest Include="$(InsertionDir)\Microsoft.FSharp.VSIX.Templates.json" />
+      <MergeManifest Include="$(InsertionDir)\Microsoft.FSharp.Dependencies.json" />
+      <MergeManifest Include="$(InsertionDir)\Microsoft.FSharp.IDE.json" />
     </ItemGroup>
   </Target>
 
diff --git a/setup/publish-assets.ps1 b/setup/publish-assets.ps1
index 29604698b4c..bfa905bbad9 100644
--- a/setup/publish-assets.ps1
+++ b/setup/publish-assets.ps1
@@ -16,7 +16,8 @@ The API key used to authenticate with MyGet.
 Param(
     [string]$binariesPath = $null,
     [string]$branchName = $null,
-    [string]$apiKey = $null
+    [string]$apiKey = $null,
+    [string]$configuration = $null
 )
 
 Set-StrictMode -Version 2.0
@@ -40,7 +41,7 @@ try {
     }
 
     $branchName = $branchName.Replace("/", "_") # can't have slashes in the branch name
-    $vsix = Join-Path $binariesPath "net40\bin\VisualFSharpFull.vsix"
+    $vsix = Join-Path $binariesPath "VisualFSharpFull\$configuration\net46\VisualFSharpFull.vsix"
 
     Write-Host "  Uploading '$vsix' to '$requestUrl'."
 
diff --git a/setup/resources/Microsoft.FSharp.NetSdk.Shim.props b/setup/shims/Microsoft.FSharp.NetSdk.Shim.props
similarity index 100%
rename from setup/resources/Microsoft.FSharp.NetSdk.Shim.props
rename to setup/shims/Microsoft.FSharp.NetSdk.Shim.props
diff --git a/setup/resources/Microsoft.FSharp.NetSdk.Shim.targets b/setup/shims/Microsoft.FSharp.NetSdk.Shim.targets
similarity index 100%
rename from setup/resources/Microsoft.FSharp.NetSdk.Shim.targets
rename to setup/shims/Microsoft.FSharp.NetSdk.Shim.targets
diff --git a/setup/resources/Microsoft.FSharp.Overrides.NetSdk.Shim.targets b/setup/shims/Microsoft.FSharp.Overrides.NetSdk.Shim.targets
similarity index 100%
rename from setup/resources/Microsoft.FSharp.Overrides.NetSdk.Shim.targets
rename to setup/shims/Microsoft.FSharp.Overrides.NetSdk.Shim.targets
diff --git a/setup/resources/Microsoft.FSharp.Shim.targets b/setup/shims/Microsoft.FSharp.Shim.targets
similarity index 100%
rename from setup/resources/Microsoft.FSharp.Shim.targets
rename to setup/shims/Microsoft.FSharp.Shim.targets
diff --git a/setup/resources/Microsoft.Portable.FSharp.Shim.targets b/setup/shims/Microsoft.Portable.FSharp.Shim.targets
similarity index 100%
rename from setup/resources/Microsoft.Portable.FSharp.Shim.targets
rename to setup/shims/Microsoft.Portable.FSharp.Shim.targets
diff --git a/src/buildtools/Directory.Build.props b/src/buildtools/Directory.Build.props
index bb5b23d29d0..12d9ad073ec 100644
--- a/src/buildtools/Directory.Build.props
+++ b/src/buildtools/Directory.Build.props
@@ -1,3 +1,3 @@
 <Project>
-  <!-- empty to prevent directory crawling -->
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 </Project>
diff --git a/src/buildtools/Directory.Build.targets b/src/buildtools/Directory.Build.targets
index bb5b23d29d0..14437118703 100644
--- a/src/buildtools/Directory.Build.targets
+++ b/src/buildtools/Directory.Build.targets
@@ -1,3 +1,3 @@
 <Project>
-  <!-- empty to prevent directory crawling -->
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 </Project>
diff --git a/src/buildtools/buildtools.targets b/src/buildtools/buildtools.targets
index 9285a376e88..9b00e18cf72 100644
--- a/src/buildtools/buildtools.targets
+++ b/src/buildtools/buildtools.targets
@@ -15,7 +15,7 @@
           BeforeTargets="CoreCompile">
 
     <PropertyGroup>
-        <FsLexPath>$(MSBuildThisFileDirectory)fslex\bin\Proto\netcoreapp2.0\fslex.dll</FsLexPath>
+        <FsLexPath>$(ArtifactsBinDir)\fslex\Proto\netcoreapp2.0\fslex.dll</FsLexPath>
     </PropertyGroup>
 
     <!-- Create the output directory -->
@@ -38,7 +38,7 @@
           BeforeTargets="CoreCompile">
 
     <PropertyGroup>
-        <FsYaccPath>$(MSBuildThisFileDirectory)fsyacc\bin\Proto\netcoreapp2.0\fsyacc.dll</FsYaccPath>
+        <FsYaccPath>$(ArtifactsBinDir)\fsyacc\Proto\netcoreapp2.0\fsyacc.dll</FsYaccPath>
     </PropertyGroup>
 
     <!-- Create the output directory -->
diff --git a/src/fsharp/Directory.Build.props b/src/fsharp/Directory.Build.props
index 57c8aa24ba7..151415117e4 100644
--- a/src/fsharp/Directory.Build.props
+++ b/src/fsharp/Directory.Build.props
@@ -6,6 +6,7 @@
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <UseStandardResourceNames>false</UseStandardResourceNames>
+    <PackageOutputPath>$(ArtifactsPackagesDir)\$(Configuration)</PackageOutputPath>
   </PropertyGroup>
 
 </Project>
diff --git a/src/fsharp/Directory.Nuget.props b/src/fsharp/Directory.Nuget.props
index 97266b7c79d..6521936cfe3 100644
--- a/src/fsharp/Directory.Nuget.props
+++ b/src/fsharp/Directory.Nuget.props
@@ -20,6 +20,7 @@
       tags=$(PackageTags);
       githeadsha=$(NormalizedGitHeadSha);
       configuration=$(Configuration);
+      artifactsbindir=$(ArtifactsBinDir);
     </NuspecProperties>
   </PropertyGroup>
 
diff --git a/src/fsharp/Directory.Nuget.targets b/src/fsharp/Directory.Nuget.targets
index f3ae171dc38..e30b155faad 100644
--- a/src/fsharp/Directory.Nuget.targets
+++ b/src/fsharp/Directory.Nuget.targets
@@ -8,14 +8,4 @@
     </NuspecProperties>
   </PropertyGroup>
 
-  <Target Name="CopyPackageToArtifactsDirectory"
-          AfterTargets="Pack">
-    <ItemGroup>
-      <NugetPackages Include="$(MSBuildProjectDirectory)\**\$(PackageId).*.nupkg" />
-    </ItemGroup>
-    <MakeDir Directories="$(RepoRoot)artifacts;$(RepoRoot)$(Configuration)\artifacts" />
-    <Copy SourceFiles="@(NugetPackages)" DestinationFolder="$(RepoRoot)\artifacts" />
-    <Copy SourceFiles="@(NugetPackages)" DestinationFolder="$(RepoRoot)\$(Configuration)\artifacts" />
-  </Target>
-
 </Project>
diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
index 97d17b10972..46e8888f03b 100644
--- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -21,14 +21,17 @@
   </PropertyGroup>
 
   <Target Name="CopyToBuiltBin" BeforeTargets="BuiltProjectOutputGroup" AfterTargets="CoreCompile">
+    <PropertyGroup>
+      <BuildOutputGroupLocation>$(BaseOutputPath)\$(Configuration)\$(TargetFramework)</BuildOutputGroupLocation>
+    </PropertyGroup>
     <ItemGroup>
-      <BuiltProjectOutputGroupKeyOutput Include="$(FSharpSourcesRoot)\..\$(Configuration)\net40\bin\Microsoft.Build.Framework.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(FSharpSourcesRoot)\..\$(Configuration)\net40\bin\Microsoft.Build.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(FSharpSourcesRoot)\..\$(Configuration)\net40\bin\Microsoft.Build.Utilities.Core.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(FSharpSourcesRoot)\..\$(Configuration)\net40\bin\Microsoft.Build.Tasks.Core.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(FSharpSourcesRoot)\..\$(Configuration)\net40\bin\System.Reflection.Metadata.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(FSharpSourcesRoot)\..\$(Configuration)\net40\bin\System.Collections.Immutable.dll" />
-      <BuiltProjectOutputGroupKeyOutput Include="$(FSharpSourcesRoot)\..\$(Configuration)\net40\bin\System.ValueTuple.dll" />
+      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\Microsoft.Build.Framework.dll" />
+      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\Microsoft.Build.dll" />
+      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\Microsoft.Build.Utilities.Core.dll" />
+      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\Microsoft.Build.Tasks.Core.dll" />
+      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.Reflection.Metadata.dll" />
+      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.Collections.Immutable.dll" />
+      <BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.ValueTuple.dll" />
     </ItemGroup>
   </Target>
 
diff --git a/src/fsharp/FSharp.Compiler.nuget/Directory.Build.targets b/src/fsharp/FSharp.Compiler.nuget/Directory.Build.targets
index a20d4be41e6..7d885b518db 100644
--- a/src/fsharp/FSharp.Compiler.nuget/Directory.Build.targets
+++ b/src/fsharp/FSharp.Compiler.nuget/Directory.Build.targets
@@ -4,8 +4,8 @@
   <Import Project="$(MSBuildThisFileDirectory)..\Directory.Nuget.targets" />
 
   <ItemGroup>
-    <ProjectReference Include="..\Fsc\Fsc.fsproj" />
-    <ProjectReference Include="..\fsi\Fsi.fsproj" />
+    <ProjectReference Include="..\fsc\fsc.fsproj" />
+    <ProjectReference Include="..\fsi\fsi.fsproj" />
     <ProjectReference Include="..\FSharp.Build\FSharp.Build.fsproj" />
     <ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
   </ItemGroup>
diff --git a/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec
index ac76a4a2403..87ef49f5521 100644
--- a/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec
+++ b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec
@@ -54,30 +54,30 @@
             this approach gives a very small deployment. Which is kind of necessary.
         -->
         <!-- assemblies -->
-        <file src="bin\$configuration$\netcoreapp2.1\fsc.exe"                                     target="lib\netcoreapp2.1" />
-        <file src="bin\$configuration$\netcoreapp2.1\fsi.exe"                                     target="lib\netcoreapp2.1" />
-        <file src="bin\$configuration$\netcoreapp2.1\FSharp.Core.dll"                             target="lib\netcoreapp2.1" />
-        <file src="bin\$configuration$\netcoreapp2.1\FSharp.Compiler.Private.dll"                 target="lib\netcoreapp2.1" />
-        <file src="bin\$configuration$\netcoreapp2.1\FSharp.Build.dll"                            target="lib\netcoreapp2.1" />
-        <file src="bin\$configuration$\netcoreapp2.1\FSharp.Compiler.Interactive.Settings.dll"    target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\fsc\$configuration$\netcoreapp2.1\fsc.exe"                                                                    target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\fsi\$configuration$\netcoreapp2.0\fsi.exe"                                                                    target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\FSharp.Core\$configuration$\netstandard1.6\FSharp.Core.dll"                                                   target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\FSharp.Compiler.Private\$configuration$\netstandard1.6\FSharp.Compiler.Private.dll"                           target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\FSharp.Build\$configuration$\netstandard2.0\FSharp.Build.dll"                                                 target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\FSharp.Compiler.Interactive.Settings\$configuration$\netstandard1.6\FSharp.Compiler.Interactive.Settings.dll" target="lib\netcoreapp2.1" />
         <!-- symbols -->
-        <file src="bin\$configuration$\netcoreapp2.1\fsc.pdb"                                     target="lib\netcoreapp2.1" />
-        <file src="bin\$configuration$\netcoreapp2.1\fsi.pdb"                                     target="lib\netcoreapp2.1" />
-        <file src="bin\$configuration$\netcoreapp2.1\FSharp.Core.pdb"                             target="lib\netcoreapp2.1" />
-        <file src="bin\$configuration$\netcoreapp2.1\FSharp.Compiler.Private.pdb"                 target="lib\netcoreapp2.1" />
-        <file src="bin\$configuration$\netcoreapp2.1\FSharp.Build.pdb"                            target="lib\netcoreapp2.1" />
-        <file src="bin\$configuration$\netcoreapp2.1\FSharp.Compiler.Interactive.Settings.pdb"    target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\fsc\$configuration$\netcoreapp2.1\fsc.pdb"                                                                    target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\fsi\$configuration$\netcoreapp2.0\fsi.pdb"                                                                    target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\FSharp.Core\$configuration$\netstandard1.6\FSharp.Core.pdb"                                                   target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\FSharp.Compiler.Private\$configuration$\netstandard1.6\FSharp.Compiler.Private.pdb"                           target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\FSharp.Build\$configuration$\netstandard2.0\FSharp.Build.pdb"                                                 target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\FSharp.Compiler.Interactive.Settings\$configuration$\netstandard1.6\FSharp.Compiler.Interactive.Settings.pdb" target="lib\netcoreapp2.1" />
         <!-- additional files -->
-        <file src="bin\$configuration$\netcoreapp2.1\default.win32manifest"                       target="contentFiles\any\any"  />
-        <file src="bin\$configuration$\netcoreapp2.1\Microsoft.FSharp.Targets"                    target="contentFiles\any\any"  />
-        <file src="bin\$configuration$\netcoreapp2.1\Microsoft.Portable.FSharp.Targets"           target="contentFiles\any\any"  />
-        <file src="bin\$configuration$\netcoreapp2.1\Microsoft.FSharp.NetSdk.props"               target="contentFiles\any\any"  />
-        <file src="bin\$configuration$\netcoreapp2.1\Microsoft.FSharp.NetSdk.targets"             target="contentFiles\any\any"  />
-        <file src="bin\$configuration$\netcoreapp2.1\Microsoft.FSharp.Overrides.NetSdk.targets"   target="contentFiles\any\any"  />
+        <file src="$artifactsbindir$\fsc\$configuration$\netcoreapp2.1\default.win32manifest"                               target="contentFiles\any\any" />
+        <file src="$artifactsbindir$\FSharp.Build\$configuration$\netstandard2.0\Microsoft.FSharp.Targets"                  target="contentFiles\any\any" />
+        <file src="$artifactsbindir$\FSharp.Build\$configuration$\netstandard2.0\Microsoft.Portable.FSharp.Targets"         target="contentFiles\any\any" />
+        <file src="$artifactsbindir$\FSharp.Build\$configuration$\netstandard2.0\Microsoft.FSharp.NetSdk.props"             target="contentFiles\any\any" />
+        <file src="$artifactsbindir$\FSharp.Build\$configuration$\netstandard2.0\Microsoft.FSharp.NetSdk.targets"           target="contentFiles\any\any" />
+        <file src="$artifactsbindir$\FSharp.Build\$configuration$\netstandard2.0\Microsoft.FSharp.Overrides.NetSdk.targets" target="contentFiles\any\any" />
         <!-- resources -->
-        <file src="bin\$configuration$\netcoreapp2.1\**\FSharp.Core.resources.dll"                          target="lib\netcoreapp2.1" />
-        <file src="bin\$configuration$\netcoreapp2.1\**\FSharp.Compiler.Private.resources.dll"              target="lib\netcoreapp2.1" />
-        <file src="bin\$configuration$\netcoreapp2.1\**\FSharp.Compiler.Interactive.Settings.resources.dll" target="lib\netcoreapp2.1" />
-        <file src="bin\$configuration$\netcoreapp2.1\**\FSharp.Build.resources.dll"                         target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\FSharp.Core\$configuration$\netstandard1.6\**\FSharp.Core.resources.dll"                                                   target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\FSharp.Compiler.Private\$configuration$\netstandard1.6\**\FSharp.Compiler.Private.resources.dll"                           target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\FSharp.Compiler.Interactive.Settings\$configuration$\netstandard1.6\**\FSharp.Compiler.Interactive.Settings.resources.dll" target="lib\netcoreapp2.1" />
+        <file src="$artifactsbindir$\FSharp.Build\$configuration$\netstandard2.0\**\FSharp.Build.resources.dll"                                                 target="lib\netcoreapp2.1" />
     </files>
 </package>
diff --git a/src/fsharp/FSharp.Core/FSharp.Core.nuspec b/src/fsharp/FSharp.Core/FSharp.Core.nuspec
index 21b484cb8ab..443388a8278 100644
--- a/src/fsharp/FSharp.Core/FSharp.Core.nuspec
+++ b/src/fsharp/FSharp.Core/FSharp.Core.nuspec
@@ -56,18 +56,18 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="bin\$configuration$\netstandard1.6\FSharp.Core.dll"          target="lib\netstandard1.6" />
-        <file src="bin\$configuration$\netstandard1.6\FSharp.Core.sigdata"      target="lib\netstandard1.6" />
-        <file src="bin\$configuration$\netstandard1.6\FSharp.Core.optdata"      target="lib\netstandard1.6" />
-        <file src="bin\$configuration$\netstandard1.6\FSharp.Core.xml"          target="lib\netstandard1.6" />
+        <file src="$artifactsbindir$\FSharp.Core\$configuration$\netstandard1.6\FSharp.Core.dll"     target="lib\netstandard1.6" />
+        <file src="$artifactsbindir$\FSharp.Core\$configuration$\netstandard1.6\FSharp.Core.sigdata" target="lib\netstandard1.6" />
+        <file src="$artifactsbindir$\FSharp.Core\$configuration$\netstandard1.6\FSharp.Core.optdata" target="lib\netstandard1.6" />
+        <file src="$artifactsbindir$\FSharp.Core\$configuration$\netstandard1.6\FSharp.Core.xml"     target="lib\netstandard1.6" />
 
-        <file src="bin\$configuration$\net45\FSharp.Core.dll"            target="lib\net45" />
-        <file src="bin\$configuration$\net45\FSharp.Core.sigdata"        target="lib\net45" />
-        <file src="bin\$configuration$\net45\FSharp.Core.optdata"        target="lib\net45" />
-        <file src="bin\$configuration$\net45\FSharp.Core.xml"            target="lib\net45" />
+        <file src="$artifactsbindir$\FSharp.Core\$configuration$\net45\FSharp.Core.dll"     target="lib\net45" />
+        <file src="$artifactsbindir$\FSharp.Core\$configuration$\net45\FSharp.Core.sigdata" target="lib\net45" />
+        <file src="$artifactsbindir$\FSharp.Core\$configuration$\net45\FSharp.Core.optdata" target="lib\net45" />
+        <file src="$artifactsbindir$\FSharp.Core\$configuration$\net45\FSharp.Core.xml"     target="lib\net45" />
 
         <!-- resources -->
-        <file src="bin\$configuration$\netstandard1.6\**\FSharp.Core.resources.dll" target="lib\netstandard1.6" />
-        <file src="bin\$configuration$\net45\**\FSharp.Core.resources.dll"   target="lib\net45" />
+        <file src="$artifactsbindir$\FSharp.Core\$configuration$\netstandard1.6\**\FSharp.Core.resources.dll" target="lib\netstandard1.6" />
+        <file src="$artifactsbindir$\FSharp.Core\$configuration$\**\FSharp.Core.resources.dll"                target="lib\net45" />
     </files>
 </package>
diff --git a/src/fsharp/Fsc/InternalsVisibleTo.fs b/src/fsharp/fsc/InternalsVisibleTo.fs
similarity index 100%
rename from src/fsharp/Fsc/InternalsVisibleTo.fs
rename to src/fsharp/fsc/InternalsVisibleTo.fs
diff --git a/src/fsharp/Fsc/app.config b/src/fsharp/fsc/app.config
similarity index 100%
rename from src/fsharp/Fsc/app.config
rename to src/fsharp/fsc/app.config
diff --git a/src/fsharp/Fsc/Fsc.fsproj b/src/fsharp/fsc/fsc.fsproj
similarity index 100%
rename from src/fsharp/Fsc/Fsc.fsproj
rename to src/fsharp/fsc/fsc.fsproj
diff --git a/src/fsharp/fsi/Fsi.fsproj b/src/fsharp/fsi/fsi.fsproj
similarity index 96%
rename from src/fsharp/fsi/Fsi.fsproj
rename to src/fsharp/fsi/fsi.fsproj
index 9fbc4dc1331..6a4b7df15d5 100644
--- a/src/fsharp/fsi/Fsi.fsproj
+++ b/src/fsharp/fsi/fsi.fsproj
@@ -28,10 +28,10 @@
   <ItemGroup>
     <ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj" />
     <ProjectReference Include="..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
+    <ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
 
     <!-- only used when '$(TargetFramework)' == 'netstandard2.0' -->
     <ProjectReference Include="..\FSharp.Build\FSharp.Build.fsproj" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-    <ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
 
     <!-- only used when '$(TargetFramework)' == 'net46' -->
     <ProjectReference Include="..\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj" Condition="'$(TargetFramework)' == 'net46'" />
diff --git a/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj b/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj
similarity index 100%
rename from src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
rename to src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj
diff --git a/tests/.gitignore b/tests/.gitignore
index 2de72583ada..bf970a32fde 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,6 +1,5 @@
 FSharp_*
 net40-fsharpqa-suite-*
 CoreUnit_*
-TestResults
 *.il
 dont.run.peverify
\ No newline at end of file
diff --git a/tests/FSharp.Directory.Build.props b/tests/FSharp.Directory.Build.props
index 19257808542..bb8eac309b1 100644
--- a/tests/FSharp.Directory.Build.props
+++ b/tests/FSharp.Directory.Build.props
@@ -1,9 +1,3 @@
 <Project>
-
   <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
-  <PropertyGroup>
-    <DisableOutputPathCopying></DisableOutputPathCopying>
-  </PropertyGroup>
-
 </Project>
diff --git a/tests/fsharp/SDKTests/AllSdkTargetsTests.proj b/tests/fsharp/SDKTests/AllSdkTargetsTests.proj
index 857e3efd636..9da3a21fea1 100644
--- a/tests/fsharp/SDKTests/AllSdkTargetsTests.proj
+++ b/tests/fsharp/SDKTests/AllSdkTargetsTests.proj
@@ -1,7 +1,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">release</Configuration>
+    <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/fsharp/SDKTests/tests/Test.props b/tests/fsharp/SDKTests/tests/Test.props
index fdfc314758e..b4665ec5749 100644
--- a/tests/fsharp/SDKTests/tests/Test.props
+++ b/tests/fsharp/SDKTests/tests/Test.props
@@ -6,14 +6,14 @@
     <_TargetFrameworkVersionWithoutV Condition="'$(_TargetFrameworkVersionWithoutV)' == ''">4.6</_TargetFrameworkVersionWithoutV>
     <TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">.NETFramework</TargetFrameworkIdentifier>
 
-    <Configuration Condition="'$(Configuration)' == ''">release</Configuration>
-    <BinariesDirectory>$(MSBuildThisFileDirectory)..\..\..\..\$(Configuration)\net40\bin</BinariesDirectory>
+    <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
+    <TargetsDirectory>$(MSBuildThisFileDirectory)..\..\..\..\artifacts\bin\FSharp.Build\$(Configuration)\net46</TargetsDirectory>
 
     <!-- these properties don't really matter, but they're necessary to make MSBuild happy -->
     <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
     <OutputPath>$(MSBuildThisFileDirectory)</OutputPath>
   </PropertyGroup>
 
-  <Import Project="$(BinariesDirectory)\Microsoft.FSharp.NetSdk.props" />
+  <Import Project="$(TargetsDirectory)\Microsoft.FSharp.NetSdk.props" />
 
 </Project>
diff --git a/tests/fsharp/SDKTests/tests/Test.targets b/tests/fsharp/SDKTests/tests/Test.targets
index 5526c118403..6f1638051d8 100644
--- a/tests/fsharp/SDKTests/tests/Test.targets
+++ b/tests/fsharp/SDKTests/tests/Test.targets
@@ -1,6 +1,6 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="$(BinariesDirectory)\Microsoft.FSharp.NetSdk.targets" />
+  <Import Project="$(TargetsDirectory)\Microsoft.FSharp.NetSdk.targets" />
 
   <Target Name="Test">
 
diff --git a/tests/fsharp/Test.Directory.Build.props b/tests/fsharp/Test.Directory.Build.props
deleted file mode 100644
index 6603d10e659..00000000000
--- a/tests/fsharp/Test.Directory.Build.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <FSharpTargetsPath>$(CompilerTestPath)\Microsoft.FSharp.Targets</FSharpTargetsPath>
-    <FSharpPropsShim>$(CompilerTestPath)\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
-    <FSharpTargetsShim>$(CompilerTestPath)\Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
-    <FSharpOverridesTargetsShim>$(CompilerTestPath)\Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
-  </PropertyGroup>
-</Project>
diff --git a/tests/fsharp/single-test.fs b/tests/fsharp/single-test.fs
index 4e221bed17c..14a79c360d2 100644
--- a/tests/fsharp/single-test.fs
+++ b/tests/fsharp/single-test.fs
@@ -62,10 +62,10 @@ type ProjectConfiguration = {
 
 let replaceTokens tag (replacement:string) (template:string) = template.Replace(tag, replacement)
 
-let generateProps testCompilerVersion=
+let generateProps testCompilerVersion =
     let template = @"<Project>
   <PropertyGroup>
-    <Configuration Condition=""'$(Configuration)' == ''"">release</Configuration>
+    <Configuration Condition=""'$(Configuration)' == ''"">Release</Configuration>
     <FSharpTestCompilerVersion>$(TESTCOMPILERVERSION)</FSharpTestCompilerVersion>
   </PropertyGroup>
   <Import Project=""$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.props', '$(PROJECTDIRECTORY)'))"" />
@@ -96,13 +96,13 @@ let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework =
             let condition = if addCondition then " Condition=\"Exists('" + fileName + "')\"" else ""
             match compileItem with
             | CompileItem.Compile ->
-                "\n    <Compile Include ='" + fileName + "'" + condition + " />"
+                "\n    <Compile Include='" + fileName + "'" + condition + " />"
             | CompileItem.Reference ->
-                "\n    <Reference Include ='" + fileName + "'" + condition + " />"
+                "\n    <Reference Include='" + fileName + "'" + condition + " />"
             | CompileItem.UseSource ->
-                "\n    <UseSource Include ='" + fileName + "'" + condition + " />"
+                "\n    <UseSource Include='" + fileName + "'" + condition + " />"
             | CompileItem.LoadSource ->
-                "\n    <LoadSource Include ='" + fileName + "'" + condition + " />"
+                "\n    <LoadSource Include='" + fileName + "'" + condition + " />"
 
         sources
         |> List.map(fun src -> computeInclude src)
@@ -215,7 +215,7 @@ let singleTestBuildAndRunCore cfg copyFiles p =
                     let projectBody = generateProjectArtifacts pc targetFramework 
                     emitFile projectFileName projectBody
                     use testOkFile = new FileGuard(Path.Combine(directory, "test.ok"))
-                    exec { cfg with Directory = directory }  cfg.DotNet20Exe (sprintf "run -f %s" targetFramework)
+                    exec { cfg with Directory = directory }  cfg.DotNetExe (sprintf "run -f %s" targetFramework)
                     testOkFile.CheckExists()
                 executeFsc compilerType targetFramework
             else
@@ -225,7 +225,7 @@ let singleTestBuildAndRunCore cfg copyFiles p =
                     let projectBody = generateProjectArtifacts pc targetFramework 
                     emitFile projectFileName projectBody
                     use testOkFile = new FileGuard(Path.Combine(directory, "test.ok"))
-                    exec { cfg with Directory = directory }  cfg.DotNet20Exe "build /t:RunFSharpScript"
+                    exec { cfg with Directory = directory }  cfg.DotNetExe "build /t:RunFSharpScript"
                     testOkFile.CheckExists()
                 executeFsi compilerType targetFramework
                 result <- true
diff --git a/tests/fsharp/test-framework.fs b/tests/fsharp/test-framework.fs
index e00fc7111e7..85bc6319f19 100644
--- a/tests/fsharp/test-framework.fs
+++ b/tests/fsharp/test-framework.fs
@@ -122,19 +122,19 @@ type TestConfig =
       BUILD_CONFIG : string
       FSC : string
       fsc_flags : string
-      BinPath : string
       FSCOREDLLPATH : string
       FSI : string
 #if !FSHARP_SUITE_DRIVES_CORECLR_TESTS
       FSIANYCPU : string
 #endif
       FSI_FOR_SCRIPTS : string
+      FSharpBuild : string
+      FSharpCompilerInteractiveSettings : string
       fsi_flags : string
       ILDASM : string
       PEVERIFY : string
       Directory: string 
       DotNetExe: string
-      DotNet20Exe: string
       DefaultPlatform: string}
 
 
@@ -157,11 +157,21 @@ let config configurationName envVars =
     let SCRIPT_ROOT = __SOURCE_DIRECTORY__
     let packagesDir = Environment.GetEnvironmentVariable("USERPROFILE") ++ ".nuget" ++ "packages"
 #if NET46
-    let architecture = "net40"
+    let fscArchitecture = "net46"
+    let fsiArchitecture = "net46"
+    let fsharpCoreArchitecture = "net45"
+    let fsharpBuildArchitecture = "net46"
+    let fsharpCompilerInteractiveSettingsArchitecture = "net46"
 #else
-    let architecture = "coreclr"
+    let fscArchitecture = "netcoreapp2.1"
+    let fsiArchitecture = "netcoreapp2.0"
+    let fsharpCoreArchitecture = "netstandard1.6"
+    let fsharpBuildArchitecture = "netstandard2.0"
+    let fsharpCompilerInteractiveSettingsArchitecture = "netstandard1.6"
 #endif
-    let BINPATH = SCRIPT_ROOT ++ ".." ++ ".." ++ configurationName ++ architecture ++ "bin"
+    let repoRoot = SCRIPT_ROOT ++ ".." ++ ".."
+    let artifactsPath = repoRoot ++ "artifacts"
+    let artifactsBinPath = artifactsPath ++ "bin"
     let csc_flags = "/nologo" 
     let fsc_flags = "-r:System.Core.dll --nowarn:20 --define:COMPILED"
     let fsi_flags = "-r:System.Core.dll --nowarn:20 --define:INTERACTIVE --maxerrors:1 --abortonerror"
@@ -170,20 +180,20 @@ let config configurationName envVars =
     let CSC = requireFile (packagesDir ++ "Microsoft.Net.Compilers" ++ "2.7.0" ++ "tools" ++ "csc.exe")
     let ILDASM = requireFile (packagesDir ++ ("runtime.win-" + architectureMoniker + ".Microsoft.NETCore.ILDAsm") ++ "2.0.3" ++ "runtimes" ++ ("win-" + architectureMoniker) ++ "native" ++ "ildasm.exe")
     let coreclrdll = requireFile (packagesDir ++ ("runtime.win-" + architectureMoniker + ".Microsoft.NETCore.Runtime.CoreCLR") ++ "2.0.3" ++ "runtimes" ++ ("win-" + architectureMoniker) ++ "native" ++ "coreclr.dll")
-    let PEVERIFY = requireFile (SCRIPT_ROOT ++ ".." ++ "fsharpqa" ++ "testenv" ++ "src" ++ "PEVerify" ++ "bin" ++ configurationName ++ "net46" ++ "PEVerify.exe")
-    let FSI_FOR_SCRIPTS = BINPATH ++ "fsi.exe"
-    let toolsDir = SCRIPT_ROOT ++ ".." ++ ".." ++ "Tools"
-    let dotNetExe = toolsDir ++ "dotnetcli" ++ "dotnet.exe"
-    let dotNet20Exe = toolsDir ++ "dotnet20" ++ "dotnet.exe"
+    let PEVERIFY = requireFile (artifactsBinPath ++ "PEVerify" ++ configurationName ++ "net46" ++ "PEVerify.exe")
+    let FSI_FOR_SCRIPTS = artifactsBinPath ++ "fsi" ++ configurationName ++ fsiArchitecture ++ "fsi.exe"
+    let FSharpBuild = requireFile (artifactsBinPath ++ "FSharp.Build" ++ configurationName ++ fsharpBuildArchitecture ++ "FSharp.Build.dll")
+    let FSharpCompilerInteractiveSettings = requireFile (artifactsBinPath ++ "FSharp.Compiler.Interactive.Settings" ++ configurationName ++ fsharpCompilerInteractiveSettingsArchitecture ++ "FSharp.Compiler.Interactive.Settings.dll")
+    let dotNetExe = artifactsPath ++ "toolset" ++ "dotnet" ++ "dotnet.exe"
     // ildasm requires coreclr.dll to run which has already been restored to the packages directory
     File.Copy(coreclrdll, Path.GetDirectoryName(ILDASM) ++ "coreclr.dll", overwrite=true)
 
-    let FSI = requireFile (BINPATH ++ "fsi.exe")
+    let FSI = requireFile (FSI_FOR_SCRIPTS)
 #if !FSHARP_SUITE_DRIVES_CORECLR_TESTS
-    let FSIANYCPU = requireFile (BINPATH ++ "fsiAnyCpu.exe")
+    let FSIANYCPU = requireFile (artifactsBinPath ++ "fsiAnyCpu" ++ configurationName ++ "net46" ++ "fsiAnyCpu.exe")
 #endif
-    let FSC = requireFile (BINPATH ++ "fsc.exe")
-    let FSCOREDLLPATH = requireFile (BINPATH ++ "FSharp.Core.dll")
+    let FSC = requireFile (artifactsBinPath ++ "fsc" ++ configurationName ++ fscArchitecture ++ "fsc.exe")
+    let FSCOREDLLPATH = requireFile (artifactsBinPath ++ "FSharp.Core" ++ configurationName ++ fsharpCoreArchitecture ++ "FSharp.Core.dll")
 
     let defaultPlatform = 
         match Is64BitOperatingSystem with 
@@ -193,7 +203,6 @@ let config configurationName envVars =
         | false -> "win7-x86"
 
     { EnvironmentVariables = envVars
-      BinPath = BINPATH |> Commands.pathAddBackslash
       FSCOREDLLPATH = FSCOREDLLPATH
       ILDASM = ILDASM
       PEVERIFY = PEVERIFY
@@ -205,12 +214,13 @@ let config configurationName envVars =
       FSIANYCPU = FSIANYCPU
 #endif
       FSI_FOR_SCRIPTS = FSI_FOR_SCRIPTS
+      FSharpBuild = FSharpBuild
+      FSharpCompilerInteractiveSettings = FSharpCompilerInteractiveSettings
       csc_flags = csc_flags
       fsc_flags = fsc_flags 
       fsi_flags = fsi_flags 
       Directory="" 
       DotNetExe = dotNetExe
-      DotNet20Exe = dotNet20Exe
       DefaultPlatform = defaultPlatform }
 
 let logConfig (cfg: TestConfig) =
@@ -222,7 +232,6 @@ let logConfig (cfg: TestConfig) =
     log "csc_flags           =%s" cfg.csc_flags
     log "FSC                 =%s" cfg.FSC
     log "fsc_flags           =%s" cfg.fsc_flags
-    log "BINPATH             =%s" cfg.BinPath
     log "FSCOREDLLPATH       =%s" cfg.FSCOREDLLPATH
     log "FSI                 =%s" cfg.FSI
 #if !FSHARP_SUITE_DRIVES_CORECLR_TESTS
@@ -452,6 +461,7 @@ let rm cfg x = Commands.rm cfg.Directory x
 let rmdir cfg x = Commands.rmdir cfg.Directory x
 let mkdir cfg = Commands.mkdir_p cfg.Directory
 let copy_y cfg f = Commands.copy_y cfg.Directory f >> checkResult
+let copySystemValueTuple cfg = copy_y cfg (getDirectoryName(cfg.FSC) ++ "System.ValueTuple.dll") ("." ++ "System.ValueTuple.dll")
 
 let diff normalize path1 path2 =
     let result = System.Text.StringBuilder()
diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index d18197ee20d..7f5804ea1f2 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -326,7 +326,7 @@ module CoreTests =
 
         fsc cfg "%s -a -o:lib.dll" cfg.fsc_flags ["lib.fs"]
 
-        copy_y cfg  (cfg.BinPath ++ "System.ValueTuple.dll") ("." ++ "System.ValueTuple.dll")
+        copySystemValueTuple cfg
         peverify cfg "lib.dll"
 
         fsc cfg "%s -r:lib.dll" cfg.fsc_flags ["test.fsx"]
@@ -479,7 +479,7 @@ module CoreTests =
 
         fsc cfg "%s -a -o:lib.dll -g" cfg.fsc_flags ["lib.fs"]
 
-        copy_y cfg  (cfg.BinPath ++ "System.ValueTuple.dll") ("." ++ "System.ValueTuple.dll")
+        copySystemValueTuple cfg
 
         peverify cfg "lib.dll"
 
@@ -789,7 +789,7 @@ module CoreTests =
 
         fsc cfg "%s -o:test.exe -r cslib.dll -g" cfg.fsc_flags ["test.fsx"]
 
-        copy_y cfg  (cfg.BinPath ++ "System.ValueTuple.dll") ("." ++ "System.ValueTuple.dll")
+        copySystemValueTuple cfg
 
         peverify cfg "test.exe"
 
@@ -1072,7 +1072,7 @@ module CoreTests =
 
         echo "Test 6================================================="
 
-        fscAppend cfg stdoutPath stderrPath "--nologo -r FSharp.Compiler.Interactive.Settings" ["usesfsi.fsx"]
+        fscAppend cfg stdoutPath stderrPath "--nologo -r \"%s\"" cfg.FSharpCompilerInteractiveSettings ["usesfsi.fsx"]
 
         echo "Test 7================================================="
 
@@ -1632,13 +1632,13 @@ module CoreTests =
     let verify () = 
         let cfg = testConfig "core/verify"
 
-        peverifyWithArgs cfg "/nologo" (cfg.BinPath ++ "FSharp.Build.dll")
+        peverifyWithArgs cfg "/nologo" (cfg.FSharpBuild)
 
-       // peverifyWithArgs cfg "/nologo /MD" (cfg.BinPath ++ "FSharp.Compiler.dll")
+       // peverifyWithArgs cfg "/nologo /MD" (getDirectoryName(cfg.FSC) ++ "FSharp.Compiler.dll")
 
-        peverifyWithArgs cfg "/nologo" (cfg.BinPath ++ "fsi.exe")
+        peverifyWithArgs cfg "/nologo" (cfg.FSI)
 
-        peverifyWithArgs cfg "/nologo" (cfg.BinPath ++ "FSharp.Compiler.Interactive.Settings.dll")
+        peverifyWithArgs cfg "/nologo" (cfg.FSharpCompilerInteractiveSettings)
 
         fsc cfg "%s -o:xmlverify.exe -g" cfg.fsc_flags ["xmlverify.fs"]
 
@@ -1957,7 +1957,7 @@ module TypecheckTests =
     let ``sigs pos27`` () = 
         let cfg = testConfig "typecheck/sigs"
         fsc cfg "%s --target:exe -o:pos27.exe" cfg.fsc_flags ["pos27.fs"]
-        copy_y cfg  (cfg.BinPath ++ "System.ValueTuple.dll") ("." ++ "System.ValueTuple.dll")
+        copySystemValueTuple cfg
         peverify cfg "pos27.exe"
 
     [<Test>]
diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd
index da8260013c7..1786d4bc552 100644
--- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd
+++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd
@@ -3,7 +3,7 @@ REM == %1 --> assembly
 ildasm /TEXT /LINENUM /NOBAR "%~nx1" >"%~n1.il"
 IF NOT ERRORLEVEL 0 exit 1
 
-echo ..\..\..\..\testenv\bin\ILComparer.exe "%~n1.il.bsl" "%~n1.il"
-..\..\..\..\testenv\bin\ILComparer.exe "%~n1.il.bsl" "%~n1.il"
+echo %~dp0..\..\..\testenv\bin\ILComparer.exe "%~n1.il.bsl" "%~n1.il"
+     %~dp0..\..\..\testenv\bin\ILComparer.exe "%~n1.il.bsl" "%~n1.il"
 exit /b %ERRORLEVEL%
 
diff --git a/tests/fsharpqa/Source/run.pl b/tests/fsharpqa/Source/run.pl
index c999def6387..d9c3de8c3de 100644
--- a/tests/fsharpqa/Source/run.pl
+++ b/tests/fsharpqa/Source/run.pl
@@ -265,12 +265,12 @@
      my $PEVERIFY = $ENV{PEVERIFY}; 
      unless(defined($PEVERIFY)) {
        my $scriptPath = dirname(__FILE__);
-       $PEVERIFY = "$scriptPath\\..\\testenv\\src\\PEVerify\\bin\\Release\\net46\\PEVerify.exe";
+       $PEVERIFY = "$scriptPath\\..\\..\\..\\artifacts\\bin\\PEVerify\\Release\\net46\\PEVerify.exe";
        if (-e $PEVERIFY) {
          $ENV{PEVERIFY} = $PEVERIFY;
        }
        else {
-         $ENV{PEVERIFY} = "$scriptPath\\..\\testenv\\src\\PEVerify\\bin\\Debug\\net46\\PEVerify.exe";
+         $ENV{PEVERIFY} = "$scriptPath\\..\\..\\..\\artifacts\\bin\\PEVerify\\Debug\\net46\\PEVerify.exe";
        }
      }
 
diff --git a/tests/service/FscTests.fs b/tests/service/FscTests.fs
index 82914dbdbae..553f5e468b0 100644
--- a/tests/service/FscTests.fs
+++ b/tests/service/FscTests.fs
@@ -48,7 +48,7 @@ type PEVerifier () =
             Some ("pedump", "--verify all")
         else
             let peverifyPath configuration =
-                Path.Combine(__SOURCE_DIRECTORY__, "..", "fsharpqa", "testenv", "src", "PEVerify", "bin", configuration, "net46", "PEVerify.exe")
+                Path.Combine(__SOURCE_DIRECTORY__, "..", "..", "artifacts", "bin", "PEVerify", configuration, "net46", "PEVerify.exe")
             let peverify =
                 if File.Exists(peverifyPath "Debug") then peverifyPath "Debug"
                 else peverifyPath "Release"
diff --git a/verify-translations.cmd b/verify-translations.cmd
index 6717de0f778..2580890c6fb 100644
--- a/verify-translations.cmd
+++ b/verify-translations.cmd
@@ -1,3 +1,3 @@
 @echo off
 
-%~dp0release\net40\bin\fsi.exe %~dp0src\scripts\VerifyAllTranslations.fsx -- %~dp0
+%~dp0artifacts\bin\fsi\Release\net46\fsi.exe %~dp0src\scripts\VerifyAllTranslations.fsx -- %~dp0
diff --git a/vsintegration/ItemTemplates/.gitignore b/vsintegration/ItemTemplates/.gitignore
new file mode 100644
index 00000000000..cd42ee34e87
--- /dev/null
+++ b/vsintegration/ItemTemplates/.gitignore
@@ -0,0 +1,2 @@
+bin/
+obj/
diff --git a/vsintegration/ProjectTemplates/.gitignore b/vsintegration/ProjectTemplates/.gitignore
new file mode 100644
index 00000000000..cd42ee34e87
--- /dev/null
+++ b/vsintegration/ProjectTemplates/.gitignore
@@ -0,0 +1,2 @@
+bin/
+obj/
diff --git a/vsintegration/Templates.Directory.Build.props b/vsintegration/Templates.Directory.Build.props
index 9be1daa15b8..c6a5cea2009 100644
--- a/vsintegration/Templates.Directory.Build.props
+++ b/vsintegration/Templates.Directory.Build.props
@@ -2,6 +2,12 @@
 
   <Import Project="Directory.Build.props" />
 
+  <!-- The VSSDK can't handle these values being fully qualified.  The ~hack~ fix is to unset them and manually copy the templates after the build. -->
+  <PropertyGroup>
+    <BaseOutputPath></BaseOutputPath>
+    <BaseIntermediateOutputPath></BaseIntermediateOutputPath>
+  </PropertyGroup>
+
   <PropertyGroup>
     <TargetFramework>net46</TargetFramework>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
diff --git a/vsintegration/Templates.Directory.Build.targets b/vsintegration/Templates.Directory.Build.targets
index 84513c489fc..4d8df139274 100644
--- a/vsintegration/Templates.Directory.Build.targets
+++ b/vsintegration/Templates.Directory.Build.targets
@@ -11,4 +11,21 @@
 
   <Target Name="CoreCompile" />
 
+  <!-- The templates have to build to directories relative to their projects, this target copies the relevant files to the appropriate output location. -->
+  <Target Name="CopyTemplatesToOutputDirectory"
+          AfterTargets="Build">
+
+    <PropertyGroup>
+      <TemplatesRootPath>$(OutputPath)$(TemplateCategory)\FSharp</TemplatesRootPath>
+      <TemplatesRootPath Condition="!$([System.IO.Path]::IsPathRooted('$(TemplatesRootPath)'))">$(MSBuildProjectDirectory)\$(TemplatesRootPath)</TemplatesRootPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <Templates Include="$(TemplatesRootPath)\**\*.zip" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(Templates)" DestinationFolder="$(ArtifactsBinDir)\$(MSBuildProjectName)\$(Configuration)\%(Templates.RecursiveDir)" />
+
+  </Target>
+
 </Project>
diff --git a/vsintegration/Vsix/Directory.Build.targets b/vsintegration/Vsix/Directory.Build.targets
index fa37bc2cd13..677cf0afc9d 100644
--- a/vsintegration/Vsix/Directory.Build.targets
+++ b/vsintegration/Vsix/Directory.Build.targets
@@ -2,6 +2,11 @@
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 
+  <PropertyGroup>
+    <BaseOutputPath>$(ArtifactsDir)\VSSetup\$(Configuration)</BaseOutputPath>
+    <BaseIntermediateOutputPath>$(ArtifactsDir)\VSSetup.obj\$(Configuration)\Microsoft.FSharp\</BaseIntermediateOutputPath>
+  </PropertyGroup>
+
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.6">
       <Visible>False</Visible>
diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
index 54b61728a7f..95a623bfa12 100644
--- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
+++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
@@ -85,7 +85,7 @@
       <Private>True</Private>
       <AdditionalProperties>TargetFramework=net45</AdditionalProperties>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\fsharp\fsiAnyCpu\FsiAnyCPU.fsproj">
+    <ProjectReference Include="..\..\..\src\fsharp\fsiAnyCpu\fsiAnyCPU.fsproj">
       <Project>{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}</Project>
       <Name>FsiAnyCPU</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
@@ -97,7 +97,7 @@
       <Private>True</Private>
       <AdditionalProperties>TargetFramework=net46</AdditionalProperties>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\fsharp\fsi\Fsi.fsproj">
+    <ProjectReference Include="..\..\..\src\fsharp\fsi\fsi.fsproj">
       <Project>{D0E98C0D-490B-4C61-9329-0862F6E87645}</Project>
       <Name>Fsi</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
@@ -109,7 +109,7 @@
       <Private>True</Private>
       <AdditionalProperties>TargetFramework=net46</AdditionalProperties>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\fsharp\Fsc\Fsc.fsproj">
+    <ProjectReference Include="..\..\..\src\fsharp\fsc\fsc.fsproj">
       <Project>{C94C257C-3C0A-4858-B5D8-D746498D1F08}</Project>
       <Name>fsc</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
diff --git a/vsintegration/src/Directory.Build.props b/vsintegration/src/Directory.Build.props
new file mode 100644
index 00000000000..1ad6fb80ecd
--- /dev/null
+++ b/vsintegration/src/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+  <PropertyGroup>
+    <DeployExtension>false</DeployExtension>
+  </PropertyGroup>
+
+</Project>
diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
index 8e8042c83a0..a04064212fd 100644
--- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
+++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
@@ -4,8 +4,7 @@
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <TargetDotnetProfile Condition=" '$(TargetDotnetProfile)' == '' ">net40</TargetDotnetProfile>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin</OutputPath>
+    <OutputPath>$(ArtifactsBinDir)\$(MSBuildProjectName)\$(Configuration)\$(TargetFramework)</OutputPath>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -24,6 +23,7 @@
     <RegisterForComInterop>false</RegisterForComInterop>
     <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
     <NoWarn>40026;42105;42107;42353</NoWarn>
+    <RuntimeIdentifiers>win</RuntimeIdentifiers>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
diff --git a/vsintegration/tests/GetTypesVSUnitTests/GetTypesVSUnitTests.fsproj b/vsintegration/tests/GetTypesVSUnitTests/GetTypesVSUnitTests.fsproj
index 1167ad2577c..68470cf046d 100644
--- a/vsintegration/tests/GetTypesVSUnitTests/GetTypesVSUnitTests.fsproj
+++ b/vsintegration/tests/GetTypesVSUnitTests/GetTypesVSUnitTests.fsproj
@@ -10,6 +10,8 @@
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     <NoMsbuild>true</NoMsbuild>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <UseAssetTargetFallback>true</UseAssetTargetFallback>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,6 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="EnvDTE80" Version="$(EnvDTE80PackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;build;analyzers;native" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="$(MicrosoftVisualStudioShellInterop110PackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;build;analyzers;native" />
     <PackageReference Include="NUnit" Version="$(NUnitPackageVersion)" />
     <PackageReference Include="VSSDK.VSLangProj.8" Version="$(VSSDKVSLangProj8PackageVersion)" PrivateAssets="all" ExcludeAssets="contentFiles;build;analyzers;native" />
   </ItemGroup>
diff --git a/vsintegration/tests/Salsa/salsa.fs b/vsintegration/tests/Salsa/salsa.fs
index 8a86f834180..9314dbf3662 100644
--- a/vsintegration/tests/Salsa/salsa.fs
+++ b/vsintegration/tests/Salsa/salsa.fs
@@ -43,13 +43,13 @@ module internal Salsa =
             { new System.IDisposable with
                     member this.Dispose() = actuallyBuild <- true }
         member th.Results = capturedFlags, capturedSources
-        member th.Compile(compile:System.Converter<int,int>, flags:string[], sources:string[]) = 
+        member th.Compile(compile:System.Func<int>, flags:string[], sources:string[]) =
             capturedFlags <- flags 
             capturedSources <- sources
             if actuallyBuild then
-                compile.Invoke(0)
+                compile.Invoke()
             else
-                0         
+                0
         interface ITaskHost
         
     type BuildResult = {
diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs
index 9339aaa02a8..06b42d32efc 100644
--- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs
+++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs
@@ -433,19 +433,15 @@ type UsingMSBuild()  =
                 | [] -> System.String.Format((*Mark*)
                 | x :: xs -> f xs"""
         // Note, 3 of these 8 are only available on .NET 4.6.1.  On .NET 4.5 only 5 overloads are returned.
-        let expected45 =  [["format"; "arg0"];                                  //Net4.5
-                           ["format"; "args"];                                  //Net4.5
-                           ["provider"; "format"; "args"];                      //Net4.5
-                           ["format"; "arg0"; "arg1"];                          //Net4.5
-                           ["format"; "arg0"; "arg1"; "arg2"]]                  //Net4.5
-        let expected461 = [["provider"; "format"; "arg0"];                      //Net4.6.1
-                           ["provider"; "format"; "arg0"; "arg1"];              //Net4.6.1
-                           ["provider"; "format"; "arg0"; "arg1"; "arg2"]]      //Net4.6.1
-
-        let expected =
-            if Environment.Version.CompareTo(v461) >= 0 then
-                List.concat [expected45;expected461]
-            else expected45
+        let expected =  [["format"; "arg0"];                                  //Net4.5
+                         ["format"; "args"];                                  //Net4.5
+                         ["provider"; "format"; "args"];                      //Net4.5
+                         ["format"; "arg0"; "arg1"];                          //Net4.5
+                         ["format"; "arg0"; "arg1"; "arg2"];                  //Net4.5
+                         ["provider"; "format"; "arg0"];                      //Net4.6.1
+                         ["provider"; "format"; "arg0"; "arg1"];              //Net4.6.1
+                         ["provider"; "format"; "arg0"; "arg1"; "arg2"]]      //Net4.6.1
+
         this.VerifyParameterInfoAtStartOfMarker(fileContent,"(*Mark*)", expected)
 
     (* --- Parameter Info Systematic Tests ------------------------------------------------- *)
diff --git a/vsintegration/tests/UnitTests/Tests.Build.fs b/vsintegration/tests/UnitTests/Tests.Build.fs
index ecdf69f5cf3..b1b7228a16f 100644
--- a/vsintegration/tests/UnitTests/Tests.Build.fs
+++ b/vsintegration/tests/UnitTests/Tests.Build.fs
@@ -40,8 +40,8 @@ type MyLogger(f : string -> unit) =
 type FauxHostObject() =
     let mutable myFlags : string[] = null
     let mutable mySources : string[] = null
-    member x.Compile(compile:System.Converter<int,int>, flags:string[], sources:string[]) = 
-        myFlags <- flags        
+    member x.Compile(compile:System.Func<int>, flags:string[], sources:string[]) =
+        myFlags <- flags
         mySources <- sources
         0
     member x.Flags = myFlags
@@ -77,7 +77,7 @@ type Build() =
             let p = tool.InternalGenerateFullPathToTool()
             Assert.Fail("should not succeed")
         with e -> 
-            e.Message.AssertMatchesPattern("ToolPath is unknown; specify the path to fsc.exe as the ToolPath property.")
+            e.Message.AssertMatchesPattern("ToolPath is unknown; specify the path to the tool.")
         
     [<Test>]
     member public this.TestCodePage() =
@@ -92,7 +92,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-"  + Environment.NewLine)
+                     "--highentropyva-"  + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -107,7 +108,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -122,7 +124,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -139,7 +142,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -154,7 +158,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -168,7 +173,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -183,7 +189,8 @@ type Build() =
                      "--warnaserror-:52,109" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -198,7 +205,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -213,7 +221,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -228,7 +237,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -243,7 +253,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -258,7 +269,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -272,7 +284,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -287,7 +300,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -302,6 +316,7 @@ type Build() =
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
                      "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine +
                      "--yadda" + Environment.NewLine +
                      "yadda" + Environment.NewLine)
                     cmd
@@ -318,7 +333,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -333,7 +349,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -348,7 +365,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -363,7 +381,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -379,7 +398,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -395,7 +415,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine) cmd
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine) cmd
 
     [<Test>]
     member public this.TestReferencePathWithSpaces() =
@@ -410,7 +431,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -425,7 +447,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -442,6 +465,7 @@ type Build() =
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
                      "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine +
                      src + Environment.NewLine +
                      src + Environment.NewLine)
                     cmd
@@ -459,7 +483,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -474,7 +499,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -489,7 +515,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -503,7 +530,8 @@ type Build() =
                      "--utf8output" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -517,7 +545,8 @@ type Build() =
                      "--win32res:foo.res" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd
 
     [<Test>]
@@ -531,7 +560,8 @@ type Build() =
                      "--win32manifest:foo.manifest" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd 
 
     [<Test>]
@@ -544,7 +574,8 @@ type Build() =
                      "--warnaserror:76" + Environment.NewLine +
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
-                     "--highentropyva+" + Environment.NewLine)
+                     "--highentropyva+" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd 
 
     [<Test>]
@@ -558,7 +589,8 @@ type Build() =
                      "--fullpaths" + Environment.NewLine +
                      "--flaterrors" + Environment.NewLine +
                      "--subsystemversion:6.02" + Environment.NewLine +
-                     "--highentropyva-" + Environment.NewLine)
+                     "--highentropyva-" + Environment.NewLine +
+                     "--nocopyfsharpcore" + Environment.NewLine)
                     cmd 
 
     [<Test>]
@@ -627,6 +659,7 @@ type Build() =
             "--flaterrors" + Environment.NewLine +
             "--subsystemversion:4.0" + Environment.NewLine +
             "--highentropyva-" + Environment.NewLine +
+            "--nocopyfsharpcore" + Environment.NewLine +
             "--yadda:yadda" + Environment.NewLine +
             "--other:internal quote" + Environment.NewLine +
             "blah" + Environment.NewLine +
@@ -670,6 +703,7 @@ type Build() =
             "--flaterrors"
             "--subsystemversion:4.0"
             "--highentropyva-"
+            "--nocopyfsharpcore"
             "--yadda:yadda"
             "--other:internal quote" // note stripped internal quotes
             "blah" |]
diff --git a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
index 27b6d0224e3..310ebf78089 100644
--- a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
+++ b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
@@ -13,6 +13,8 @@
     <UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
+    <UseAssetTargetFallback>true</UseAssetTargetFallback>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -160,6 +162,7 @@
     <None Include="app.runsettings" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\fsc\fsc.fsproj" />
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Build\FSharp.Build.fsproj" />
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
@@ -172,6 +175,23 @@
     <ProjectReference Include="..\..\..\tests\service\data\CSharp_Analysis\CSharp_Analysis.csproj" />
   </ItemGroup>
 
+  <!-- assemblies used during tests -->
+  <ItemGroup>
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" Private="true" />
+    <ProjectReference Include="..\MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj" Private="true" />
+    <ProjectReference Include="..\MockTypeProviders\DefinitionLocationAttributeFileDoesnotExist\DefinitionLocationAttributeFileDoesnotExist.csproj" Private="true" />
+    <ProjectReference Include="..\MockTypeProviders\DefinitionLocationAttributeLineDoesnotExist\DefinitionLocationAttributeLineDoesnotExist.csproj" Private="true" />
+    <ProjectReference Include="..\MockTypeProviders\DefinitionLocationAttributeWithSpaceInTheType\DefinitionLocationAttributeWithSpaceInTheType.csproj" Private="true" />
+    <ProjectReference Include="..\MockTypeProviders\DummyProviderForLanguageServiceTesting\DummyProviderForLanguageServiceTesting.fsproj" Private="true" />
+    <ProjectReference Include="..\MockTypeProviders\EditorHideMethodsAttribute\EditorHideMethodsAttribute.csproj" Private="true" />
+    <ProjectReference Include="..\MockTypeProviders\EmptyAssembly\EmptyAssembly.fsproj" Private="true" />
+    <ProjectReference Include="..\MockTypeProviders\XmlDocAttributeWithAdequateComment\XmlDocAttributeWithAdequateComment.csproj" Private="true" />
+    <ProjectReference Include="..\MockTypeProviders\XmlDocAttributeWithEmptyComment\XmlDocAttributeWithEmptyComment.csproj" Private="true" />
+    <ProjectReference Include="..\MockTypeProviders\XmlDocAttributeWithLocalizedComment\XmlDocAttributeWithLocalizedComment.csproj" Private="true" />
+    <ProjectReference Include="..\MockTypeProviders\XmlDocAttributeWithLongComment\XmlDocAttributeWithLongComment.csproj" Private="true" />
+    <ProjectReference Include="..\MockTypeProviders\XmlDocAttributeWithNullComment\XmlDocAttributeWithNullComment.csproj" Private="true" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="PresentationCore" />