From da8b3d32246e60abbd210732d2fb5228924ebef1 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <codecutter.fsharp@hotmail.com>
Date: Wed, 22 Nov 2017 20:09:47 -0800
Subject: [PATCH] Update F# for VS2017.6

---
 build/DependencyVersions.props  | 2 +-
 src/tool_fsharp/tool_fsc.csproj | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index bf967b144..138a31ea9 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -5,7 +5,7 @@
     <CLI_MSBuild_Version>15.5.0-preview-000178-1116824</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.6.0-beta2-62210-01</CLI_Roslyn_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
-    <CLI_FSharp_Version>4.2.0-rtm-171027-0</CLI_FSharp_Version>
+    <CLI_FSharp_Version>4.2.0-rtm-171122-0</CLI_FSharp_Version>
     <CLI_Deps_Satellites_Build>pre-20171012-1</CLI_Deps_Satellites_Build>
     <CLI_Roslyn_Satellites_Version>2.6.0-$(CLI_Deps_Satellites_Build)</CLI_Roslyn_Satellites_Version>
     <CLI_FSharp_Satellites_Version>4.4.1-$(CLI_Deps_Satellites_Build)</CLI_FSharp_Satellites_Version>
diff --git a/src/tool_fsharp/tool_fsc.csproj b/src/tool_fsharp/tool_fsc.csproj
index 1ec0f52b5..7d2ee8601 100644
--- a/src/tool_fsharp/tool_fsc.csproj
+++ b/src/tool_fsharp/tool_fsc.csproj
@@ -13,6 +13,7 @@
     <PackageReference Include="Microsoft.NetCore.App" Version="$(CLI_SharedFrameworkVersion)" />
     <PackageReference Include="Microsoft.FSharp.Compiler" Version="$(CLI_FSharp_Version)" />
     <PackageReference Include="CliDeps.Satellites.FSharp" Version="$(CLI_FSharp_Satellites_Version)" />
+    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -35,10 +36,15 @@
                                  SectionName="%(AssetsToRemoveFromDeps.SectionName)"
                                  AssetPath="%(AssetsToRemoveFromDeps.Identity)" />
 
+    <!-- Deploy deps and runtime config for fsc.exe and fsi.exe.  Both apps have exactly the same dependencies so this is Ok -->
     <Copy SourceFiles="$(PublishDir)/$(TargetName).runtimeconfig.json;
                        $(PublishDir)/$(TargetName).deps.json;"
           DestinationFiles="$(PublishDir)/fsc.runtimeconfig.json;
                             $(PublishDir)/fsc.deps.json;"/>
+    <Copy SourceFiles="$(PublishDir)/$(TargetName).runtimeconfig.json;
+                       $(PublishDir)/$(TargetName).deps.json;"
+          DestinationFiles="$(PublishDir)/fsi.runtimeconfig.json;
+                            $(PublishDir)/fsi.deps.json;"/>
   </Target>
 
   <Target Name="RemoveFilesAfterPublish"