From 887da1d5f493ad03a354c884270a7cf49c338d3b Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 9 May 2020 21:00:01 +0200
Subject: [PATCH] Update to the new Tizen (#1280)

- Version 3.7
- Java is included in the SDK installer
- Windows is now working again
---
 scripts/azure-pipelines.yml              | 4 +---
 scripts/azure-templates-bootstrapper.yml | 2 --
 scripts/install-tizen.ps1                | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 8c5de4af..fc5d63a0 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -90,7 +90,6 @@ stages:
           displayName: Build Native Tizen (Windows)
           vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-tizen
-          condition: false # TODO: TIZEN INSTALL BUGS
       - template: azure-templates-bootstrapper.yml # Build ANGLE UWP|x86 (Windows)
         parameters:
           name: native_uwp_angle_x86_windows
@@ -274,8 +273,7 @@ stages:
             - native_android_x64_windows
             - native_android_arm_windows
             - native_android_arm64_windows
-            # - native_tizen_windows
-            - native_tizen_linux
+            - native_tizen_windows
             - native_uwp_angle_x86_windows
             - native_uwp_angle_x64_windows
             - native_uwp_angle_arm_windows
diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml
index a27747f7..8c2f98d6 100644
--- a/scripts/azure-templates-bootstrapper.yml
+++ b/scripts/azure-templates-bootstrapper.yml
@@ -82,8 +82,6 @@ jobs:
               displayName: Install the Android NDK
           # install tizen
           - ${{ if contains(parameters.name, '_tizen_') }}:
-            - pwsh: .\scripts\install-openjdk.ps1
-              displayName: Install the OpenJDK
             - pwsh: .\scripts\install-tizen.ps1
               displayName: Install the Tizen SDK
           # install llvm
diff --git a/scripts/install-tizen.ps1 b/scripts/install-tizen.ps1
index 730e0914..379944a5 100644
--- a/scripts/install-tizen.ps1
+++ b/scripts/install-tizen.ps1
@@ -3,7 +3,7 @@
 #  - https://developercommunity.visualstudio.com/content/problem/661596/the-updated-path-doesnt-kick-in.html
 
 Param(
-    [string] $Version = "3.6",
+    [string] $Version = "3.7",
     [string] $InstallDestination = $null
 )