diff --git a/Makefile b/Makefile index 7900fa869dc..77a98f2871b 100644 --- a/Makefile +++ b/Makefile @@ -14,51 +14,38 @@ 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 @@ -66,14 +53,12 @@ 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 @@ -81,39 +66,17 @@ 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 diff --git a/before_install.sh b/before_install.sh index db4e9cbf672..d1498a55e64 100755 --- a/before_install.sh +++ b/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 diff --git a/build.cmd b/build.cmd index 04aef097d29..5624de77d8a 100644 --- a/build.cmd +++ b/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 diff --git a/configure.ac b/configure.ac index e8370aa7b77..ec3df2198f6 100644 --- a/configure.ac +++ b/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=) -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 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 deef4f0e689..e929138c567 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 @@ -88,5 +88,5 @@ True - + \ No newline at end of file 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 07625e300ed..b75f912c983 100644 --- a/fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj +++ b/fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj @@ -63,5 +63,5 @@ True - + \ No newline at end of file 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 bb29e5b7365..07bae7e5765 100644 --- a/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj +++ b/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj @@ -79,5 +79,5 @@ - + \ No newline at end of file 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 1cd80fda4ea..98e86a06448 100644 --- a/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj +++ b/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj @@ -71,11 +71,11 @@ ProjectOptionsTests.fs - + FSharp.Core.optdata PreserveNewest - + FSharp.Core.sigdata PreserveNewest @@ -109,7 +109,7 @@ - $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\FSharp.Core.dll + $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\FSharp.Core.dll true @@ -129,5 +129,5 @@ True - + \ No newline at end of file diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index 639fc875259..07d9840cde2 100644 --- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -639,7 +639,7 @@ - + \ No newline at end of file diff --git a/fcs/fcs.props b/fcs/fcs.props index bed88f78cc1..e7cce1e0c3a 100644 --- a/fcs/fcs.props +++ b/fcs/fcs.props @@ -6,7 +6,7 @@ 16.0.2 - $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools + $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools fsi.exe diff --git a/fcs/samples/EditorService/EditorService.fsproj b/fcs/samples/EditorService/EditorService.fsproj index 1631ce2e86d..e232d6c5eff 100644 --- a/fcs/samples/EditorService/EditorService.fsproj +++ b/fcs/samples/EditorService/EditorService.fsproj @@ -60,5 +60,5 @@ True - + \ No newline at end of file diff --git a/fcs/samples/FscExe/FscExe.fsproj b/fcs/samples/FscExe/FscExe.fsproj index 8849576d1ea..e0ef6ebd4da 100644 --- a/fcs/samples/FscExe/FscExe.fsproj +++ b/fcs/samples/FscExe/FscExe.fsproj @@ -59,7 +59,7 @@ - $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\FSharp.Core.dll + $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\FSharp.Core.dll true @@ -73,5 +73,5 @@ True - + \ No newline at end of file diff --git a/fcs/samples/FsiExe/FsiExe.fsproj b/fcs/samples/FsiExe/FsiExe.fsproj index 18435f8ff09..ef52e8ee777 100644 --- a/fcs/samples/FsiExe/FsiExe.fsproj +++ b/fcs/samples/FsiExe/FsiExe.fsproj @@ -47,7 +47,7 @@ - $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\FSharp.Core.dll + $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\FSharp.Core.dll true @@ -71,5 +71,5 @@ True - + \ No newline at end of file diff --git a/fcs/samples/InteractiveService/InteractiveService.fsproj b/fcs/samples/InteractiveService/InteractiveService.fsproj index c6b7ee6240d..4efd2a56b12 100644 --- a/fcs/samples/InteractiveService/InteractiveService.fsproj +++ b/fcs/samples/InteractiveService/InteractiveService.fsproj @@ -45,7 +45,7 @@ - $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\FSharp.Core.dll + $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\FSharp.Core.dll true @@ -64,5 +64,5 @@ True - + \ No newline at end of file diff --git a/fcs/samples/Tokenizer/Tokenizer.fsproj b/fcs/samples/Tokenizer/Tokenizer.fsproj index 6cbabe463ee..a58aaf190f4 100644 --- a/fcs/samples/Tokenizer/Tokenizer.fsproj +++ b/fcs/samples/Tokenizer/Tokenizer.fsproj @@ -45,7 +45,7 @@ - $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\FSharp.Core.dll + $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\FSharp.Core.dll true @@ -67,5 +67,5 @@ 11 - + \ No newline at end of file diff --git a/fcs/samples/UntypedTree/UntypedTree.fsproj b/fcs/samples/UntypedTree/UntypedTree.fsproj index c99bbab7ebe..e8818931cdd 100644 --- a/fcs/samples/UntypedTree/UntypedTree.fsproj +++ b/fcs/samples/UntypedTree/UntypedTree.fsproj @@ -45,7 +45,7 @@ - $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\FSharp.Core.dll + $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools\FSharp.Core.dll true @@ -67,5 +67,5 @@ 11 - + \ No newline at end of file diff --git a/mono/FSharp.Compiler.Interactive.Settings/Makefile b/mono/FSharp.Compiler.Interactive.Settings/Makefile index 6865755fbf2..bb894b51662 100644 --- a/mono/FSharp.Compiler.Interactive.Settings/Makefile +++ b/mono/FSharp.Compiler.Interactive.Settings/Makefile @@ -4,7 +4,7 @@ TOKEN=$(SIGN_TOKEN) include ../config.make -install: install-sdk-lib install-gac-lib +install: install-sdk-lib diff --git a/mono/FSharp.Compiler.Server.Shared/Makefile b/mono/FSharp.Compiler.Server.Shared/Makefile index 6afa337b06b..213bc156d3f 100644 --- a/mono/FSharp.Compiler.Server.Shared/Makefile +++ b/mono/FSharp.Compiler.Server.Shared/Makefile @@ -4,7 +4,7 @@ TOKEN=$(SIGN_TOKEN) include ../config.make -install: install-sdk-lib install-gac-lib +install: install-sdk-lib diff --git a/mono/FSharp.Core/Makefile b/mono/FSharp.Core/Makefile index 261e7fe387a..13667a91613 100644 --- a/mono/FSharp.Core/Makefile +++ b/mono/FSharp.Core/Makefile @@ -5,6 +5,6 @@ TOKEN=$(FSCORE_DELAY_SIGN_TOKEN) include ../config.make -install: install-sdk-lib install-gac-lib +install: install-sdk-lib diff --git a/mono/appveyor.ps1 b/mono/appveyor.ps1 index 021dda8fe0a..b26a52d32f9 100644 --- a/mono/appveyor.ps1 +++ b/mono/appveyor.ps1 @@ -1,6 +1,6 @@ # the version under development, update after a release -$version = '4.1.27' +$version = '4.1.28' function isVersionTag($tag){ $v = New-Object Version @@ -27,5 +27,4 @@ function pack($nuspec){ & $nuget pack $nuspec -BasePath "$dir" -Version $version -OutputDirectory "$packagesOutDir" -NoDefaultExcludes -Verbosity d } -pack(gi .\FSharp.Core.Nuget\FSharp.Core.nuspec) pack(gi .\FSharp.Compiler.Tools.Nuget\FSharp.Compiler.Tools.nuspec) diff --git a/mono/build-netcore.bat b/mono/build-netcore.bat deleted file mode 100755 index 1c28a962199..00000000000 --- a/mono/build-netcore.bat +++ /dev/null @@ -1,22 +0,0 @@ -@echo off - -:: Check prerequisites -set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" -if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe" -if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe" -if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe" -if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe. Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760. && goto :eof - -set msbuildflags=/maxcpucount - -::Build - -%_msbuildexe% %msbuildflags% lib\netcore\build-fsc-netcore.proj /v:n -@if ERRORLEVEL 1 echo Error: "%_msbuildexe% %msbuildflags% lib\netcore\build-fsc-netcore.proj" failed && goto :failure - - -@echo "Finished" -goto :eof - -:failure -exit /b 1 diff --git a/mono/build.bat b/mono/build.bat deleted file mode 100644 index 330f9fd1086..00000000000 --- a/mono/build.bat +++ /dev/null @@ -1,45 +0,0 @@ -@echo off - -:: Check prerequisites -set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" -if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe" -if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe" -if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe" -if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe. Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760. && goto :eof - -set msbuildflags=/maxcpucount -set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe" -if not exist %_ngenexe% echo Note: Could not find ngen.exe. - -::Build - -%_ngenexe% install .\.nuget\NuGet.exe - -.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget\nuget.config -@if ERRORLEVEL 1 echo Error: Nuget restore failed && goto :failure - -%_ngenexe% install packages\FSharp.Compiler.Tools.4.0.1.21\tools\fsc.exe - -set BUILD_NET40=1 -set BUILD_NET40_FSHARP_CORE=1 -set BUILD_PORTABLE=1 -set TEST_NET40_COREUNIT_SUITE=1 -set TEST_PORTABLE_COREUNIT_SUITE=1 - -%_msbuildexe% src\fsharp-proto-build.proj -@if ERRORLEVEL 1 echo Error: "%_msbuildexe% src\fsharp-proto-build.proj" failed && goto :failure - -%_ngenexe% install Proto\net440\bin\fsc-proto.exe - -%_msbuildexe% %msbuildflags% build-everything.proj /p:TargetDotnetProfile=net40 /p:Configuration=Release -@if ERRORLEVEL 1 echo Error: "%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetDotnetProfile=net40 /p:Configuration=Release" failed && goto :failure - -%_msbuildexe% %msbuildflags% src/fsharp/FSharp.Core/FSharp.Core.fsproj /p:TargetDotnetProfile=monotouch /p:Configuration=Release /p:KeyFile=..\..\..\mono\mono.snk -@if ERRORLEVEL 1 echo Error: "%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetDotnetProfile=monotouch /p:Configuration=Release /p:KeyFile=..\..\..\mono.snk" failed && goto :failure - - -@echo "Finished" -goto :eof - -:failure -exit /b 1 diff --git a/mono/config.make.in b/mono/config.make.in index ef700f132b6..3106ab99fd4 100644 --- a/mono/config.make.in +++ b/mono/config.make.in @@ -1,6 +1,6 @@ DEFAULT: all -.PHONY: install-sdk-lib install-gac-lib +.PHONY: install-sdk-lib prefix := @prefix@ topdir := @abs_top_srcdir@/ @@ -9,17 +9,6 @@ libdir := ${prefix}/lib/ bindir := ${prefix}/bin/ monobindir := @MONOBINDIR@ monolibdir := @MONOLIBDIR@ -monogacdir := @MONOGACDIR@ - -monogacdir40 := @MONOGACDIR40@ - -pclenabled47 := @PCLENABLED47@ -pclenabled7 := @PCLENABLED7@ -pclenabled78 := @PCLENABLED78@ -pclenabled259 := @PCLENABLED259@ -monotouchenabled := @MONOTOUCHENABLED@ -monodroidenabled := @MONODROIDENABLED@ -xamarinmacenabled := @XAMARINMACENABLED@ monodir := ${libdir}mono @@ -30,6 +19,7 @@ DISTVERSION = 201011 # Version number mappings for various versions of FSharp.Core + ifeq (x-$(TargetDotnetProfile)-,x-net40-) ifeq (x-$(FSharpCoreBackVersion)-,x--) @@ -105,7 +95,7 @@ INSTALL = $(SHELL) $(topdir)/mono/install-sh INSTALL_BIN = $(INSTALL) -c -m 755 INSTALL_LIB = $(INSTALL_BIN) -XBUILD = @XBUILD@ +MSBUILD = @MSBUILD@ EXTRA_DIST = configure NO_DIST = .gitignore lib/debug lib/proto lib/release @@ -201,6 +191,18 @@ install-sdk-lib: $(INSTALL_LIB) $(tmpdir)Microsoft.Portable.FSharp.Targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \ $(INSTALL_LIB) $(tmpdir)Microsoft.Portable.FSharp.Targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/; \ $(INSTALL_LIB) $(tmpdir)Microsoft.Portable.FSharp.Targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/; \ + \ + $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp/; \ + $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp/; \ + $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \ + $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/; \ + $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/; \ + \ + $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp/; \ + $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp/; \ + $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \ + $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/; \ + $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/; \ fi @if test x-$(outsuffix) = x-net40; then \ if test -e $(outdir)$(NAME).dll; then \ @@ -248,52 +250,6 @@ install-sdk-lib: $(INSTALL_LIB) $(outdir)$(NAME).dll $(DESTDIR)$(monodir)/fsharp/api/$(PCLPATH)/$(VERSION)/; \ fi -# Install the library binaries in the GAC directory, -install-gac-lib: - $(eval TARGET = "4.5") - @echo "Installing $(ASSEMBLY)" - @if test "x$(DELAY_SIGN)" = "x1"; then \ - echo "Signing $(outdir)$(ASSEMBLY) with Mono key"; \ - $(monobindir)/sn -q -R $(outdir)$(ASSEMBLY) $(topdir)mono/mono.snk; \ - fi - @if test -e $(outdir)$(NAME).dll; then \ - if test x-$(NAME) = x-FSharp.Core && test x-$(PKGINSTALL) = x-yes; then \ - echo "Using gacutil to install $(outdir)$(ASSEMBLY) into GAC root $(DESTDIR)$(libdir) as package $(TARGET)"; \ - $(monobindir)/gacutil -i $(outdir)$(ASSEMBLY) -root $(DESTDIR)$(libdir) -package $(TARGET); \ - else \ - echo "Installing $(outdir)$(NAME).dll to $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/"; \ - mkdir -p $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \ - $(INSTALL_LIB) $(outdir)$(NAME).dll $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \ - fi; \ - fi - - @if test -e $(outdir)$(NAME).xml; then \ - echo "Installing $(outdir)$(NAME).xml into $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/"; \ - mkdir -p $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \ - $(INSTALL_LIB) $(outdir)$(NAME).xml $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \ - if test x-$(PKGINSTALL) = x-yes && test x-$(NAME) = x-FSharp.Core; then \ - echo "Using linking to ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).xml to install $(DESTDIR)$(libdir)mono/$(TARGET)/$(NAME).xml"; \ - ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).xml $(DESTDIR)$(libdir)mono/$(TARGET)/$(NAME).xml; \ - fi; \ - fi - @if test -e $(outdir)$(NAME).sigdata; then \ - echo "Installing $(outdir)$(NAME).sigdata into $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/"; \ - mkdir -p $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \ - $(INSTALL_LIB) $(outdir)$(NAME).sigdata $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \ - if test x-$(PKGINSTALL) = x-yes; then \ - echo "Using linking to ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).sigdata to install $(DESTDIR)$(libdir)mono/$(TARGET)/$(NAME).sigdata"; \ - ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).sigdata $(DESTDIR)$(libdir)mono/$(TARGET)/$(NAME).sigdata; \ - fi; \ - fi - @if test -e $(outdir)$(NAME).optdata; then \ - echo "Installing $(outdir)$(NAME).optdata into $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/"; \ - mkdir -p $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \ - $(INSTALL_LIB) $(outdir)$(NAME).optdata $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN)/; \ - if test x-$(PKGINSTALL) = x-yes; then \ - echo "Using linking to ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).optdata to install $(DESTDIR)$(libdir)mono/$(TARGET)/$(NAME).optdata"; \ - ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).optdata $(DESTDIR)$(libdir)mono/$(TARGET)/$(NAME).optdata; \ - fi; \ - fi # The binaries fsc.exe and fsi.exe only get installed for Mono 4.5 profile diff --git a/mono/policy.2.0.FSharp.Core/Makefile b/mono/policy.2.0.FSharp.Core/Makefile deleted file mode 100644 index b224aca1d1f..00000000000 --- a/mono/policy.2.0.FSharp.Core/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -NAME=policy.2.0.FSharp.Core -ASSEMBLY = $(NAME).dll -DELAY_SIGN=1 -TOKEN=$(FSCORE_DELAY_SIGN_TOKEN) - -include ../config.make - -$(outdir)$(NAME).dll: $(NAME).dll.config - @mkdir -p $(@D) - cp $(NAME).dll.config $(@D) - $(monobindir)/al /link:$(NAME).dll.config /out:$@ /delaysign /keyfile:$(topdir)mono/msfinal.pub - -build: - $(MAKE) $(outdir)$(NAME).dll - -clean: - -rm -f $(outdir)$(NAME).dll - -install: install-sdk-lib install-gac-lib - - - diff --git a/mono/policy.2.0.FSharp.Core/policy.2.0.FSharp.Core.dll.config b/mono/policy.2.0.FSharp.Core/policy.2.0.FSharp.Core.dll.config deleted file mode 100644 index b533a63135d..00000000000 --- a/mono/policy.2.0.FSharp.Core/policy.2.0.FSharp.Core.dll.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/mono/policy.2.3.FSharp.Core/Makefile b/mono/policy.2.3.FSharp.Core/Makefile deleted file mode 100644 index 6158f76d21c..00000000000 --- a/mono/policy.2.3.FSharp.Core/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -NAME=policy.2.3.FSharp.Core -ASSEMBLY = $(NAME).dll -DELAY_SIGN=1 -TOKEN=$(FSCORE_DELAY_SIGN_TOKEN) - -include ../config.make - -# override the targets to build the assembly - -$(outdir)$(NAME).dll: $(NAME).dll.config - @mkdir -p $(@D) - cp $(NAME).dll.config $(@D) - $(monobindir)/al /link:$(NAME).dll.config /out:$@ /delaysign /keyfile:$(topdir)mono/msfinal.pub - -build: - $(MAKE) $(outdir)$(NAME).dll - -clean: - -rm -f $(outdir)$(NAME).dll - -install: install-sdk-lib install-gac-lib - diff --git a/mono/policy.2.3.FSharp.Core/policy.2.3.FSharp.Core.dll.config b/mono/policy.2.3.FSharp.Core/policy.2.3.FSharp.Core.dll.config deleted file mode 100644 index f211873a0ab..00000000000 --- a/mono/policy.2.3.FSharp.Core/policy.2.3.FSharp.Core.dll.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/mono/policy.3.259.FSharp.Core/Makefile b/mono/policy.3.259.FSharp.Core/Makefile deleted file mode 100644 index e51e01099a0..00000000000 --- a/mono/policy.3.259.FSharp.Core/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -NAME=policy.3.259.FSharp.Core -ASSEMBLY = $(NAME).dll -DELAY_SIGN=1 -TOKEN=$(FSCORE_DELAY_SIGN_TOKEN) - -include ../config.make - -$(outdir)$(NAME).dll: $(NAME).dll.config - @mkdir -p $(@D) - cp $(NAME).dll.config $(@D) - $(monobindir)/al /link:$(NAME).dll.config /out:$@ /delaysign /keyfile:$(topdir)mono/msfinal.pub - -build: - $(MAKE) $(outdir)$(NAME).dll - -clean: - -rm -f $(outdir)$(NAME).dll - -install: install-sdk-lib install-gac-lib \ No newline at end of file diff --git a/mono/policy.3.259.FSharp.Core/policy.3.259.FSharp.Core.dll.config b/mono/policy.3.259.FSharp.Core/policy.3.259.FSharp.Core.dll.config deleted file mode 100644 index c6cf7415894..00000000000 --- a/mono/policy.3.259.FSharp.Core/policy.3.259.FSharp.Core.dll.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/mono/policy.3.3.FSharp.Core/Makefile b/mono/policy.3.3.FSharp.Core/Makefile deleted file mode 100644 index 7384f56497b..00000000000 --- a/mono/policy.3.3.FSharp.Core/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -NAME=policy.3.3.FSharp.Core -ASSEMBLY = $(NAME).dll -DELAY_SIGN=1 -TOKEN=$(FSCORE_DELAY_SIGN_TOKEN) - -include ../config.make - -$(outdir)$(NAME).dll: $(NAME).dll.config - @mkdir -p $(@D) - cp $(NAME).dll.config $(@D) - $(monobindir)/al /link:$(NAME).dll.config /out:$@ /delaysign /keyfile:$(topdir)mono/msfinal.pub - -build: - $(MAKE) $(outdir)$(NAME).dll - -clean: - -rm -f $(outdir)$(NAME).dll - -install: install-sdk-lib install-gac-lib \ No newline at end of file diff --git a/mono/policy.3.3.FSharp.Core/policy.3.3.FSharp.Core.dll.config b/mono/policy.3.3.FSharp.Core/policy.3.3.FSharp.Core.dll.config deleted file mode 100644 index eecc0dddec4..00000000000 --- a/mono/policy.3.3.FSharp.Core/policy.3.3.FSharp.Core.dll.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/mono/policy.3.47.FSharp.Core/Makefile b/mono/policy.3.47.FSharp.Core/Makefile deleted file mode 100644 index 34027eaafd7..00000000000 --- a/mono/policy.3.47.FSharp.Core/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -NAME=policy.3.47.FSharp.Core -ASSEMBLY = $(NAME).dll -DELAY_SIGN=1 -TOKEN=$(FSCORE_DELAY_SIGN_TOKEN) - -include ../config.make - -$(outdir)$(NAME).dll: $(NAME).dll.config - @mkdir -p $(@D) - cp $(NAME).dll.config $(@D) - $(monobindir)/al /link:$(NAME).dll.config /out:$@ /delaysign /keyfile:$(topdir)mono/msfinal.pub - -build: - $(MAKE) $(outdir)$(NAME).dll - -clean: - -rm -f $(outdir)$(NAME).dll - -install: install-sdk-lib install-gac-lib \ No newline at end of file diff --git a/mono/policy.3.47.FSharp.Core/policy.3.47.FSharp.Core.dll.config b/mono/policy.3.47.FSharp.Core/policy.3.47.FSharp.Core.dll.config deleted file mode 100644 index f5eaaa99057..00000000000 --- a/mono/policy.3.47.FSharp.Core/policy.3.47.FSharp.Core.dll.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/mono/policy.3.7.FSharp.Core/Makefile b/mono/policy.3.7.FSharp.Core/Makefile deleted file mode 100644 index 1a0420e9526..00000000000 --- a/mono/policy.3.7.FSharp.Core/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -NAME=policy.3.7.FSharp.Core -ASSEMBLY = $(NAME).dll -DELAY_SIGN=1 -TOKEN=$(FSCORE_DELAY_SIGN_TOKEN) - -include ../config.make - -$(outdir)$(NAME).dll: $(NAME).dll.config - @mkdir -p $(@D) - cp $(NAME).dll.config $(@D) - $(monobindir)/al /link:$(NAME).dll.config /out:$@ /delaysign /keyfile:$(topdir)mono/msfinal.pub - -build: - $(MAKE) $(outdir)$(NAME).dll - -clean: - -rm -f $(outdir)$(NAME).dll - -install: install-sdk-lib install-gac-lib \ No newline at end of file diff --git a/mono/policy.3.7.FSharp.Core/policy.3.7.FSharp.Core.dll.config b/mono/policy.3.7.FSharp.Core/policy.3.7.FSharp.Core.dll.config deleted file mode 100644 index 791007a1d95..00000000000 --- a/mono/policy.3.7.FSharp.Core/policy.3.7.FSharp.Core.dll.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/mono/policy.3.78.FSharp.Core/Makefile b/mono/policy.3.78.FSharp.Core/Makefile deleted file mode 100644 index 59d9df135f0..00000000000 --- a/mono/policy.3.78.FSharp.Core/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -NAME=policy.3.78.FSharp.Core -ASSEMBLY = $(NAME).dll -DELAY_SIGN=1 -TOKEN=$(FSCORE_DELAY_SIGN_TOKEN) - -include ../config.make - -$(outdir)$(NAME).dll: $(NAME).dll.config - @mkdir -p $(@D) - cp $(NAME).dll.config $(@D) - $(monobindir)/al /link:$(NAME).dll.config /out:$@ /delaysign /keyfile:$(topdir)mono/msfinal.pub - -build: - $(MAKE) $(outdir)$(NAME).dll - -clean: - -rm -f $(outdir)$(NAME).dll - -install: install-sdk-lib install-gac-lib \ No newline at end of file diff --git a/mono/policy.3.78.FSharp.Core/policy.3.78.FSharp.Core.dll.config b/mono/policy.3.78.FSharp.Core/policy.3.78.FSharp.Core.dll.config deleted file mode 100644 index bd7261c4725..00000000000 --- a/mono/policy.3.78.FSharp.Core/policy.3.78.FSharp.Core.dll.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/mono/policy.4.0.FSharp.Core/Makefile b/mono/policy.4.0.FSharp.Core/Makefile deleted file mode 100644 index 6b71e4fc0be..00000000000 --- a/mono/policy.4.0.FSharp.Core/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -NAME=policy.4.0.FSharp.Core -ASSEMBLY = $(NAME).dll -DELAY_SIGN=1 -TOKEN=$(FSCORE_DELAY_SIGN_TOKEN) - -include ../config.make - -$(outdir)$(NAME).dll: $(NAME).dll.config - @mkdir -p $(@D) - cp $(NAME).dll.config $(@D) - $(monobindir)/al /link:$(NAME).dll.config /out:$@ /delaysign /keyfile:$(topdir)mono/msfinal.pub - -build: - $(MAKE) $(outdir)$(NAME).dll - -clean: - -rm -f $(outdir)$(NAME).dll - -install: install-sdk-lib install-gac-lib \ No newline at end of file diff --git a/mono/policy.4.0.FSharp.Core/policy.4.0.FSharp.Core.dll.config b/mono/policy.4.0.FSharp.Core/policy.4.0.FSharp.Core.dll.config deleted file mode 100644 index 88b8cf82c9a..00000000000 --- a/mono/policy.4.0.FSharp.Core/policy.4.0.FSharp.Core.dll.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/mono/policy.4.3.FSharp.Core/Makefile b/mono/policy.4.3.FSharp.Core/Makefile deleted file mode 100644 index 80ca0747c72..00000000000 --- a/mono/policy.4.3.FSharp.Core/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -NAME=policy.4.3.FSharp.Core -ASSEMBLY = $(NAME).dll -DELAY_SIGN=1 -TOKEN=$(FSCORE_DELAY_SIGN_TOKEN) - -include ../config.make - -$(outdir)$(NAME).dll: $(NAME).dll.config - @mkdir -p $(@D) - cp $(NAME).dll.config $(@D) - $(monobindir)/al /link:$(NAME).dll.config /out:$@ /delaysign /keyfile:$(topdir)mono/msfinal.pub - -build: - $(MAKE) $(outdir)$(NAME).dll - -clean: - -rm -f $(outdir)$(NAME).dll - -install: install-sdk-lib install-gac-lib \ No newline at end of file diff --git a/mono/policy.4.3.FSharp.Core/policy.4.3.FSharp.Core.dll.config b/mono/policy.4.3.FSharp.Core/policy.4.3.FSharp.Core.dll.config deleted file mode 100644 index d84baa71b56..00000000000 --- a/mono/policy.4.3.FSharp.Core/policy.4.3.FSharp.Core.dll.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/mono/policy.4.4.FSharp.Core/Makefile b/mono/policy.4.4.FSharp.Core/Makefile deleted file mode 100644 index b55467817f8..00000000000 --- a/mono/policy.4.4.FSharp.Core/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -NAME=policy.4.4.FSharp.Core -ASSEMBLY = $(NAME).dll -DELAY_SIGN=1 -TOKEN=$(FSCORE_DELAY_SIGN_TOKEN) - -include ../config.make - -$(outdir)$(NAME).dll: $(NAME).dll.config - @mkdir -p $(@D) - cp $(NAME).dll.config $(@D) - $(monobindir)/al /link:$(NAME).dll.config /out:$@ /delaysign /keyfile:$(topdir)mono/msfinal.pub - -build: - $(MAKE) $(outdir)$(NAME).dll - -clean: - -rm -f $(outdir)$(NAME).dll - -install: install-sdk-lib install-gac-lib \ No newline at end of file diff --git a/mono/policy.4.4.FSharp.Core/policy.4.4.FSharp.Core.dll.config b/mono/policy.4.4.FSharp.Core/policy.4.4.FSharp.Core.dll.config deleted file mode 100644 index a76ad3acd42..00000000000 --- a/mono/policy.4.4.FSharp.Core/policy.4.4.FSharp.Core.dll.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/mono/prepare-mono.sh b/mono/prepare-mono.sh index 93545103196..77f3e18b99d 100755 --- a/mono/prepare-mono.sh +++ b/mono/prepare-mono.sh @@ -21,9 +21,9 @@ esac # On Linux (or at least, Ubuntu), when building with Mono, need to install the mono-devel package first. if [ $OS = 'Linux' ]; then sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF - echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list + echo "deb http://download.mono-project.com/repo/ubuntu trusty main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list sudo apt-get update - sudo apt-get -y install mono-devel + sudo apt-get -y install mono-devel msbuild fi # Check if SSL certificates have been imported into Mono's certificate store. @@ -54,10 +54,10 @@ fi) fi) #TODO: work out how to avoid the need for this -echo "chmod u+x packages/FSharp.Compiler.Tools.4.1.23/tools/fsi.exe" -echo "chmod u+x packages/FsLexYacc.7.0.4/build/fslex.exe" -echo "chmod u+x packages/FsLexYacc.7.0.4/build/fsyacc.exe" -chmod u+x packages/FSharp.Compiler.Tools.4.1.23/tools/fsi.exe +echo "chmod u+x packages/FSharp.Compiler.Tools.4.1.27/tools/fsi.exe" +echo "chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe" +echo "chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.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 diff --git a/mono/travis-autogen.sh b/mono/travis-autogen.sh index e4725f81cb0..9c356b0862f 100755 --- a/mono/travis-autogen.sh +++ b/mono/travis-autogen.sh @@ -3,7 +3,8 @@ echo "TRAVIS_OS_NAME=$TRAVIS_OS_NAME" if [ "$TRAVIS_OS_NAME" = "osx" ]; then - monoVer=$(mono --version | head -n 1 | cut -d' ' -f 5) + # Parse 'Mono JIT compiler version 5.0.1.1' to '5.0.1' + monoVer=$(mono --version | head -n 1 | cut -d' ' -f 5 | cut -d'.' -f 1-3) prefix="/Library/Frameworks/Mono.framework/Versions/$monoVer"; else prefix="/usr"; diff --git a/packages.config b/packages.config index 8a0d01eaaed..ff5ad0ff98d 100644 --- a/packages.config +++ b/packages.config @@ -39,11 +39,23 @@ - + + + + + + + + + + + + + diff --git a/src/FSharpSource.Settings.targets b/src/FSharpSource.Settings.targets index 11a1cd12bda..7f964f14beb 100644 --- a/src/FSharpSource.Settings.targets +++ b/src/FSharpSource.Settings.targets @@ -141,7 +141,7 @@ - $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools + $(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets index 188448b2a44..5d09fd3373d 100644 --- a/src/FSharpSource.targets +++ b/src/FSharpSource.targets @@ -157,7 +157,7 @@ $(FSharpSourcesRoot)\..\$(Configuration)\$(ProtoFlavour)\bin $(FSharpSourcesRoot)\..\Tools\dotnet20\sdk\2.0.0-preview2-006502\FSharp - ..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets + ..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets $(FSharpSourcesRoot)\..\Tools\dotnet20 @@ -170,7 +170,7 @@ $(FSharpSourcesRoot)\..\$(Configuration)\$(ProtoFlavour)\bin - ..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets + ..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets diff --git a/tests/fsharp/core/attributes/test.fsx b/tests/fsharp/core/attributes/test.fsx index 991311b9720..e31a35b9106 100644 --- a/tests/fsharp/core/attributes/test.fsx +++ b/tests/fsharp/core/attributes/test.fsx @@ -1333,6 +1333,7 @@ module BugWithOverloadedAttributes = [] type Bar = class end +#if !TESTS_AS_APP && !FX_PORTABLE_OR_NETSTANDARD module Bug719b = open TestLibModule.Bug719 @@ -1340,6 +1341,7 @@ module Bug719b = type Bar = interface IFoo with member __.Test (?value:int) = value.ToString() +#endif (*------------------------------------------------------------------------- !* Test passed? diff --git a/tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource_using_bootstrap/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.fsproj b/tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource_using_bootstrap/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.fsproj index c2104e72a0b..fbbac89edf7 100644 --- a/tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource_using_bootstrap/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.fsproj +++ b/tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource_using_bootstrap/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.fsproj @@ -16,6 +16,7 @@ 4.4.0.0 $(MSBuildProjectDirectory)\..\..\..\..\packages\FSharp.Compiler.Tools\tools $(MSBuildProjectDirectory)\..\..\..\..\packages\FSharp.Compiler.Tools.4.1.5\tools + $(MSBuildProjectDirectory)\..\..\..\..\packages\FSharp.Compiler.Tools.4.1.27\tools True diff --git a/tests/service/data/DifferingOutputDir/Dir1/Test1.fsproj b/tests/service/data/DifferingOutputDir/Dir1/Test1.fsproj index 5a43b0c04cf..c63d10731da 100644 --- a/tests/service/data/DifferingOutputDir/Dir1/Test1.fsproj +++ b/tests/service/data/DifferingOutputDir/Dir1/Test1.fsproj @@ -48,7 +48,7 @@ - + diff --git a/tests/service/data/DifferingOutputDir/Dir2/Test2.fsproj b/tests/service/data/DifferingOutputDir/Dir2/Test2.fsproj index d426b465970..0ee82b31cbf 100644 --- a/tests/service/data/DifferingOutputDir/Dir2/Test2.fsproj +++ b/tests/service/data/DifferingOutputDir/Dir2/Test2.fsproj @@ -54,7 +54,7 @@ Test1 - + diff --git a/tests/service/data/FsAndFsiFiles.fsproj b/tests/service/data/FsAndFsiFiles.fsproj index 676918f28f1..95b10fad1bb 100644 --- a/tests/service/data/FsAndFsiFiles.fsproj +++ b/tests/service/data/FsAndFsiFiles.fsproj @@ -48,7 +48,7 @@ - + diff --git a/tests/service/data/MultiLanguageProject/ConsoleApplication1.fsproj b/tests/service/data/MultiLanguageProject/ConsoleApplication1.fsproj index 7ab56a77349..e12ade0ff46 100644 --- a/tests/service/data/MultiLanguageProject/ConsoleApplication1.fsproj +++ b/tests/service/data/MultiLanguageProject/ConsoleApplication1.fsproj @@ -64,7 +64,7 @@ 11 - + diff --git a/tests/service/data/MultiLanguageProject/ConsoleApplication2.fsproj b/tests/service/data/MultiLanguageProject/ConsoleApplication2.fsproj index cf8ada0c37f..38bb936cab8 100644 --- a/tests/service/data/MultiLanguageProject/ConsoleApplication2.fsproj +++ b/tests/service/data/MultiLanguageProject/ConsoleApplication2.fsproj @@ -56,7 +56,7 @@ True - + diff --git a/tests/service/data/Space in name.fsproj b/tests/service/data/Space in name.fsproj index 5e5f5607140..ec67bc97427 100644 --- a/tests/service/data/Space in name.fsproj +++ b/tests/service/data/Space in name.fsproj @@ -52,7 +52,7 @@ Test1 - + diff --git a/tests/service/data/Test1.fsproj b/tests/service/data/Test1.fsproj index 853a0b25db2..6cb171ba604 100644 --- a/tests/service/data/Test1.fsproj +++ b/tests/service/data/Test1.fsproj @@ -46,7 +46,7 @@ - + diff --git a/tests/service/data/Test2.fsproj b/tests/service/data/Test2.fsproj index 2ad04efa94c..96ff7ac180f 100644 --- a/tests/service/data/Test2.fsproj +++ b/tests/service/data/Test2.fsproj @@ -53,7 +53,7 @@ Test1 - + diff --git a/tests/service/data/TestProject/TestProject.fsproj b/tests/service/data/TestProject/TestProject.fsproj index c5ec5c4ff1e..dde260ce99f 100644 --- a/tests/service/data/TestProject/TestProject.fsproj +++ b/tests/service/data/TestProject/TestProject.fsproj @@ -56,7 +56,7 @@ True - + diff --git a/tests/service/data/ToolsVersion12.fsproj b/tests/service/data/ToolsVersion12.fsproj index 6ed8fdc84aa..92bad59c135 100644 --- a/tests/service/data/ToolsVersion12.fsproj +++ b/tests/service/data/ToolsVersion12.fsproj @@ -43,7 +43,7 @@ 11 - + diff --git a/tests/service/data/TypeProviderConsole/TypeProviderConsole.fsproj b/tests/service/data/TypeProviderConsole/TypeProviderConsole.fsproj index 4f3ea153d83..6b50e360a01 100644 --- a/tests/service/data/TypeProviderConsole/TypeProviderConsole.fsproj +++ b/tests/service/data/TypeProviderConsole/TypeProviderConsole.fsproj @@ -56,7 +56,7 @@ True - + diff --git a/tests/service/data/TypeProviderLibrary/TypeProviderLibrary.fsproj b/tests/service/data/TypeProviderLibrary/TypeProviderLibrary.fsproj index ae00627abad..baa89f49b39 100644 --- a/tests/service/data/TypeProviderLibrary/TypeProviderLibrary.fsproj +++ b/tests/service/data/TypeProviderLibrary/TypeProviderLibrary.fsproj @@ -44,5 +44,5 @@ - + \ No newline at end of file diff --git a/tests/service/data/TypeProvidersBug/TestConsole/TestConsole.fsproj b/tests/service/data/TypeProvidersBug/TestConsole/TestConsole.fsproj index 9af97c851b7..54448fef5c3 100644 --- a/tests/service/data/TypeProvidersBug/TestConsole/TestConsole.fsproj +++ b/tests/service/data/TypeProvidersBug/TestConsole/TestConsole.fsproj @@ -60,5 +60,5 @@ True - + \ No newline at end of file diff --git a/tests/service/data/TypeProvidersBug/TypeProvidersBug/TypeProvidersBug.fsproj b/tests/service/data/TypeProvidersBug/TypeProvidersBug/TypeProvidersBug.fsproj index ab086df6a3f..00ef54f6521 100644 --- a/tests/service/data/TypeProvidersBug/TypeProvidersBug/TypeProvidersBug.fsproj +++ b/tests/service/data/TypeProvidersBug/TypeProvidersBug/TypeProvidersBug.fsproj @@ -50,5 +50,5 @@ True - + \ No newline at end of file diff --git a/tests/service/data/sqlite-net-spike/sqlite-net-spike.fsproj b/tests/service/data/sqlite-net-spike/sqlite-net-spike.fsproj index 6d980b1e49a..93cc75f0024 100644 --- a/tests/service/data/sqlite-net-spike/sqlite-net-spike.fsproj +++ b/tests/service/data/sqlite-net-spike/sqlite-net-spike.fsproj @@ -47,7 +47,7 @@ - +