Saner OS check

Author: Cyberboss

action.yml

@@ -23,40 +23,47 @@ runs:
 # https://github.com/microsoft/winget-cli/issues/700#issuecomment-874084714
   using: composite
   steps:
-    - name: Check runner OS
+    - name: Check runner OS is Windows
       if: runner.os != 'Windows'
       shell: bash
       run: |
         echo "[ERROR] This action only runs on Windows runner, Current runner: ${{ runner.os }}"
         exit 1
 
+    - name: Check OS Version
+      shell: powershell
+      id: os_check
+      run: |
+        $version = (Get-WmiObject Win32_OperatingSystem).Caption
+        echo "version=$version" >> $GITHUB_OUTPUT
+
     - name: Windows Server 2025 Simple Setup
-      if: runner.name == 'windows-2025'
+      if: steps.os_check.outputs.version != 'Microsoft Windows Server 2022 Datacenter'
       shell: powershell
       run: winget upgrade winget --accept-package-agreements --accept-source-agreements --disable-interactivity
 
     - name: Download Microsoft.UI.Xaml v2.8.6
-      if: runner.name != 'windows-2025'
+      if: steps.os_check.outputs.version == 'Microsoft Windows Server 2022 Datacenter'
       shell: powershell
       run: |
         $ProgressPreference = 'SilentlyContinue'
         Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.UI.Xaml/2.8.6 -OutFile .\microsoft.ui.xaml.2.8.6.zip
 
     - name: Unzip Microsoft.UI.Xaml v2.8.6
-      if: runner.name != 'windows-2025'
+      if: steps.os_check.outputs.version == 'Microsoft Windows Server 2022 Datacenter'
       shell: powershell
       run: |
         Expand-Archive .\microsoft.ui.xaml.2.8.6.zip
 
     - name: Download Microsoft.VCLibs.x64.14.00.Desktop
-      if: runner.name != 'windows-2025'
+      if: steps.os_check.outputs.version == 'Microsoft Windows Server 2022 Datacenter'
       shell: powershell
       run: |
         $ProgressPreference = 'SilentlyContinue'
         Invoke-WebRequest -Uri https://aka.ms/Microsoft.VCLibs.x64.14.00.Desktop.appx -OutFile Microsoft.VCLibs.x64.14.00.Desktop.appx
 
     - name: Determine Latest winget release via GitHub API
-      if: runner.name != 'windows-2025'
+      if: steps.os_check.outputs.version == 'Microsoft Windows Server 2022 Datacenter'
       id: github_api
       shell: powershell
       run: |
@@ -80,48 +87,48 @@ runs:
         Write-Output "latest_winget_license_xml_uri=$latestWingetLicenseXmlUri" >> $Env:GITHUB_OUTPUT
 
     - name: Download winget
-      if: runner.name != 'windows-2025'
+      if: steps.os_check.outputs.version == 'Microsoft Windows Server 2022 Datacenter'
       shell: powershell
       run: |
         $ProgressPreference = 'SilentlyContinue'
         Invoke-WebRequest -Headers $headers -Uri "${{ steps.github_api.outputs.latest_winget_msix_bundle_uri }}" -OutFile "./winget.msixbundle"
 
     - name: Download License
-      if: runner.name != 'windows-2025'
+      if: steps.os_check.outputs.version == 'Microsoft Windows Server 2022 Datacenter'
       shell: powershell
       run: |
         $ProgressPreference = 'SilentlyContinue'
         Invoke-WebRequest -Headers $headers -Uri "${{ steps.github_api.outputs.latest_winget_license_xml_uri }}" -OutFile "./winget_License1.xml"
 
     - name: Install Microsoft.UI.Xaml v2.8.6
-      if: runner.name != 'windows-2025'
+      if: steps.os_check.outputs.version == 'Microsoft Windows Server 2022 Datacenter'
       shell: powershell
       run: |
         Add-AppxPackage .\microsoft.ui.xaml.2.8.6\tools\AppX\x64\Release\Microsoft.UI.Xaml.2.8.appx
 
     - name: Install Microsoft.VCLibs.x64.14.00.Desktop
-      if: runner.name != 'windows-2025'
+      if: steps.os_check.outputs.version == 'Microsoft Windows Server 2022 Datacenter'
       shell: powershell
       run: |
         Add-AppxPackage Microsoft.VCLibs.x64.14.00.Desktop.appx
 
     - name: Install winget
-      if: runner.name != 'windows-2025'
+      if: steps.os_check.outputs.version == 'Microsoft Windows Server 2022 Datacenter'
       shell: powershell
       run: |
         echo "PROVISIONING WINGET"
         Add-AppxProvisionedPackage -Online -PackagePath ./winget.msixbundle -LicensePath ./winget_License1.xml
 
     - name: Installing Winget
-      if: runner.name != 'windows-2025'
+      if: steps.os_check.outputs.version == 'Microsoft Windows Server 2022 Datacenter'
       shell: powershell
       run: |
         echo "INSTALLING WINGET"
         $ProgressPreference = 'SilentlyContinue'
         Add-AppxPackage .\winget.msixbundle
 
     - name: Cleanup Downloads
-      if: runner.name != 'windows-2025'
+      if: steps.os_check.outputs.version == 'Microsoft Windows Server 2022 Datacenter'
       shell: powershell
       run: |
         rm Microsoft.VCLibs.x64.14.00.Desktop.appx
@@ -130,7 +137,7 @@ runs:
         Remove-Item -Recurse -Force .\microsoft.ui.xaml.2.8.6
 
     - name: Wait to allow Installation to Finalize
-      if: runner.name != 'windows-2025'
+      if: steps.os_check.outputs.version == 'Microsoft Windows Server 2022 Datacenter'
       shell: powershell
       run: |
         foreach ($i in 1..60) {