From 82491f81f3584040437ce34ed56ffd8c1fbd5cf2 Mon Sep 17 00:00:00 2001
From: trwalke <trwalke@microsoft.com>
Date: Wed, 8 Jun 2022 17:45:31 -0700
Subject: [PATCH] Test Updates

---
 build/template-build-android-automation.yaml                  | 2 +-
 build/template-build-ios-automation.yaml                      | 4 ++--
 .../XamarinDev/XamarinDev.Android/XamarinDev.Android.csproj   | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/template-build-android-automation.yaml b/build/template-build-android-automation.yaml
index a142ec20a1..51ada69fea 100644
--- a/build/template-build-android-automation.yaml
+++ b/build/template-build-android-automation.yaml
@@ -24,7 +24,7 @@ steps:
     solution: 'LibsAndSamples.sln'
     msbuildArgs: '/t:restore'
     platform: 'any cpu'
-    configuration: 'debug'
+    configuration: 'release'
 
 - task: MSBuild@1
   displayName: 'Build and Sign MSAL Android apk'
diff --git a/build/template-build-ios-automation.yaml b/build/template-build-ios-automation.yaml
index 3b5e84c855..10bd3d7ca4 100644
--- a/build/template-build-ios-automation.yaml
+++ b/build/template-build-ios-automation.yaml
@@ -25,7 +25,7 @@ steps:
   displayName: 'Build Xamarin.iOS solution LibsMacOS.sln'
   inputs:
     solutionFile: LibsMacOS.sln
-    configuration: Debug
+    configuration: Release
     clean: true
     runNugetRestore: false
     args: '/p:APPCENTER_BUILD=1 /p:RunCodeAnalysis=false'
@@ -37,7 +37,7 @@ steps:
 - task: CopyFiles@2
   displayName: 'Copy ipa to staging directory'
   inputs:
-    SourceFolder: tests/devapps/XForms/XForms.iOS/bin/iPhone/Debug
+    SourceFolder: tests/devapps/XForms/XForms.iOS/bin/iPhone/Release
     Contents: '**/*.ipa'
     TargetFolder: '$(Build.ArtifactStagingDirectory)'
     CleanTargetFolder: true
diff --git a/tests/devapps/XamarinDev/XamarinDev.Android/XamarinDev.Android.csproj b/tests/devapps/XamarinDev/XamarinDev.Android/XamarinDev.Android.csproj
index a2d4dabf4a..9f85ff2dea 100644
--- a/tests/devapps/XamarinDev/XamarinDev.Android/XamarinDev.Android.csproj
+++ b/tests/devapps/XamarinDev/XamarinDev.Android/XamarinDev.Android.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -32,6 +32,7 @@
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>Full</AndroidLinkMode>
     <MandroidI18n />
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,6 +43,7 @@
     <WarningLevel>4</WarningLevel>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />