Skip to content

Commit 368b598

Browse files
committed
Use paket as local tool instead of bootstrapper
1 parent 9d8a09e commit 368b598

File tree

6 files changed

+10
-55
lines changed

6 files changed

+10
-55
lines changed

.paket/paket.exe

-62.8 KB
Binary file not shown.

build.cmd

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
@echo off
22
cls
33

4-
.paket\paket.exe restore
4+
dotnet tool restore
5+
dotnet paket restore
6+
57
if errorlevel 1 (
68
exit /b %errorlevel%
79
)

build.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ set -o pipefail
55

66
cd "$(dirname "$0")"
77

8-
PAKET_EXE=.paket/paket.exe
8+
dotnet tool restore
9+
dotnet paket restore
10+
911
FAKE_EXE=packages/build/FAKE/tools/FAKE.exe
1012

1113
FSIARGS=""
@@ -34,5 +36,4 @@ then
3436
mozroots --import --sync --quiet
3537
fi
3638

37-
run $PAKET_EXE restore
3839
run $FAKE_EXE "$@" $FSIARGS $FSIARGS2 build.fsx

paket.sh

-24
This file was deleted.

restore.cmd

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
@echo off
22
cls
33

4-
.paket\paket.exe restore
5-
if errorlevel 1 (
6-
exit /b %errorlevel%
7-
)
4+
dotnet tool restore
5+
dotnet paket restore

restore.sh

+2-24
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,5 @@ set -o pipefail
55

66
cd "$(dirname "$0")"
77

8-
PAKET_EXE=.paket/paket.exe
9-
10-
OS=${OS:-"unknown"}
11-
if [[ "$OS" != "Windows_NT" ]]
12-
then
13-
# Allows NETFramework like net45 to be built using dotnet core tooling with mono
14-
export FrameworkPathOverride=$(dirname $(which mono))/../lib/mono/4.5/
15-
fi
16-
17-
function run() {
18-
if [[ "$OS" != "Windows_NT" ]]
19-
then
20-
mono "$@"
21-
else
22-
"$@"
23-
fi
24-
}
25-
26-
if [[ "$OS" != "Windows_NT" ]] && [ ! -e ~/.config/.mono/certs ]
27-
then
28-
mozroots --import --sync --quiet
29-
fi
30-
31-
run $PAKET_EXE restore
8+
dotnet tool restore
9+
dotnet paket restore

0 commit comments

Comments
 (0)