diff --git a/.paket/paket.exe b/.paket/paket.exe deleted file mode 100644 index b98e000b..00000000 Binary files a/.paket/paket.exe and /dev/null differ diff --git a/build.cmd b/build.cmd index e9933d32..72da2752 100644 --- a/build.cmd +++ b/build.cmd @@ -1,7 +1,9 @@ @echo off cls -.paket\paket.exe restore +dotnet tool restore +dotnet paket restore + if errorlevel 1 ( exit /b %errorlevel% ) diff --git a/build.sh b/build.sh index 25bebb1e..f1309f92 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,9 @@ set -o pipefail cd "$(dirname "$0")" -PAKET_EXE=.paket/paket.exe +dotnet tool restore +dotnet paket restore + FAKE_EXE=packages/build/FAKE/tools/FAKE.exe FSIARGS="" @@ -34,5 +36,4 @@ then mozroots --import --sync --quiet fi -run $PAKET_EXE restore run $FAKE_EXE "$@" $FSIARGS $FSIARGS2 build.fsx diff --git a/paket.sh b/paket.sh deleted file mode 100755 index 2ef2ae13..00000000 --- a/paket.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -set -eu -set -o pipefail - -cd "$(dirname "$0")" - -PAKET_EXE=.paket/paket.exe - -function run() { - if [[ "$OS" != "Windows_NT" ]] - then - mono "$@" - else - "$@" - fi -} - -if [[ "$OS" != "Windows_NT" ]] && [ ! -e ~/.config/.mono/certs ] -then - mozroots --import --sync --quiet -fi - -run $PAKET_EXE "$@" diff --git a/restore.cmd b/restore.cmd index 00ac050e..b2ce4b83 100644 --- a/restore.cmd +++ b/restore.cmd @@ -1,7 +1,5 @@ @echo off cls -.paket\paket.exe restore -if errorlevel 1 ( - exit /b %errorlevel% -) +dotnet tool restore +dotnet paket restore diff --git a/restore.sh b/restore.sh index f1cab8e3..00f77b47 100755 --- a/restore.sh +++ b/restore.sh @@ -5,27 +5,5 @@ set -o pipefail cd "$(dirname "$0")" -PAKET_EXE=.paket/paket.exe - -OS=${OS:-"unknown"} -if [[ "$OS" != "Windows_NT" ]] -then - # 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() { - if [[ "$OS" != "Windows_NT" ]] - then - mono "$@" - else - "$@" - fi -} - -if [[ "$OS" != "Windows_NT" ]] && [ ! -e ~/.config/.mono/certs ] -then - mozroots --import --sync --quiet -fi - -run $PAKET_EXE restore +dotnet tool restore +dotnet paket restore