From b6d123b37a4c7b77a20c89c7ee4ae4fa13aca18f Mon Sep 17 00:00:00 2001
From: Morten Nielsen <1378165+dotMorten@users.noreply.github.com>
Date: Fri, 23 Aug 2019 13:02:12 -0700
Subject: [PATCH 1/2] Update azure-pipelines.yml

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ce103f0..d42b533 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -27,7 +27,7 @@ steps:
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
     msbuildArchitecture: 'x64'
-    msbuildArguments: '/p:JavaSdkDirectory="$(JAVA_HOME_8_X64)"'
+    msbuildArguments: '/p:JavaSdkDirectory=C:\Program Files\Android\jdk\microsoft_dist_openjdk_1.8.0.25'
 
 - task: VSTest@2
   inputs:
@@ -37,4 +37,4 @@ steps:
 - task: PublishPipelineArtifact@0
   inputs:
     artifactName: 'nuget'
-    targetPath: 'src\Bin\Release\'
\ No newline at end of file
+    targetPath: 'src\Bin\Release\'

From f24528ca244a89eb232e560f32a0693079b139a4 Mon Sep 17 00:00:00 2001
From: Morten Nielsen <1378165+dotMorten@users.noreply.github.com>
Date: Wed, 2 Oct 2019 13:05:47 -0700
Subject: [PATCH 2/2] Update VM

---
 azure-pipelines.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d42b533..8de345b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,7 +7,7 @@ trigger:
 - master
 
 pool:
-  vmImage: 'VS2017-Win2016'
+  vmImage: 'windows-latest'
 
 variables:
   solution: '**/*.sln'
@@ -26,8 +26,6 @@ steps:
     solution: '$(solution)'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
-    msbuildArchitecture: 'x64'
-    msbuildArguments: '/p:JavaSdkDirectory=C:\Program Files\Android\jdk\microsoft_dist_openjdk_1.8.0.25'
 
 - task: VSTest@2
   inputs: