Switch to Powershell cmdlet and always install/upgrade to latest winget

elprans · elprans · commit 36ebdf8e5737 · 2025-08-19T17:22:33.000-07:00
diff --git a/.github/workflows/test_action.yml b/.github/workflows/test_action.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
     - name: Install winget
       id: install-winget
-      uses: geldata/install-winget@main
+      uses: geldata/install-winget@${{ github.ref }}
 
     - name: Check Version
       shell: bash
@@ -43,7 +43,7 @@ jobs:
       run: winget install wingetcreate --disable-interactivity --accept-source-agreements --accept-package-agreements
 
   test-job-with-token:
-    name: Test Pinned Job with GitHub Token
+    name: Test with GitHub Token
     strategy:
       fail-fast: false
       matrix:
@@ -57,7 +57,7 @@ jobs:
 
     - name: Install winget
       id: install-winget
-      uses: Cyberboss/install-winget@main
+      uses: geldata/install-winget@${{ github.ref }}
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -72,35 +72,3 @@ jobs:
 
     - name: Install wingetcreate
       run: winget install wingetcreate --disable-interactivity --accept-source-agreements
-
-  test-latest-with-token:
-    name: Test Latest Job with GitHub Token
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ 'windows-2022', 'windows-2025', 'windows-11-arm', 'windows-latest' ]
-        repeat: [ 'a', 'b' ]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Echo Runner OS version
-      shell: powershell
-      run: (Get-WmiObject Win32_OperatingSystem).Caption
-
-    - name: Install winget
-      id: install-winget
-      uses: Cyberboss/install-winget@main
-      with:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        wget_release_id: latest
-
-    - name: Check Version
-      shell: bash
-      run: |
-        VERSION="${{ steps.install-winget.outputs.winget-version }}"
-        if [ -z "$VERSION" ]; then
-          exit 1
-        fi
-        echo $VERSION
-
-    - name: Install wingetcreate
-      run: winget install wingetcreate --disable-interactivity --accept-source-agreements
diff --git a/README.md b/README.md
@@ -22,7 +22,6 @@ jobs:
       uses: geldata/install-winget@v1
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        wget_release_id: latest
 
     - name: Install wingetcreate
       run: winget install wingetcreate --disable-interactivity --accept-source-agreements
@@ -36,10 +35,6 @@ The GitHub token to use when interacting with the GitHub API. Used to bypass una
 
 **Recommendation is to set this to ${{ secrets.GITHUB_TOKEN }} or some other available token** as GitHub runners tend to often come with exhausted rate limits.
 
-#### `wget_release_id` (Optional)
-
-This is used to be able to pin (make immutable) the version of winget that is taken github. To see which versions (you need the release-id) is possible to use plese check the github API for the release of [winget-cli](https://github.com/microsoft/winget-cli) this can be checked by looking for the topmost `id:` attribute here: https://api.github.com/repos/microsoft/winget-cli/releases .
-
 ### Outputs
 
 #### `winget-version`
diff --git a/action.yml b/action.yml
@@ -9,18 +9,12 @@ inputs:
     description: 'No scopes GitHub token for querying the API and downloading from winget-cli releases'
     required: false
     default: 'NONE'
-  wget_release_id:
-    description: 'Specify desired release-id of winget can be specified here. By default, a recent stable release will be selected by the action author. To see what versions are available, look into https://api.github.com/repos/microsoft/winget-cli/releases'
-    required: false
-    default: '164835566' # latest can be used here
 
 outputs:
   winget-version:
     description: "The version of winget installed"
     value: ${{ steps.winget-version.outputs.winget-version }}
 runs:
-# Hacked together https://github.com/microsoft/winget-cli/issues/1861#issuecomment-1352784247
-# https://github.com/microsoft/winget-cli/issues/700#issuecomment-874084714
   using: composite
   steps:
     - name: Check runner OS is Windows
@@ -30,129 +24,25 @@ runs:
         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}" >> $env:GITHUB_OUTPUT
-        echo $version
-
-    - name: Check if winget is already installed
-      shell: powershell
-      id: wget_check
-      run: |
-        $available = [bool](Get-Command winget -ErrorAction SilentlyContinue)
-        echo "available=${available}" >> $env:GITHUB_OUTPUT
-        echo $available
-
-    - name: Upgrade winget if installed
-      if: steps.wget_check.outputs.available == 'True'
-      shell: powershell
-      run: winget upgrade winget --accept-package-agreements --accept-source-agreements --disable-interactivity --silent --ignore-warnings
-
-    - name: Download Microsoft.UI.Xaml v2.8.6
-      if: steps.wget_check.outputs.available == 'False'
-      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
-        Expand-Archive .\microsoft.ui.xaml.2.8.6.zip
-
-    - name: Download Microsoft.VCLibs.x64.14.00.Desktop
-      if: steps.wget_check.outputs.available == 'False'
-      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: steps.wget_check.outputs.available == 'False'
-      id: github_api
-      shell: powershell
-      run: |
-        $ProgressPreference = 'SilentlyContinue'
-        if ("${{ inputs.GITHUB_TOKEN }}" -ne "NONE") {
-          $headers = @{ "Authorization" = "Bearer ${{ inputs.GITHUB_TOKEN }}" }
-          Write-Host "Token present"
-        } else {
-          $headers = @{}
-          Write-Host "No token present"
-        }
-
-        $releaseURL = "https://api.github.com/repos/microsoft/winget-cli/releases/${{ inputs.wget_release_id }}"
-        $gitHubReleasesResponse = Invoke-RestMethod $releaseURL -Headers $headers
-        $wingetReleaseAssets = $gitHubReleasesResponse.assets
-        $latestWingetMsixBundleUri = $wingetReleaseAssets.browser_download_url | Where-Object {$_.EndsWith(".msixbundle")}
-        $latestWingetLicenseXmlUri = $wingetReleaseAssets.browser_download_url | Where-Object {$_.EndsWith("License1.xml")}
-        Write-Host "latest_winget_msix_bundle_uri=$latestWingetMsixBundleUri"
-        Write-Host "latest_winget_license_xml_uri=$latestWingetLicenseXmlUri"
-        Write-Output "latest_winget_msix_bundle_uri=$latestWingetMsixBundleUri" >> $Env:GITHUB_OUTPUT
-        Write-Output "latest_winget_license_xml_uri=$latestWingetLicenseXmlUri" >> $Env:GITHUB_OUTPUT
-
-    - name: Download winget
-      if: steps.wget_check.outputs.available == 'False'
-      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: steps.wget_check.outputs.available == 'False'
-      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: 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: 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: steps.wget_check.outputs.available == 'False'
-      shell: powershell
-      run: |
-        echo "PROVISIONING WINGET"
-        Add-AppxProvisionedPackage -Online -PackagePath ./winget.msixbundle -LicensePath ./winget_License1.xml
-
-    - name: Installing Winget
-      if: steps.wget_check.outputs.available == 'False'
-      shell: powershell
-      run: |
-        echo "INSTALLING WINGET"
-        $ProgressPreference = 'SilentlyContinue'
-        Add-AppxPackage .\winget.msixbundle
-
-    - name: Cleanup Downloads
-      if: steps.wget_check.outputs.available == 'False'
+    - name: Install Microsoft.WinGet.Client module
       shell: powershell
       run: |
-        rm Microsoft.VCLibs.x64.14.00.Desktop.appx
-        rm ./winget_License1.xml
-        rm ./winget.msixbundle
-        Remove-Item -Recurse -Force .\microsoft.ui.xaml.2.8.6
+        $ErrorActionPreference = 'Stop'
+        Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process -Force
+        # Make sure the NuGet provider & PSGallery are ready
+        Install-PackageProvider -Name NuGet -Force -Confirm:$false
+        Set-PSRepository -Name 'PSGallery' -InstallationPolicy Trusted
+        # Install/refresh the WinGet PowerShell client
+        Install-Module Microsoft.WinGet.Client -Force -Scope CurrentUser
+        Import-Module Microsoft.WinGet.Client -Force
 
-    - name: Wait to allow Installation to Finalize
-      if: steps.wget_check.outputs.available == 'False'
+    - name: Ensure WinGet (App Installer) is installed/updated
       shell: powershell
       run: |
-        foreach ($i in 1..60) {
-          Start-Sleep -Seconds 1
-          Write-Host "Waiting for winget to install... ${i}"
-          if (Get-Command winget -ErrorAction SilentlyContinue) {
-            break
-          }
-        }
+        $ErrorActionPreference = 'Stop'
+        Repair-WinGetPackageManager -Latest -Force -Verbose
 
-    - name: Output winget Version
+    - name: Output winget version
       id: winget-version
       shell: powershell
       run: |
