From ebbb63dd9481964dd2b0aaddcdd6bfcbe8b82429 Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Wed, 17 Jan 2018 22:32:54 +0100 Subject: [PATCH] Build: set FrameworkPathOverride when building on Linux --- .travis.yml | 2 ++ build.sh | 19 ++++++++++++++----- src/UnitTests/UnitTests.csproj | 3 +++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a69228fc..9f4d10a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ dist: trusty dotnet: 2.0.0 mono: - latest +os: +- linux addons: apt: diff --git a/build.sh b/build.sh index af6a467c..746f950e 100755 --- a/build.sh +++ b/build.sh @@ -3,13 +3,22 @@ set -eu set -o pipefail -cd `dirname $0` +cd "$(dirname "$0")" + +PAKET_BOOTSTRAPPER_EXE=.paket/paket.bootstrapper.exe +PAKET_EXE=.paket/paket.exe +FAKE_EXE=packages/build/FAKE/tools/FAKE.exe FSIARGS="" +FSIARGS2="" OS=${OS:-"unknown"} if [[ "$OS" != "Windows_NT" ]] then - FSIARGS="--fsiargs -d:MONO" + FSIARGS="--fsiargs" + FSIARGS2="-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,6 +35,6 @@ then mozroots --import --sync --quiet fi -run .paket/paket.bootstrapper.exe -run .paket/paket.exe restore -run packages/build/FAKE/tools/FAKE.exe "$@" $FSIARGS build.fsx +run $PAKET_BOOTSTRAPPER_EXE +run $PAKET_EXE restore +run $FAKE_EXE "$@" $FSIARGS $FSIARGS2 build.fsx diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj index 905bdbcd..ada95604 100644 --- a/src/UnitTests/UnitTests.csproj +++ b/src/UnitTests/UnitTests.csproj @@ -25,5 +25,8 @@ + + +