From d7f7c8c56851318a097c4374016932f74fabbcac Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 10 Jan 2018 22:30:30 -0500 Subject: [PATCH] build script fixes --- src/Android/ci-build-apks.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Android/ci-build-apks.ps1 b/src/Android/ci-build-apks.ps1 index 92f2a211b..20464bfca 100644 --- a/src/Android/ci-build-apks.ps1 +++ b/src/Android/ci-build-apks.ps1 @@ -18,13 +18,13 @@ $xml.Save($androidManifest); echo "##### Decrypt Keystore" $encKeystorePath = $($rootPath + "\src\Android\8bit.keystore.enc"); -$secureFilePath = $($rootPath + "\secure-file\tools\secure-file"); +$secureFilePath = $($rootPath + "\secure-file\tools\secure-file.exe"); -Invoke-Expression "& `"$secureFilePath`" -decrypt $($encKeystorePath) -secret $($env:keystore_password)" +Invoke-Expression "& `"$secureFilePath`" -decrypt $($encKeystorePath) -secret $($env:keystore_dec_secret)" echo "##### Sign Release Configuration" -msbuild "Android.csproj" "/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)" +msbuild "/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)" "Android.csproj" echo "##### Copy Release apk to project root" @@ -78,7 +78,7 @@ Invoke-Expression "& `"$nugetPath`" restore" echo "##### Build and Sign FDroid Configuration" msbuild "Android.csproj" "/logger:C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" "/p:Configuration=FDroid" -msbuild "Android.csproj" "/t:SignAndroidPackage" "/p:Configuration=FDroid" "/p:AndroidKeyStore=true" "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:keystore_password)" "/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=$($env:keystore_password)" +msbuild "/t:SignAndroidPackage" "/p:Configuration=FDroid" "/p:AndroidKeyStore=true" "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:keystore_password)" "/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=$($env:keystore_password)" "Android.csproj" echo "##### Copy FDroid apk to project root"