From 660f890fe2d6803dbebf33e2681d85410507279e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jerome.laban@nventive.com>
Date: Wed, 1 Apr 2020 21:11:57 -0400
Subject: [PATCH] ci: Add validation for more macOS and netcore versions

---
 azure-pipelines.yml | 57 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 72220e5..a16f338 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,4 +1,4 @@
-trigger:
+trigger:
 - master
 - rel/*
 
@@ -59,6 +59,17 @@ jobs:
   pool:
     vmImage: windows-2019
 
+  strategy:
+    matrix:
+      NETCORE_LATEST:
+        BUILD_NETCORE_VERSION: ''
+      NETCORE_2_2:
+        BUILD_NETCORE_VERSION: '2.2.x'
+      NETCORE_3_0:
+        BUILD_NETCORE_VERSION: '3.0.x'
+      NETCORE_3_1:
+        BUILD_NETCORE_VERSION: '3.1.x'
+
   variables:
     BuildConfiguration: Release
     TMPDIR: $(Build.ArtifactStagingDirectory)
@@ -66,6 +77,14 @@ jobs:
     PackageVersion: 42.42.42
 
   steps:
+
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      packageType: sdk
+      version: $(BUILD_NETCORE_VERSION)
+      installationPath: $(Agent.ToolsDirectory)/dotnet
+
   - powershell: |
       mkdir $(Build.ArtifactStagingDirectory)\Packages -Force
     displayName: Create packages temp folder
@@ -94,10 +113,19 @@ jobs:
     displayName: MSBuild Test Projects 2
 
 - job: Linux
-  container: nventive/wasm-build:1.4.1
+  container: unoplatform/wasm-build:2.0
   pool:
     vmImage: 'ubuntu-latest'
 
+  strategy:
+    matrix:
+      NETCORE_2_2:
+        BUILD_NETCORE_VERSION: '2.2.x'
+      NETCORE_3_0:
+        BUILD_NETCORE_VERSION: '3.0.x'
+      NETCORE_3_1:
+        BUILD_NETCORE_VERSION: '3.1.x'
+
   variables:
     BuildConfiguration: Release
     TMPDIR: /tmp
@@ -105,6 +133,14 @@ jobs:
     PackageVersion: 42.42.42
 
   steps:
+
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      packageType: sdk
+      version: $(BUILD_NETCORE_VERSION)
+      installationPath: $(Agent.ToolsDirectory)/dotnet
+
   - script: |
       mkdir $TMPDIR/Packages
     displayName: Create packages temp folder
@@ -133,13 +169,27 @@ jobs:
 
   strategy:
     matrix:
+      Xamarin_Latest:
+        PoolImage: macOS-latest
+
+      Xamarin_6_6_0:
+        XamarinVersion: 6_6_0
+        PoolImage: macOS-10.15
+
+      Xamarin_6_4_0:
+        XamarinVersion: 6_4_0
+        PoolImage: macOS-10.15
+
       Xamarin_5_16_0:
         XamarinVersion: 5_16_0
+        PoolImage: macOS-10.14
+
       Xamarin_5_12_0:
         XamarinVersion: 5_12_0
+        PoolImage: macOS-10.14
 
   pool:
-    vmImage: 'macOS-latest'
+    vmImage: $(PoolImage)
 
   variables:
     BuildConfiguration: Release
@@ -151,6 +201,7 @@ jobs:
 
   - bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(XamarinVersion)"
     displayName: Select Xamarin Version
+    condition: and(succeeded(), neq(variables['XamarinVersion'], ''))
 
   - script: |
       mkdir $TMPDIR/Packages