Build: try to switch Paket to magic mode

9 years ago · 3b864ccd9d
8 changed files with 6 additions and 19 deletions
--- a/.gitignore
+++ b/.gitignore
@ -66,7 +66,6 @@ packages/*
 # FAKE & Paket
 packages
 paket-files
-.paket/paket.exe
 .fake

 # Generated Doc Files
--- a/.paket/paket.bootstrapper.exe
+++ b/.paket/paket.bootstrapper.exe
--- a/.paket/paket.exe
+++ b/.paket/paket.exe
--- a/build.cmd
+++ b/build.cmd
@ -1,11 +1,6 @@
@echo off
 cls

-.paket\paket.bootstrapper.exe
-if errorlevel 1 (
-  exit /b %errorlevel%
-)
-
 .paket\paket.exe restore
 if errorlevel 1 (
  exit /b %errorlevel%
--- a/build.sh
+++ b/build.sh
@ -5,7 +5,6 @@ set -o pipefail

 cd "$(dirname "$0")"

-PAKET_BOOTSTRAPPER_EXE=.paket/paket.bootstrapper.exe
 PAKET_EXE=.paket/paket.exe
 FAKE_EXE=packages/build/FAKE/tools/FAKE.exe

@ -35,6 +34,5 @@ then
  mozroots --import --sync --quiet
 fi

-run $PAKET_BOOTSTRAPPER_EXE
 run $PAKET_EXE restore
 run $FAKE_EXE "$@" $FSIARGS $FSIARGS2 build.fsx
--- a/paket.sh
+++ b/paket.sh
@ -26,5 +26,4 @@ then
  mozroots --import --sync --quiet
 fi

-run .paket/paket.bootstrapper.exe
 run .paket/paket.exe "$@"
--- a/restore.cmd
+++ b/restore.cmd
@ -1,11 +1,6 @@
@echo off
 cls

-.paket\paket.bootstrapper.exe
-if errorlevel 1 (
-  exit /b %errorlevel%
-)
-
 .paket\paket.exe restore
 if errorlevel 1 (
  exit /b %errorlevel%
--- a/restore.sh
+++ b/restore.sh
@ -3,13 +3,15 @@
 set -eu
 set -o pipefail

-cd `dirname $0`
+cd "$(dirname "$0")"
+
+PAKET_EXE=.paket/paket.exe

-FSIARGS=""
 OS=${OS:-"unknown"}
 if [[ "$OS" != "Windows_NT" ]]
 then
-  FSIARGS="--fsiargs -d:MONO"
+  # Allows NETFramework like net45 to be built using dotnet core tooling with mono
+  export FrameworkPathOverride=$(dirname $(which mono))/../lib/mono/4.5/
 fi

 function run() {
@ -26,5 +28,4 @@ then
  mozroots --import --sync --quiet
 fi

-run .paket/paket.bootstrapper.exe
-run .paket/paket.exe restore
+run $PAKET_EXE restore