Skip to content

Commit d39cba7

Browse files
dsymedsyme
authored
Bump FSharp.Compiler.Tools to 4.1.27 and align mono build files (#3693)
* ri change from fsharp * fix test * bump FSC tools to 4.1.27 * remove fsharp.core from Mono GAC * align mono directory * fix typo * install back versions with Mono * fix typo
1 parent 83208f8 commit d39cba7

File tree

65 files changed

+137
-665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+137
-665
lines changed

‎Makefile‎

Lines changed: 45 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -14,106 +14,69 @@ all:
1414
$(MAKE) build
1515

1616
build-proto: restore
17-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
18-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/Fsc-proto/Fsc-proto.fsproj
17+
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=Proto /p:TargetDotnetProfile=$(TargetDotnetProfile) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
18+
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=Proto /p:TargetDotnetProfile=$(TargetDotnetProfile) src/fsharp/Fsc-proto/Fsc-proto.fsproj
1919

2020
# The main targets
2121
build:
22-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
23-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
24-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
25-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/Fsc/Fsc.fsproj
26-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
27-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
28-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/fsi/Fsi.fsproj
29-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
30-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
31-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=3.0 src/fsharp/FSharp.Core/FSharp.Core.fsproj
32-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=3.1 src/fsharp/FSharp.Core/FSharp.Core.fsproj
33-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=4.0 src/fsharp/FSharp.Core/FSharp.Core.fsproj
34-
$(MAKE) -C mono/policy.2.0.FSharp.Core TargetFramework=net40 $@
35-
$(MAKE) -C mono/policy.2.3.FSharp.Core TargetFramework=net40 $@
36-
$(MAKE) -C mono/policy.3.3.FSharp.Core TargetFramework=net40 $@
37-
$(MAKE) -C mono/policy.3.7.FSharp.Core TargetFramework=net40 $@
38-
$(MAKE) -C mono/policy.3.47.FSharp.Core TargetFramework=net40 $@
39-
$(MAKE) -C mono/policy.3.78.FSharp.Core TargetFramework=net40 $@
40-
$(MAKE) -C mono/policy.3.259.FSharp.Core TargetFramework=net40 $@
41-
$(MAKE) -C mono/policy.4.0.FSharp.Core TargetFramework=net40 $@
42-
$(MAKE) -C mono/policy.4.3.FSharp.Core TargetFramework=net40 $@
43-
$(MAKE) -C mono/policy.4.4.FSharp.Core TargetFramework=net40 $@
44-
ifeq ("$(pclenabled47)", "yes")
45-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable47 src/fsharp/FSharp.Core/FSharp.Core.fsproj
46-
endif
47-
ifeq ("$(pclenabled7)", "yes")
48-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable7 src/fsharp/FSharp.Core/FSharp.Core.fsproj
49-
endif
50-
ifeq ("$(pclenabled78)", "yes")
51-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable78 src/fsharp/FSharp.Core/FSharp.Core.fsproj
52-
endif
53-
ifeq ("$(pclenabled259)", "yes")
54-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable259 src/fsharp/FSharp.Core/FSharp.Core.fsproj
55-
endif
56-
ifeq ("$(monodroidenabled)", "yes")
57-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=monoandroid10+monotouch10+xamarinios10 src/fsharp/FSharp.Core/FSharp.Core.fsproj
58-
endif
59-
ifeq ("$(xamarinmacenabled)", "yes")
60-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=xamarinmacmobile src/fsharp/FSharp.Core/FSharp.Core.fsproj
61-
endif
22+
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
23+
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
24+
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
25+
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/Fsc/Fsc.fsproj
26+
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
27+
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
28+
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
29+
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
30+
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
31+
mkdir -p $(Configuration)/fsharp30/net40/bin
32+
mkdir -p $(Configuration)/fsharp31/net40/bin
33+
mkdir -p $(Configuration)/fsharp40/net40/bin
34+
cp -p packages/FSharp.Core.3.0.2/lib/net40/* $(Configuration)/fsharp30/net40/bin
35+
cp -p packages/FSharp.Core.3.1.2.5/lib/net40/* $(Configuration)/fsharp31/net40/bin
36+
cp -p packages/FSharp.Core.4.0.0.1/lib/net40/* $(Configuration)/fsharp40/net40/bin
37+
mkdir -p $(Configuration)/portable7/bin
38+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45/* $(Configuration)/portable7/bin
39+
mkdir -p $(Configuration)/portable47/bin
40+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+sl5+netcore45/* $(Configuration)/portable47/bin
41+
mkdir -p $(Configuration)/portable78/bin
42+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wp8/* $(Configuration)/portable78/bin
43+
mkdir -p $(Configuration)/portable259/bin
44+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wpa81+wp8/* $(Configuration)/portable259/bin
45+
mkdir -p $(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
46+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+monoandroid10+monotouch10+xamarinios10/* $(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
47+
mkdir -p $(Configuration)/xamarinmacmobile/bin
48+
cp -p packages/FSharp.Core.4.1.17/lib/xamarinmac20/* $(Configuration)/xamarinmacmobile/bin
6249

6350

6451

6552
install:
6653
-rm -fr $(DESTDIR)$(monodir)/fsharp
6754
-rm -fr $(DESTDIR)$(monodir)/Microsoft\ F#
6855
-rm -fr $(DESTDIR)$(monodir)/Microsoft\ SDKs/F#
69-
-rm -fr $(DESTDIR)$(monodir)/gac/FSharp.Core
70-
-rm -fr $(DESTDIR)$(monodir)/gac/FSharp.Compiler.Private
71-
-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp
72-
-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp
73-
-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp
74-
-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp
75-
-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp
76-
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 install
56+
-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v/FSharp
57+
-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v11.0/FSharp
58+
-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v12.0/FSharp
59+
-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v14.0/FSharp
60+
-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v15.0/FSharp
61+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 install
7762
$(MAKE) -C mono/FSharp.Build install
7863
$(MAKE) -C mono/FSharp.Compiler.Private install
7964
$(MAKE) -C mono/Fsc install
8065
$(MAKE) -C mono/FSharp.Compiler.Interactive.Settings install
8166
$(MAKE) -C mono/FSharp.Compiler.Server.Shared install
8267
$(MAKE) -C mono/fsi install
8368
$(MAKE) -C mono/fsiAnyCpu install
84-
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 FSharpCoreBackVersion=3.0 install
85-
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 FSharpCoreBackVersion=3.1 install
86-
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 FSharpCoreBackVersion=4.0 install
87-
$(MAKE) -C mono/policy.2.0.FSharp.Core TargetFramework=net40 install
88-
$(MAKE) -C mono/policy.2.3.FSharp.Core TargetFramework=net40 install
89-
$(MAKE) -C mono/policy.3.3.FSharp.Core TargetFramework=net40 install
90-
$(MAKE) -C mono/policy.3.7.FSharp.Core TargetFramework=net40 install
91-
$(MAKE) -C mono/policy.3.47.FSharp.Core TargetFramework=net40 install
92-
$(MAKE) -C mono/policy.3.78.FSharp.Core TargetFramework=net40 install
93-
$(MAKE) -C mono/policy.3.259.FSharp.Core TargetFramework=net40 install
94-
$(MAKE) -C mono/policy.4.0.FSharp.Core TargetFramework=net40 install
95-
$(MAKE) -C mono/policy.4.3.FSharp.Core TargetFramework=net40 install
96-
$(MAKE) -C mono/policy.4.4.FSharp.Core TargetFramework=net40 install
97-
ifeq ("$(pclenabled47)", "yes")
98-
$(MAKE) -C mono/FSharp.Core TargetFramework=portable47 install
99-
endif
100-
ifeq ("$(pclenabled7)", "yes")
101-
$(MAKE) -C mono/FSharp.Core TargetFramework=portable7 install
102-
endif
103-
ifeq ("$(pclenabled78)", "yes")
104-
$(MAKE) -C mono/FSharp.Core TargetFramework=portable78 install
105-
endif
106-
ifeq ("$(pclenabled259)", "yes")
107-
$(MAKE) -C mono/FSharp.Core TargetFramework=portable259 install
108-
endif
109-
ifeq ("$(monodroidenabled)", "yes")
110-
$(MAKE) -C mono/FSharp.Core TargetFramework=monoandroid10+monotouch10+xamarinios10 install
111-
endif
112-
ifeq ("$(xamarinmacenabled)", "yes")
113-
$(MAKE) -C mono/FSharp.Core TargetFramework=xamarinmacmobile install
114-
endif
69+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=3.0 install
70+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=3.1 install
71+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=4.0 install
72+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable47 install
73+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable7 install
74+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable78 install
75+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable259 install
76+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=monoandroid10+monotouch10+xamarinios10 install
77+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=xamarinmacmobile install
11578
echo "------------------------------ INSTALLED FILES --------------"
116-
ls -xlR $(DESTDIR)$(monodir)/fsharp $(DESTDIR)$(monodir)/xbuild $(DESTDIR)$(monodir)/gac/FSharp* $(DESTDIR)$(monodir)/Microsoft*
79+
ls -xlR $(DESTDIR)$(monodir)/fsharp $(DESTDIR)$(monodir)/msbuild $(DESTDIR)$(monodir)/xbuild $(DESTDIR)$(monodir)/Reference\ Assemblies $(DESTDIR)$(monodir)/gac/FSharp* $(DESTDIR)$(monodir)/Microsoft* || true
11780

11881
dist:
11982
-rm -r fsharp-$(DISTVERSION) fsharp-$(DISTVERSION).tar.bz2

‎before_install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fi)
5858
fi)
5959

6060
#TODO: work out how to avoid the need for this
61-
chmod u+x packages/FSharp.Compiler.Tools.4.1.23/tools/fsi.exe
61+
chmod u+x packages/FSharp.Compiler.Tools.4.1.27/tools/fsi.exe
6262
chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe
6363
chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.exe
6464

‎build.cmd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ set _dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
568568
set NUGET_PACKAGES=%~dp0Packages
569569
set path=%~dp0Tools\dotnet20\;%path%
570570

571-
set _fsiexe="packages\FSharp.Compiler.Tools.4.1.23\tools\fsi.exe"
571+
set _fsiexe="packages\FSharp.Compiler.Tools.4.1.27\tools\fsi.exe"
572572
if not exist %_fsiexe% echo Error: Could not find %_fsiexe% && goto :failure
573573
%_ngenexe% install %_fsiexe% /nologo
574574

@@ -606,8 +606,8 @@ if "%BUILD_PROTO%" == "1" (
606606

607607
if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "0" (
608608

609-
echo %_ngenexe% install packages\FSharp.Compiler.Tools.4.1.23\tools\fsc.exe /nologo
610-
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.23\tools\fsc.exe /nologo
609+
echo %_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo
610+
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo
611611

612612
echo %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
613613
%_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto

‎configure.ac‎

Lines changed: 7 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -46,93 +46,17 @@ MONOPREFIX=$(cd `$PKG_CONFIG --variable=prefix mono` && pwd)
4646
MONOBINDIR="$MONOPREFIX"/bin
4747
MONOLIBDIR="$MONOPREFIX"/lib
4848

49-
AC_PATH_PROG(XBUILD, xbuild, no)
50-
xbuild_from_pkg_config="$MONOBINDIR"/xbuild
51-
if test -e $xbuild_from_pkg_config; then
52-
XBUILD=$xbuild_from_pkg_config
53-
elif test "x$XBUILD" == "xno"; then
54-
AC_MSG_ERROR([Could not find xbuild])
49+
AC_PATH_PROG(MSBUILD, msbuild, no)
50+
msbuild_from_pkg_config="$MONOBINDIR"/msbuild
51+
if test -e $msbuild_from_pkg_config; then
52+
MSBUILD=$msbuild_from_pkg_config
53+
elif test "x$MSBUILD" == "xno"; then
54+
AC_MSG_ERROR([Could not find msbuild])
5555
fi
56-
AC_MSG_NOTICE(xbuild: $XBUILD)
57-
58-
MONOGACDIR="$MONOLIBDIR"/mono
59-
if ! test "x$with_gacdir" = "xno"; then
60-
MONOGACDIR=$(cd "$with_gacdir/.." && pwd)
61-
fi
62-
63-
MONOGACDIR40="$MONOGACDIR"/4.0
64-
MONOGACDIR45="$MONOGACDIR"/4.5
65-
66-
if ! test -e $MONOGACDIR45/mscorlib.dll; then
67-
AC_ERROR(Couldn't find the mono gac directory or mscorlib.dll in the usual places. Set --with-gacdir=<path>)
68-
fi
69-
70-
if test -e $MONOLIBDIR/mono/xbuild-frameworks/.NETPortable/v4.0/Profile/Profile47/mscorlib.dll; then
71-
PCLENABLED47=yes
72-
else
73-
PCLENABLED47=no
74-
fi
75-
AC_MSG_NOTICE(PCL Reference Assemblies for Profile 47 found: $PCLENABLED47)
76-
77-
AC_SUBST(PCLENABLED47)
78-
79-
80-
if test -e $MONOLIBDIR/mono/xbuild-frameworks/.NETPortable/v4.0/Profile/Profile47/mscorlib.dll; then
81-
PCLENABLED47=yes
82-
else
83-
PCLENABLED47=no
84-
fi
85-
AC_MSG_NOTICE(PCL Reference Assemblies for Profile 47 found: $PCLENABLED47)
86-
87-
AC_SUBST(PCLENABLED47)
88-
89-
90-
if test -e $MONOLIBDIR/mono/xbuild-frameworks/.NETPortable/v4.5/Profile/Profile7/System.Runtime.dll; then
91-
PCLENABLED7=yes
92-
else
93-
PCLENABLED7=no
94-
fi
95-
AC_MSG_NOTICE(PCL Reference Assemblies for Profile 7 found: $PCLENABLED7)
96-
97-
AC_SUBST(PCLENABLED7)
98-
99-
if test -e $MONOLIBDIR/mono/xbuild-frameworks/.NETPortable/v4.5/Profile/Profile78/System.Runtime.dll; then
100-
PCLENABLED78=yes
101-
else
102-
PCLENABLED78=no
103-
fi
104-
AC_MSG_NOTICE(PCL Reference Assemblies for Profile 78 found: $PCLENABLED78)
105-
106-
AC_SUBST(PCLENABLED78)
107-
108-
if test -e $MONOLIBDIR/mono/xbuild-frameworks/.NETPortable/v4.5/Profile/Profile259/System.Runtime.dll; then
109-
PCLENABLED259=yes
110-
else
111-
PCLENABLED259=no
112-
fi
113-
AC_MSG_NOTICE(PCL Reference Assemblies for Profile 259 found: $PCLENABLED259)
114-
115-
AC_SUBST(PCLENABLED259)
116-
117-
# We enable MonoTouch and MonoDroid builds if PCL components are available.
118-
# These build using binaries from dependencies/mono/2.1, but see
119-
# https://github.com/fsharp/fsharp/issues/391 where PCL is a requirement of
120-
# Microsoft.Common.targets when used in this configuration
121-
MONOTOUCHENABLED=$PCLENABLED78
122-
MONODROIDENABLED=$PCLENABLED78
123-
XAMARINMACENABLED=$PCLENABLED78
124-
125-
AC_SUBST(MONOTOUCHENABLED)
126-
AC_SUBST(MONODROIDENABLED)
127-
AC_SUBST(XAMARINMACENABLED)
56+
AC_MSG_NOTICE(msbuild: $MSBUILD)
12857

12958
AC_SUBST(MONOBINDIR)
13059
AC_SUBST(MONOLIBDIR)
131-
AC_SUBST(MONOGACDIR)
132-
133-
AC_SUBST(MONOGACDIR20)
134-
AC_SUBST(MONOGACDIR35)
135-
AC_SUBST(MONOGACDIR40)
13660

13761
AC_CONFIG_FILES([
13862
mono/launcher

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,5 @@
8888
<Private>True</Private>
8989
</ProjectReference>
9090
</ItemGroup>
91-
<Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
91+
<Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
9292
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@
6363
<Private>True</Private>
6464
</ProjectReference>
6565
</ItemGroup>
66-
<Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
66+
<Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
6767
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@
7979
</Reference>
8080

8181
</ItemGroup>
82-
<Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
82+
<Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
8383
</Project>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@
7171
<Compile Include="$(FSharpSourcesRoot)\..\tests\service\ProjectOptionsTests.fs">
7272
<Link>ProjectOptionsTests.fs</Link>
7373
</Compile>
74-
<None Include="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\FSharp.Core.optdata">
74+
<None Include="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\FSharp.Core.optdata">
7575
<Link>FSharp.Core.optdata</Link>
7676
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7777
</None>
78-
<None Include="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\FSharp.Core.sigdata">
78+
<None Include="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\FSharp.Core.sigdata">
7979
<Link>FSharp.Core.sigdata</Link>
8080
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8181
</None>
@@ -109,7 +109,7 @@
109109
</Reference>
110110
<!-- we test against FSharp.Core 4.4.1.0 -->
111111
<Reference Include="FSharp.Core">
112-
<HintPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\FSharp.Core.dll</HintPath>
112+
<HintPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\FSharp.Core.dll</HintPath>
113113
<Private>true</Private>
114114
</Reference>
115115

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@
639639
</Reference>
640640
</ItemGroup>
641641

642-
<Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
642+
<Import Project="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
643643
<Import Project="$(FSharpSourcesRoot)\scripts\fssrgen.targets" />
644644
<Import Project="$(FSharpSourcesRoot)\..\packages\FsLexYacc.7.0.6\build\FsLexYacc.targets" />
645645
</Project>

‎fcs/fcs.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionPrefix>16.0.2</VersionPrefix>
77
<!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build -->
88
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful -->
9-
<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools</FsiToolPath>
9+
<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</FsiToolPath>
1010
<FsiToolExe>fsi.exe</FsiToolExe>
1111

1212
</PropertyGroup>

0 commit comments

Comments
 (0)