From ee4eda5e9971d5817292647b95c0e4a0b96f48cf Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Fri, 24 Sep 2021 11:05:25 +0300
Subject: [PATCH] [Windows] Add Adoptium (Temurin-Hotspot) jdk 17 LTS (#4129)

---
 images/win/scripts/Tests/Java.Tests.ps1 | 10 ++++++----
 images/win/toolsets/toolset-2016.json   |  2 +-
 images/win/toolsets/toolset-2019.json   |  2 +-
 images/win/toolsets/toolset-2022.json   |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/images/win/scripts/Tests/Java.Tests.ps1 b/images/win/scripts/Tests/Java.Tests.ps1
index 62a851d03..85c40a8b6 100644
--- a/images/win/scripts/Tests/Java.Tests.ps1
+++ b/images/win/scripts/Tests/Java.Tests.ps1
@@ -36,18 +36,20 @@ Describe "Java" {
         if ($Version -eq 8) {
             $Version = "1.${Version}"
         }
-        $result.Output[0] | Should -Match ([regex]::Escape("openjdk version `"${Version}."))
+        $outputPattern = "openjdk version `"${Version}"
+        $result.Output[0] | Should -Match $outputPattern
     }
 
     It "Java Adopt Jdk <Version>" -TestCases $adoptJdkVersions {
         $adoptPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\bin\java"
-    
+
         $result = Get-CommandResult "`"$adoptPath`" -version"
         $result.ExitCode | Should -Be 0
-    
+
         if ($Version -eq 8) {
             $Version = "1.${Version}"
         }
-        $result.Output[0] | Should -Match ([regex]::Escape("openjdk version `"${Version}."))
+        $outputPattern = "openjdk version `"${Version}"
+        $result.Output[0] | Should -Match $outputPattern
     }
 }
diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json
index e1f58c021..40d8b2d3b 100644
--- a/images/win/toolsets/toolset-2016.json
+++ b/images/win/toolsets/toolset-2016.json
@@ -146,7 +146,7 @@
         "vendors": [
             {
                 "name": "Temurin-Hotspot",
-                "versions": [ "8", "11" ]
+                "versions": [ "8", "11", "17" ]
             },
             {
                 "name": "Adopt",
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index 415391440..4383cfc7b 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -146,7 +146,7 @@
         "vendors": [
             {
                 "name": "Temurin-Hotspot",
-                "versions": [ "8", "11" ]
+                "versions": [ "8", "11", "17" ]
             },
             {
                 "name": "Adopt",
diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
index ecf23ab21..de88621f1 100644
--- a/images/win/toolsets/toolset-2022.json
+++ b/images/win/toolsets/toolset-2022.json
@@ -110,7 +110,7 @@
         "vendors": [
             {
                 "name": "Temurin-Hotspot",
-                "versions": [ "8", "11" ]
+                "versions": [ "8", "11", "17" ]
             },
             {
                 "name": "Adopt",