From 1052951a96f82367d1d82bad166a2ee12f3cb950 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 1 Aug 2018 10:32:58 -0400
Subject: [PATCH] restore on build. remove ps1 build scripts

---
 build.ps1                  | 15 ---------------
 src/Admin/build.ps1        | 17 -----------------
 src/Admin/build.sh         |  2 ++
 src/Api/build.ps1          | 16 ----------------
 src/Api/build.sh           |  3 +++
 src/Icons/build.ps1        | 14 --------------
 src/Icons/build.sh         |  2 ++
 src/Identity/build.ps1     | 14 --------------
 src/Identity/build.sh      |  2 ++
 util/Attachments/build.ps1 |  7 -------
 util/MsSql/build.ps1       |  7 -------
 util/Nginx/build.ps1       |  7 -------
 util/Server/build.ps1      | 14 --------------
 util/Server/build.sh       |  2 ++
 util/Setup/build.ps1       | 14 --------------
 util/Setup/build.sh        |  2 ++
 16 files changed, 13 insertions(+), 125 deletions(-)
 delete mode 100644 build.ps1
 delete mode 100644 src/Admin/build.ps1
 delete mode 100644 src/Api/build.ps1
 delete mode 100644 src/Icons/build.ps1
 delete mode 100644 src/Identity/build.ps1
 delete mode 100644 util/Attachments/build.ps1
 delete mode 100644 util/MsSql/build.ps1
 delete mode 100644 util/Nginx/build.ps1
 delete mode 100644 util/Server/build.ps1
 delete mode 100644 util/Setup/build.ps1

diff --git a/build.ps1 b/build.ps1
deleted file mode 100644
index b5c6a018b3..0000000000
--- a/build.ps1
+++ /dev/null
@@ -1,15 +0,0 @@
-$dir = Split-Path -Parent $MyInvocation.MyCommand.Path
-echo $dir
-
-echo "`nBuilding Bitwarden"
-echo "=================="
-
-& $dir\src\Api\build.ps1
-& $dir\src\Identity\build.ps1
-& $dir\util\Server\build.ps1
-& $dir\util\Nginx\build.ps1
-& $dir\util\Attachments\build.ps1
-& $dir\src\Icons\build.ps1
-& $dir\src\Admin\build.ps1
-& $dir\util\MsSql\build.ps1
-& $dir\util\Setup\build.ps1
diff --git a/src/Admin/build.ps1 b/src/Admin/build.ps1
deleted file mode 100644
index 79b6c1cd0f..0000000000
--- a/src/Admin/build.ps1
+++ /dev/null
@@ -1,17 +0,0 @@
-$dir = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-echo "`n## Building Admin"
-
-echo "`nBuilding app"
-echo ".NET Core version $(dotnet --version)"
-echo "Clean"
-dotnet clean $dir\Admin.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
-echo "Node Build"
-npm --prefix $dir install $dir
-gulp --gulpfile $dir\gulpfile.js build
-echo "Publish"
-dotnet publish $dir\Admin.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
-
-echo "`nBuilding docker image"
-docker --version
-docker build -t bitwarden/admin $dir\.
diff --git a/src/Admin/build.sh b/src/Admin/build.sh
index e9c2a14d44..34517535bd 100755
--- a/src/Admin/build.sh
+++ b/src/Admin/build.sh
@@ -7,6 +7,8 @@ echo -e "\n## Building Admin"
 
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
+echo "Restore"
+dotnet restore $DIR/Admin.csproj
 echo "Clean"
 dotnet clean $DIR/Admin.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
 echo "Node Build"
diff --git a/src/Api/build.ps1 b/src/Api/build.ps1
deleted file mode 100644
index 9d49c33c10..0000000000
--- a/src/Api/build.ps1
+++ /dev/null
@@ -1,16 +0,0 @@
-$dir = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-echo "`n## Building API"
-
-echo "`nBuilding app"
-echo ".NET Core version $(dotnet --version)"
-echo "Clean"
-dotnet clean $dir\Api.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish\Api
-dotnet clean $dir\..\Jobs\Jobs.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish\Jobs
-echo "Publish"
-dotnet publish $dir\Api.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish\Api
-dotnet publish $dir\..\Jobs\Jobs.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish\Jobs
-
-echo "`nBuilding docker image"
-docker --version
-docker build -t bitwarden/api $dir\.
diff --git a/src/Api/build.sh b/src/Api/build.sh
index da3b5bec99..2192077b0d 100755
--- a/src/Api/build.sh
+++ b/src/Api/build.sh
@@ -7,6 +7,9 @@ echo -e "\n## Building API"
 
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
+echo "Restore"
+dotnet restore $DIR/Api.csproj
+dotnet restore $DIR/../Jobs/Jobs.csproj
 echo "Clean"
 dotnet clean $DIR/Api.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish/Api
 dotnet clean $DIR/../Jobs/Jobs.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish/Jobs
diff --git a/src/Icons/build.ps1 b/src/Icons/build.ps1
deleted file mode 100644
index bd70bb4822..0000000000
--- a/src/Icons/build.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-$dir = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-echo "`n## Building Icons"
-
-echo "`nBuilding app"
-echo ".NET Core version $(dotnet --version)"
-echo "Clean"
-dotnet clean $dir\Icons.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
-echo "Publish"
-dotnet publish $dir\Icons.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
-
-echo "`nBuilding docker image"
-docker --version
-docker build -t bitwarden/icons $dir\.
diff --git a/src/Icons/build.sh b/src/Icons/build.sh
index 883957a71e..c27342f63c 100755
--- a/src/Icons/build.sh
+++ b/src/Icons/build.sh
@@ -7,6 +7,8 @@ echo -e "\n## Building Icons"
 
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
+echo "Restore"
+dotnet restore $DIR/Icons.csproj
 echo "Clean"
 dotnet clean $DIR/Icons.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
 echo "Publish"
diff --git a/src/Identity/build.ps1 b/src/Identity/build.ps1
deleted file mode 100644
index 811b001636..0000000000
--- a/src/Identity/build.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-$dir = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-echo "`n## Building Identity"
-
-echo "`nBuilding app"
-echo ".NET Core version $(dotnet --version)"
-echo "Clean"
-dotnet clean $dir\Identity.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
-echo "Publish"
-dotnet publish $dir\Identity.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
-
-echo "`nBuilding docker image"
-docker --version
-docker build -t bitwarden/identity $dir\.
diff --git a/src/Identity/build.sh b/src/Identity/build.sh
index 522404f2ed..0f7f84b833 100755
--- a/src/Identity/build.sh
+++ b/src/Identity/build.sh
@@ -7,6 +7,8 @@ echo -e "\n## Building Identity"
 
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
+echo "Restore"
+dotnet restore $DIR/Identity.csproj
 echo "Clean"
 dotnet clean $DIR/Identity.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
 echo "Publish"
diff --git a/util/Attachments/build.ps1 b/util/Attachments/build.ps1
deleted file mode 100644
index 78c53a6dfb..0000000000
--- a/util/Attachments/build.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-$dir = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-echo "`n## Building Attachments"
-
-echo "`nBuilding docker image"
-docker --version
-docker build -t bitwarden/attachments $dir\.
diff --git a/util/MsSql/build.ps1 b/util/MsSql/build.ps1
deleted file mode 100644
index 938259ad2c..0000000000
--- a/util/MsSql/build.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-$dir = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-echo "`n## Building MsSql"
-
-echo "`nBuilding docker image"
-docker --version
-docker build -t bitwarden/mssql $dir\.
diff --git a/util/Nginx/build.ps1 b/util/Nginx/build.ps1
deleted file mode 100644
index 25dddc0c03..0000000000
--- a/util/Nginx/build.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-$dir = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-echo "`n## Building Nginx"
-
-echo "`nBuilding docker image"
-docker --version
-docker build -t bitwarden/nginx $dir\.
diff --git a/util/Server/build.ps1 b/util/Server/build.ps1
deleted file mode 100644
index 43ea3680c4..0000000000
--- a/util/Server/build.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-$dir = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-echo "`n## Building Server"
-
-echo "`nBuilding app"
-echo ".NET Core version $(dotnet --version)"
-echo "Clean"
-dotnet clean $dir\Server.csproj -c "Release" -o $dir\obj\Docker\publish
-echo "Publish"
-dotnet publish $dir\Server.csproj -c "Release" -o $dir\obj\Docker\publish
-
-echo "`nBuilding docker image"
-docker --version
-docker build -t bitwarden/server $dir\.
diff --git a/util/Server/build.sh b/util/Server/build.sh
index 1568baef0e..deadb87f7e 100755
--- a/util/Server/build.sh
+++ b/util/Server/build.sh
@@ -7,6 +7,8 @@ echo -e "\n## Building Server"
 
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
+echo "Restore"
+dotnet restore $DIR/Server.csproj
 echo "Clean"
 dotnet clean $DIR/Server.csproj -c "Release" -o $DIR/obj/Docker/publish
 echo "Publish"
diff --git a/util/Setup/build.ps1 b/util/Setup/build.ps1
deleted file mode 100644
index 1b1cc08422..0000000000
--- a/util/Setup/build.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-$dir = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-echo "`n## Building Setup"
-
-echo "`nBuilding app"
-echo ".NET Core version $(dotnet --version)"
-echo "Clean"
-dotnet clean $dir\Setup.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
-echo "Publish"
-dotnet publish $dir\Setup.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
-
-echo "`nBuilding docker image"
-docker --version
-docker build -t bitwarden/setup $dir\.
diff --git a/util/Setup/build.sh b/util/Setup/build.sh
index 782f393459..ab1b6af864 100755
--- a/util/Setup/build.sh
+++ b/util/Setup/build.sh
@@ -7,6 +7,8 @@ echo -e "\n## Building Setup"
 
 echo -e "\nBuilding app"
 echo ".NET Core version $(dotnet --version)"
+echo "Restore"
+dotnet restore $DIR/Setup.csproj
 echo "Clean"
 dotnet clean $DIR/Setup.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
 echo "Publish"