From 131be14d587db9d206a02b3866f1afc029b3bcd1 Mon Sep 17 00:00:00 2001
From: Nikolai Laevskii <nikolai.laevskii@akvelon.com>
Date: Mon, 4 Sep 2023 03:47:21 +0200
Subject: [PATCH] Update e2e tests

---
 .github/workflows/test-dotnet.yml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-dotnet.yml b/.github/workflows/test-dotnet.yml
index c031904..320876a 100644
--- a/.github/workflows/test-dotnet.yml
+++ b/.github/workflows/test-dotnet.yml
@@ -26,33 +26,42 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest, windows-latest, macOS-latest]
-        dotnet-version: ['2.1', '2.2', '3.0', '3.1', '5.0', '6.0', '7.0', '8.0']
+        dotnet-version: [
+          ['2.1', '2.x'],
+          ['2.2', '2.x'],
+          ['3.0', '3.x'],
+          ['3.1', '3.x'],
+          ['5.0','5.x'],
+          ['6.0', '6.x'],
+          ['7.0', '7.x'], 
+          ['8.0', '8.x']
+        ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Clear toolcache
         shell: pwsh
         run: __tests__/clear-toolcache.ps1 ${{ runner.os }}
-      - name: Setup dotnet ${{ matrix.dotnet-version }}
+      - name: Setup dotnet ${{ matrix.dotnet-version[0] }}
         uses: ./
         with:
-          dotnet-version: ${{ matrix.dotnet-version }}
+          dotnet-version: ${{ matrix.dotnet-version[0] }}
       - name: Verify installed version
         shell: pwsh
         run: |
-          __tests__/verify-dotnet.ps1 -Patterns "^${{ matrix.dotnet-version }}"
+          __tests__/verify-dotnet.ps1 -Patterns "^${{ matrix.dotnet-version[0] }}"
       - name: List installed versions
         shell: pwsh
         run: dotnet --list-sdks
       - name: Run setup again with prefer installed option
         uses: ./
         with:
-          dotnet-version: ${{ matrix.dotnet-version }}
+          dotnet-version: ${{ matrix.dotnet-version[1] }}
           prefer-installed: true
       - name: Verify installed version
         shell: pwsh
         run: |
-          __tests__/verify-dotnet.ps1 -Patterns "^${{ matrix.dotnet-version }}"
+          __tests__/verify-dotnet.ps1 -Patterns "^${{ matrix.dotnet-version[0] }}"
       - name: List installed versions
         shell: pwsh
         run: dotnet --list-sdks