From c7f3cd6c9fde01ecdb9cdaa4ba1c05b700f4836a Mon Sep 17 00:00:00 2001
From: Michael Gordeev <michael.xfox@outlook.com>
Date: Fri, 31 Jan 2020 21:01:57 +0300
Subject: [PATCH] Update azure-pipelines.yml for Azure Pipelines

Reconfigured pipeline to deliver both .apk and .aab archives
---
 azure-pipelines.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d70d1ca..72fd465 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -27,7 +27,7 @@ steps:
     failBuildOnCodeIssues: false
 
 - task: XamarinAndroid@1
-  displayName: 'Build Solution'
+  displayName: 'Build Solution (AppBundle)'
   inputs:
     projectFile: '**/**.csproj'
     outputDirectory: '$(outputDirectory)'
@@ -37,6 +37,17 @@ steps:
     msbuildArguments: ' /t:PackageForAndroid -t:SignAndroidPackage -p:AndroidPackageFormat=aab /p:Configuration=Release'
     jdkOption: 'JDKVersion'
 
+- task: XamarinAndroid@1
+  displayName: 'Build Solution (APK)'
+  inputs:
+    projectFile: '**/**.csproj'
+    outputDirectory: '$(outputDirectory)'
+    configuration: 'Release (APK)'
+    msbuildVersionOption: 'latest'
+    msbuildArchitectureOption: 'x64'
+    msbuildArguments: ' /t:PackageForAndroid -t:SignAndroidPackage -p:AndroidPackageFormat=apk /p:Configuration="Release (APK)"'
+    jdkOption: 'JDKVersion'
+
 - task: DeleteFiles@1
   displayName: 'Delete debug files'
   inputs:
@@ -56,7 +67,7 @@ steps:
   displayName: 'Update package name'
   inputs:
     targetType: 'inline'
-    script: 'get-childitem *-Signed.aab | foreach { rename-item $_ $_.Name.Replace("-Signed", "") }'
+    script: 'get-childitem *-Signed.* | foreach { rename-item $_ $_.Name.Replace("-Signed", "") }'
     workingDirectory: '$(outputDirectory)'
 
 - task: PublishBuildArtifacts@1