Skip to content

Commit

Permalink
Get common buils scripts from build-script repo
Browse files Browse the repository at this point in the history
  • Loading branch information
Jand42 committed Jan 29, 2018
1 parent 18dbcfe commit 022619e
Show file tree
Hide file tree
Showing 6 changed files with 277 additions and 214 deletions.
465 changes: 269 additions & 196 deletions WebSharper.UI.CSharp.Tests/WebSharper.UI.CSharp.Tests.csproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build.cmd
Expand Up @@ -7,4 +7,4 @@ if errorlevel 1 exit /b %errorlevel%
.paket\paket.exe update -g wsbuild
if errorlevel 1 exit /b %errorlevel%

paket-files\wsbuild\intellifactory\websharper\tools\WebSharper.Fake.cmd %*
call paket-files\wsbuild\github.com\dotnet-websharper\build-script\WebSharper.Fake.cmd %*
2 changes: 1 addition & 1 deletion build.fsx
@@ -1,4 +1,4 @@
#load "paket-files/wsbuild/intellifactory/websharper/tools/WebSharper.Fake.fsx"
#load "paket-files/wsbuild/github.com/dotnet-websharper/build-script/WebSharper.Fake.fsx"
open Fake
open WebSharper.Fake

Expand Down
4 changes: 1 addition & 3 deletions build.sh
Expand Up @@ -5,11 +5,9 @@ set -e
if [ "$OS" = "Windows_NT" ]; then
.paket/paket.exe restore -g build
.paket/paket.exe update -g wsbuild
.paket/paket.exe restore -g build
else
mono .paket/paket.exe restore -g build
mono .paket/paket.exe update -g wsbuild
mono .paket/paket.exe restore -g build
fi

paket-files/wsbuild/intellifactory/websharper/tools/WebSharper.Fake.sh "$@"
exec paket-files/wsbuild/github.com/dotnet-websharper/build-script/WebSharper.Fake.sh "$@"
4 changes: 1 addition & 3 deletions paket.dependencies
Expand Up @@ -24,9 +24,7 @@ group build
nuget Paket.Core 5.122.3

group wsbuild
github intellifactory/websharper tools/WebSharper.Fake.fsx
github intellifactory/websharper tools/WebSharper.Fake.cmd
github intellifactory/websharper tools/WebSharper.Fake.sh
git https://github.com/dotnet-websharper/build-script

group includes
references: strict
Expand Down
14 changes: 4 additions & 10 deletions paket.lock
Expand Up @@ -793,11 +793,7 @@ NUGET
FSharp.Core
Mono.Cecil (>= 0.10.0-beta6)
Newtonsoft.Json
GITHUB
remote: intellifactory/websharper
tools/WebSharper.Fake.cmd (48bbce051336ed491c365706e4d846de5ffce748)
tools/WebSharper.Fake.fsx (48bbce051336ed491c365706e4d846de5ffce748)
tools/WebSharper.Fake.sh (48bbce051336ed491c365706e4d846de5ffce748)

GROUP includes
REFERENCES: STRICT
NUGET
Expand Down Expand Up @@ -1275,8 +1271,6 @@ NUGET

GROUP wsbuild

GITHUB
remote: intellifactory/websharper
tools/WebSharper.Fake.cmd (54cd7d4fa305ad5004b1250449acc296d70a18a1)
tools/WebSharper.Fake.fsx (54cd7d4fa305ad5004b1250449acc296d70a18a1)
tools/WebSharper.Fake.sh (54cd7d4fa305ad5004b1250449acc296d70a18a1)
GIT
remote: https://github.com/dotnet-websharper/build-script
(0ffbf6a797788d426225eda88d461940cb95be1d)

0 comments on commit 022619e

Please sign in to comment.