From 35fa32c090b84ebb4d621ce5accb55c09ac9e596 Mon Sep 17 00:00:00 2001 From: "tom.pallister" Date: Fri, 14 Oct 2016 08:26:51 +0100 Subject: [PATCH] updated build scripts --- build-and-run-tests.bat | 2 ++ build.bat | 13 +------------ run-tests.bat | 8 ++++++-- 3 files changed, 9 insertions(+), 14 deletions(-) create mode 100644 build-and-run-tests.bat diff --git a/build-and-run-tests.bat b/build-and-run-tests.bat new file mode 100644 index 00000000..764682b6 --- /dev/null +++ b/build-and-run-tests.bat @@ -0,0 +1,2 @@ +./run-tests.bat +./build.bat \ No newline at end of file diff --git a/build.bat b/build.bat index 4b064953..6c89e8e6 100644 --- a/build.bat +++ b/build.bat @@ -1,22 +1,11 @@ echo ------------------------- -echo Running Ocelot.UnitTests - -dotnet restore test/Ocelot.UnitTests/ -dotnet test test/Ocelot.UnitTests/ - -echo Running Ocelot.AcceptanceTests - -cd test/Ocelot.AcceptanceTests/ -dotnet restore -dotnet test -cd ../../ - echo Building Ocelot dotnet restore src/Ocelot dotnet restore src/Ocelot.Library dotnet build src/Ocelot +dotnet pack src/Ocelot/project.json --no-build --output nupkgs dotnet publish src/Ocelot -o site/wwwroot diff --git a/run-tests.bat b/run-tests.bat index f25a9cbf..853ea538 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,12 +1,16 @@ echo ------------------------- -echo Running Ocelot.UnitTests +echo Restoring Ocelot +dotnet restore src/Ocelot +echo Restoring Ocelot +dotnet restore src/Ocelot.Library + +echo Running Ocelot.UnitTests dotnet restore test/Ocelot.UnitTests/ dotnet test test/Ocelot.UnitTests/ echo Running Ocelot.AcceptanceTests - cd test/Ocelot.AcceptanceTests/ dotnet restore dotnet test