Bump FSharp.Compiler.Tools to 4.1.27 and align mono build files

Makefile

@@ -14,106 +14,69 @@ all:
 	$(MAKE) build
 
 build-proto: restore
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/Fsc-proto/Fsc-proto.fsproj
+	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=Proto /p:TargetDotnetProfile=$(TargetDotnetProfile) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
+	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=Proto /p:TargetDotnetProfile=$(TargetDotnetProfile) src/fsharp/Fsc-proto/Fsc-proto.fsproj
 
 # The main targets
 build:
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/Fsc/Fsc.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/fsi/Fsi.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=3.0 src/fsharp/FSharp.Core/FSharp.Core.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=3.1 src/fsharp/FSharp.Core/FSharp.Core.fsproj
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=4.0 src/fsharp/FSharp.Core/FSharp.Core.fsproj
-	$(MAKE) -C mono/policy.2.0.FSharp.Core TargetFramework=net40 $@
-	$(MAKE) -C mono/policy.2.3.FSharp.Core TargetFramework=net40 $@
-	$(MAKE) -C mono/policy.3.3.FSharp.Core TargetFramework=net40 $@
-	$(MAKE) -C mono/policy.3.7.FSharp.Core TargetFramework=net40 $@
-	$(MAKE) -C mono/policy.3.47.FSharp.Core TargetFramework=net40 $@
-	$(MAKE) -C mono/policy.3.78.FSharp.Core TargetFramework=net40 $@
-	$(MAKE) -C mono/policy.3.259.FSharp.Core TargetFramework=net40 $@
-	$(MAKE) -C mono/policy.4.0.FSharp.Core TargetFramework=net40 $@
-	$(MAKE) -C mono/policy.4.3.FSharp.Core TargetFramework=net40 $@
-	$(MAKE) -C mono/policy.4.4.FSharp.Core TargetFramework=net40 $@
-ifeq ("$(pclenabled47)", "yes")
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable47 src/fsharp/FSharp.Core/FSharp.Core.fsproj
-endif
-ifeq ("$(pclenabled7)", "yes")
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable7 src/fsharp/FSharp.Core/FSharp.Core.fsproj
-endif
-ifeq ("$(pclenabled78)", "yes")
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable78 src/fsharp/FSharp.Core/FSharp.Core.fsproj
-endif
-ifeq ("$(pclenabled259)", "yes")
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable259 src/fsharp/FSharp.Core/FSharp.Core.fsproj
-endif
-ifeq ("$(monodroidenabled)", "yes")
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=monoandroid10+monotouch10+xamarinios10 src/fsharp/FSharp.Core/FSharp.Core.fsproj
-endif
-ifeq ("$(xamarinmacenabled)", "yes")
-	MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=xamarinmacmobile src/fsharp/FSharp.Core/FSharp.Core.fsproj
-endif
+	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
+	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
+	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/Fsc/Fsc.fsproj
+	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
+	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
+	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
+	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
+	MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
+	mkdir -p $(Configuration)/fsharp30/net40/bin
+	mkdir -p $(Configuration)/fsharp31/net40/bin
+	mkdir -p $(Configuration)/fsharp40/net40/bin
+	cp -p packages/FSharp.Core.3.0.2/lib/net40/* $(Configuration)/fsharp30/net40/bin
+	cp -p packages/FSharp.Core.3.1.2.5/lib/net40/* $(Configuration)/fsharp31/net40/bin
+	cp -p packages/FSharp.Core.4.0.0.1/lib/net40/* $(Configuration)/fsharp40/net40/bin
+	mkdir -p $(Configuration)/portable7/bin
+	cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45/* $(Configuration)/portable7/bin
+	mkdir -p $(Configuration)/portable47/bin
+	cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+sl5+netcore45/* $(Configuration)/portable47/bin
+	mkdir -p $(Configuration)/portable78/bin
+	cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wp8/* $(Configuration)/portable78/bin
+	mkdir -p $(Configuration)/portable259/bin
+	cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wpa81+wp8/* $(Configuration)/portable259/bin
+	mkdir -p $(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
+	cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+monoandroid10+monotouch10+xamarinios10/* $(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
+	mkdir -p $(Configuration)/xamarinmacmobile/bin
+	cp -p packages/FSharp.Core.4.1.17/lib/xamarinmac20/* $(Configuration)/xamarinmacmobile/bin
 
 
 
 install:
 	-rm -fr $(DESTDIR)$(monodir)/fsharp
 	-rm -fr $(DESTDIR)$(monodir)/Microsoft\ F#
 	-rm -fr $(DESTDIR)$(monodir)/Microsoft\ SDKs/F#
-	-rm -fr $(DESTDIR)$(monodir)/gac/FSharp.Core
-	-rm -fr $(DESTDIR)$(monodir)/gac/FSharp.Compiler.Private
-	-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp
-	-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp
-	-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp
-	-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp
-	-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp
-	$(MAKE) -C mono/FSharp.Core TargetFramework=net40 install
+	-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v/FSharp
+	-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v11.0/FSharp
+	-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v12.0/FSharp
+	-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v14.0/FSharp
+	-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v15.0/FSharp
+	$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 install
 	$(MAKE) -C mono/FSharp.Build install
 	$(MAKE) -C mono/FSharp.Compiler.Private install
 	$(MAKE) -C mono/Fsc install
 	$(MAKE) -C mono/FSharp.Compiler.Interactive.Settings install
 	$(MAKE) -C mono/FSharp.Compiler.Server.Shared install
 	$(MAKE) -C mono/fsi install
 	$(MAKE) -C mono/fsiAnyCpu install
-	$(MAKE) -C mono/FSharp.Core TargetFramework=net40 FSharpCoreBackVersion=3.0 install
-	$(MAKE) -C mono/FSharp.Core TargetFramework=net40 FSharpCoreBackVersion=3.1 install
-	$(MAKE) -C mono/FSharp.Core TargetFramework=net40 FSharpCoreBackVersion=4.0 install
-	$(MAKE) -C mono/policy.2.0.FSharp.Core TargetFramework=net40 install
-	$(MAKE) -C mono/policy.2.3.FSharp.Core TargetFramework=net40 install
-	$(MAKE) -C mono/policy.3.3.FSharp.Core TargetFramework=net40 install
-	$(MAKE) -C mono/policy.3.7.FSharp.Core TargetFramework=net40 install
-	$(MAKE) -C mono/policy.3.47.FSharp.Core TargetFramework=net40 install
-	$(MAKE) -C mono/policy.3.78.FSharp.Core TargetFramework=net40 install
-	$(MAKE) -C mono/policy.3.259.FSharp.Core TargetFramework=net40 install
-	$(MAKE) -C mono/policy.4.0.FSharp.Core TargetFramework=net40 install
-	$(MAKE) -C mono/policy.4.3.FSharp.Core TargetFramework=net40 install
-	$(MAKE) -C mono/policy.4.4.FSharp.Core TargetFramework=net40 install
-ifeq ("$(pclenabled47)", "yes")
-	$(MAKE) -C mono/FSharp.Core TargetFramework=portable47 install
-endif
-ifeq ("$(pclenabled7)", "yes")
-	$(MAKE) -C mono/FSharp.Core TargetFramework=portable7 install
-endif
-ifeq ("$(pclenabled78)", "yes")
-	$(MAKE) -C mono/FSharp.Core TargetFramework=portable78 install
-endif
-ifeq ("$(pclenabled259)", "yes")
-	$(MAKE) -C mono/FSharp.Core TargetFramework=portable259 install
-endif
-ifeq ("$(monodroidenabled)", "yes")
-	$(MAKE) -C mono/FSharp.Core TargetFramework=monoandroid10+monotouch10+xamarinios10 install
-endif
-ifeq ("$(xamarinmacenabled)", "yes")
-	$(MAKE) -C mono/FSharp.Core TargetFramework=xamarinmacmobile install
-endif
+	$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=3.0 install
+	$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=3.1 install
+	$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=4.0 install
+	$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable47 install
+	$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable7 install
+	$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable78 install
+	$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable259 install
+	$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=monoandroid10+monotouch10+xamarinios10 install
+	$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=xamarinmacmobile install
 	echo "------------------------------ INSTALLED FILES --------------"
-	ls -xlR $(DESTDIR)$(monodir)/fsharp $(DESTDIR)$(monodir)/xbuild $(DESTDIR)$(monodir)/gac/FSharp* $(DESTDIR)$(monodir)/Microsoft*
+	ls -xlR $(DESTDIR)$(monodir)/fsharp $(DESTDIR)$(monodir)/msbuild $(DESTDIR)$(monodir)/xbuild $(DESTDIR)$(monodir)/Reference\ Assemblies $(DESTDIR)$(monodir)/gac/FSharp* $(DESTDIR)$(monodir)/Microsoft* || true
 
 dist:
 	-rm -r fsharp-$(DISTVERSION) fsharp-$(DISTVERSION).tar.bz2

before_install.sh

@@ -58,7 +58,7 @@ fi)
 fi)
 
 #TODO: work out how to avoid the need for this
-chmod u+x packages/FSharp.Compiler.Tools.4.1.23/tools/fsi.exe 
+chmod u+x packages/FSharp.Compiler.Tools.4.1.27/tools/fsi.exe 
 chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe
 chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.exe
 

build.cmd

@@ -568,7 +568,7 @@ set _dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
 set NUGET_PACKAGES=%~dp0Packages
 set path=%~dp0Tools\dotnet20\;%path%
 
-set _fsiexe="packages\FSharp.Compiler.Tools.4.1.23\tools\fsi.exe"
+set _fsiexe="packages\FSharp.Compiler.Tools.4.1.27\tools\fsi.exe"
 if not exist %_fsiexe% echo Error: Could not find %_fsiexe% && goto :failure
 %_ngenexe% install %_fsiexe% /nologo 
 
@@ -606,8 +606,8 @@ if "%BUILD_PROTO%" == "1" (
 
   if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "0" (
 
-    echo %_ngenexe% install packages\FSharp.Compiler.Tools.4.1.23\tools\fsc.exe /nologo 
-         %_ngenexe% install packages\FSharp.Compiler.Tools.4.1.23\tools\fsc.exe /nologo 
+    echo %_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo 
+         %_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo 
 
     echo %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
          %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto

configure.ac

@@ -46,93 +46,17 @@ MONOPREFIX=$(cd `$PKG_CONFIG --variable=prefix mono` && pwd)
 MONOBINDIR="$MONOPREFIX"/bin
 MONOLIBDIR="$MONOPREFIX"/lib
 
-AC_PATH_PROG(XBUILD, xbuild, no)
-xbuild_from_pkg_config="$MONOBINDIR"/xbuild
-if test -e $xbuild_from_pkg_config; then
-    XBUILD=$xbuild_from_pkg_config
-elif test "x$XBUILD" == "xno"; then
-    AC_MSG_ERROR([Could not find xbuild])
+AC_PATH_PROG(MSBUILD, msbuild, no)
+msbuild_from_pkg_config="$MONOBINDIR"/msbuild
+if test -e $msbuild_from_pkg_config; then
+    MSBUILD=$msbuild_from_pkg_config
+elif test "x$MSBUILD" == "xno"; then
+    AC_MSG_ERROR([Could not find msbuild])
 fi
-AC_MSG_NOTICE(xbuild: $XBUILD)
-
-MONOGACDIR="$MONOLIBDIR"/mono
-if ! test "x$with_gacdir" = "xno"; then
-	MONOGACDIR=$(cd "$with_gacdir/.." && pwd)
-fi
-
-MONOGACDIR40="$MONOGACDIR"/4.0
-MONOGACDIR45="$MONOGACDIR"/4.5
-
-if ! test -e $MONOGACDIR45/mscorlib.dll; then
-	AC_ERROR(Couldn't find the mono gac directory or mscorlib.dll in the usual places. Set --with-gacdir=<path>)
-fi
-
-if test -e $MONOLIBDIR/mono/xbuild-frameworks/.NETPortable/v4.0/Profile/Profile47/mscorlib.dll; then
-   PCLENABLED47=yes
-else
-   PCLENABLED47=no
-fi
-AC_MSG_NOTICE(PCL Reference Assemblies for Profile 47 found: $PCLENABLED47)
-
-AC_SUBST(PCLENABLED47)
-
-
-if test -e $MONOLIBDIR/mono/xbuild-frameworks/.NETPortable/v4.0/Profile/Profile47/mscorlib.dll; then
-   PCLENABLED47=yes
-else
-   PCLENABLED47=no
-fi
-AC_MSG_NOTICE(PCL Reference Assemblies for Profile 47 found: $PCLENABLED47)
-
-AC_SUBST(PCLENABLED47)
-
-
-if test -e $MONOLIBDIR/mono/xbuild-frameworks/.NETPortable/v4.5/Profile/Profile7/System.Runtime.dll; then
-   PCLENABLED7=yes
-else
-   PCLENABLED7=no
-fi
-AC_MSG_NOTICE(PCL Reference Assemblies for Profile 7 found: $PCLENABLED7)
-
-AC_SUBST(PCLENABLED7)
-
-if test -e $MONOLIBDIR/mono/xbuild-frameworks/.NETPortable/v4.5/Profile/Profile78/System.Runtime.dll; then
-   PCLENABLED78=yes
-else
-   PCLENABLED78=no
-fi
-AC_MSG_NOTICE(PCL Reference Assemblies for Profile 78 found: $PCLENABLED78)
-
-AC_SUBST(PCLENABLED78)
-
-if test -e $MONOLIBDIR/mono/xbuild-frameworks/.NETPortable/v4.5/Profile/Profile259/System.Runtime.dll; then
-   PCLENABLED259=yes
-else
-   PCLENABLED259=no
-fi
-AC_MSG_NOTICE(PCL Reference Assemblies for Profile 259 found: $PCLENABLED259)
-
-AC_SUBST(PCLENABLED259)
-
-# We enable MonoTouch and MonoDroid builds if PCL components are available.
-# These build using binaries from dependencies/mono/2.1, but see
-# https://github.com/fsharp/fsharp/issues/391 where PCL is a requirement of
-# Microsoft.Common.targets when used in this configuration
-MONOTOUCHENABLED=$PCLENABLED78
-MONODROIDENABLED=$PCLENABLED78
-XAMARINMACENABLED=$PCLENABLED78
-
-AC_SUBST(MONOTOUCHENABLED)
-AC_SUBST(MONODROIDENABLED)
-AC_SUBST(XAMARINMACENABLED)
+AC_MSG_NOTICE(msbuild: $MSBUILD)
 
 AC_SUBST(MONOBINDIR)
 AC_SUBST(MONOLIBDIR)
-AC_SUBST(MONOGACDIR)
-
-AC_SUBST(MONOGACDIR20)
-AC_SUBST(MONOGACDIR35)
-AC_SUBST(MONOGACDIR40)
 
 AC_CONFIG_FILES([
 mono/launcher

fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj

@@ -88,5 +88,5 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
+  <Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
 </Project>

fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj

@@ -63,5 +63,5 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
+  <Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
 </Project>

fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj

@@ -79,5 +79,5 @@
     </Reference>
 
   </ItemGroup>
-  <Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
+  <Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
 </Project>

fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj

@@ -71,11 +71,11 @@
     <Compile Include="$(FSharpSourcesRoot)\..\tests\service\ProjectOptionsTests.fs">
       <Link>ProjectOptionsTests.fs</Link>
     </Compile>
-    <None Include="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\FSharp.Core.optdata">
+    <None Include="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\FSharp.Core.optdata">
       <Link>FSharp.Core.optdata</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\FSharp.Core.sigdata">
+    <None Include="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\FSharp.Core.sigdata">
       <Link>FSharp.Core.sigdata</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -109,7 +109,7 @@
     </Reference>
     <!-- we test against FSharp.Core 4.4.1.0 -->
     <Reference Include="FSharp.Core">
-      <HintPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\FSharp.Core.dll</HintPath>
+      <HintPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\FSharp.Core.dll</HintPath>
       <Private>true</Private>
     </Reference>
 
@@ -129,5 +129,5 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
+  <Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
 </Project>

fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

@@ -639,7 +639,7 @@
     </Reference>
   </ItemGroup>
 
-  <Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
+  <Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
   <Import Project="$(FSharpSourcesRoot)\scripts\fssrgen.targets" />
   <Import Project="$(FSharpSourcesRoot)\..\packages\FsLexYacc.7.0.6\build\FsLexYacc.targets" />
 </Project>

fcs/fcs.props

@@ -6,7 +6,7 @@
     <VersionPrefix>16.0.2</VersionPrefix>
     <!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build -->
     <!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful -->
-    <FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools</FsiToolPath>
+    <FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</FsiToolPath>
     <FsiToolExe>fsi.exe</FsiToolExe>
 
   </PropertyGroup>

fcs/samples/EditorService/EditorService.fsproj

@@ -60,5 +60,5 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(SolutionDir)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
+  <Import Project="$(SolutionDir)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
 </Project>