From cf03f192f0603aabe90a7e9b2212f3615d9feb26 Mon Sep 17 00:00:00 2001
From: Carl Mathieu <carlh.mathieu@gmail.com>
Date: Fri, 17 Nov 2023 10:53:40 -0500
Subject: [PATCH 1/2] fix: fix canary merge by using variables yml

---
 build/canary-merge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/canary-merge.yml b/build/canary-merge.yml
index c72b8d04..29f37bc3 100644
--- a/build/canary-merge.yml
+++ b/build/canary-merge.yml
@@ -15,7 +15,7 @@ pool:
   vmImage: $(windowsHostedAgentImage)
 
 variables:
- SolutionFileName: ApplicationTemplate.sln
+- template: variables.yml
 
 steps:
 - checkout: self
@@ -31,7 +31,7 @@ steps:
   env:
     SYSTEM_ACCESSTOKEN: $(System.AccessToken)
   inputs:
-    solution: '$(Build.SourcesDirectory)/src/$(SolutionFileName)'
+    solution: '$(Build.SourcesDirectory)/src/$(SolutionName).sln'
     usePrivateFeed: false
     useNuGetOrg: true
     mergeBranch: true

From 6a9a93384d8be8a6516cb6650302e40c2d7d3473 Mon Sep 17 00:00:00 2001
From: Carl Mathieu <carlh.mathieu@gmail.com>
Date: Fri, 17 Nov 2023 13:24:04 -0500
Subject: [PATCH 2/2] fix: install missing java sdk

---
 build/steps-build-android.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build/steps-build-android.yml b/build/steps-build-android.yml
index f036a167..4891cf38 100644
--- a/build/steps-build-android.yml
+++ b/build/steps-build-android.yml
@@ -44,6 +44,13 @@ steps:
     versionName: $(MajorMinorPatch)
     printFile: true
 
+- task: JavaToolInstaller@0
+  displayName: "Install Java SDK 11"
+  inputs:
+    versionSpec: '11'
+    jdkArchitectureOption: 'x64'
+    jdkSourceOption: 'PreInstalled'
+
 - script: >
     dotnet $(dotNetCommand) ${{ parameters.pathToSrc }}/app/${{ parameters.solutionName }}.Mobile
     -f:$(BuildTargetFramework)