From 3be53235a532dca7ef88e3e35a9b18881d67d61d Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 10 Jun 2019 14:50:26 -0400
Subject: [PATCH] build whole solution

---
 appveyor.yml                  | 6 +++++-
 src/Android/ci-build-apks.ps1 | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 170106746..433606043 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -87,6 +87,9 @@ build_script:
     cd $APPVEYOR_BUILD_FOLDER
 - ps: |
     if($isWindows -and $env:KEYSTORE_DEC_SECRET) {
+      msbuild bitwarden-mobile.sln `
+        "/logger:C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" `
+        "/p:Configuration=Release"
       .\src\Android\ci-build-apks.ps1
       Push-AppveyorArtifact .\com.x8bit.bitwarden.apk
       Push-AppveyorArtifact .\com.x8bit.bitwarden-fdroid.apk
@@ -104,7 +107,8 @@ on_success:
       cd store\google\Publisher\bin\Release\netcoreapp2.0
       dotnet Publisher.dll `
         $env:APPVEYOR_BUILD_FOLDER\store\google\Publisher\play_creds.json `
-        $env:APPVEYOR_BUILD_FOLDER\com.x8bit.bitwarden.apk alpha
+        $env:APPVEYOR_BUILD_FOLDER\com.x8bit.bitwarden.apk `
+        alpha
       cd $env:APPVEYOR_BUILD_FOLDER
     }
 
diff --git a/src/Android/ci-build-apks.ps1 b/src/Android/ci-build-apks.ps1
index 6decbad62..cff95c22a 100644
--- a/src/Android/ci-build-apks.ps1
+++ b/src/Android/ci-build-apks.ps1
@@ -22,9 +22,8 @@ $secureFilePath = $($rootPath + "\secure-file\tools\secure-file.exe");
 
 Invoke-Expression "& `"$secureFilePath`" -decrypt $($encKeystorePath) -secret $($env:keystore_dec_secret)"
 
-echo "##### Build and Sign Release Configuration"
+echo "##### Sign Release Configuration"
 
-msbuild "$($androidPath)" "/logger:C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" "/p:Configuration=Release"
 msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:keystore_password)" "/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=$($env:keystore_password)" "/v:quiet"
 
 echo "##### Copy Release apk to project root"