From adaa9700d761376b924470db334470b966db7b72 Mon Sep 17 00:00:00 2001
From: Maksim Shilov <maksim.shilov@akvelon.com>
Date: Wed, 8 Dec 2021 13:36:39 +0300
Subject: [PATCH] Resolving comments

---
 .github/workflows/get-tools-new-versions.yml       | 14 ++++++++------
 .../verify-common-tool-parser.psm1                 |  8 ++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/get-tools-new-versions.yml b/.github/workflows/get-tools-new-versions.yml
index eb48498..aeaaf74 100644
--- a/.github/workflows/get-tools-new-versions.yml
+++ b/.github/workflows/get-tools-new-versions.yml
@@ -40,16 +40,18 @@ jobs:
             filter-parameter: 'version'
             filter-arch: 'x64'
     name: 'Searching for new versions of ${{ matrix.tool.name }}'
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - id: get-new-tool-versions
         name: Get new tool versions
-        run: echo "::set-output name=versions-output::$(./get-new-tool-versions/verify-new-tool-version-added-to-image.ps1 `
-          -ToolName ${{ matrix.tool.name }} `
-          -ReleasesUrl ${{ matrix.tool.releases-url }} `
-          -FilterParameter ${{ matrix.tool.filter-parameter }} `
-          -FilterArch ${{ matrix.tool.filter-arch }})"
+        run: | 
+          $versionsOutput = ./get-new-tool-versions/verify-new-tool-version-added-to-image.ps1 `
+            -ToolName ${{ matrix.tool.name }} `
+            -ReleasesUrl ${{ matrix.tool.releases-url }} `
+            -FilterParameter ${{ matrix.tool.filter-parameter }} `
+            -FilterArch ${{ matrix.tool.filter-arch }}
+          echo "::set-output name=versions-output::$versionsOutput"
       - name: Check versions
         if: steps.get-new-tool-versions.outputs.versions-output == ''
         run: Write-Host "No new versions found"
diff --git a/get-new-tool-versions/parsers/verify-added-to-image/verify-common-tool-parser.psm1 b/get-new-tool-versions/parsers/verify-added-to-image/verify-common-tool-parser.psm1
index 6eedab8..698e611 100644
--- a/get-new-tool-versions/parsers/verify-added-to-image/verify-common-tool-parser.psm1
+++ b/get-new-tool-versions/parsers/verify-added-to-image/verify-common-tool-parser.psm1
@@ -15,11 +15,11 @@ function Search-ToolsVersionsNotOnImage {
             Select-Object -Unique
     }
     $toolsetUrl = "https://raw.githubusercontent.com/actions/virtual-environments/main/images/win/toolsets/toolset-2022.json"
-    $latestVersion = ((Invoke-RestMethod $toolsetUrl).toolcache |
-        Where-Object {$_.name -eq $ToolName -and $_.arch -eq $FilterArch}).versions |
+    $latestMinorVersion = (Invoke-RestMethod $toolsetUrl).toolcache |
+        Where-Object {$_.name -eq $ToolName -and $_.arch -eq $FilterArch} | 
+        ForEach-Object {$_.versions.Replace("*","0")} |
         Select-Object -Last 1
-    $latestMinorVesion = $latestVersion.Replace("*","0")
-    $versionsToAdd = $stableReleaseVersions | Where-Object {[version]$_ -gt [version]$latestMinorVesion}
+    $versionsToAdd = $stableReleaseVersions | Where-Object {[version]$_ -gt [version]$latestMinorVersion}
     
     return $versionsToAdd
 }
\ No newline at end of file