Updated with param fix

Author: Robin Stolpe

.src/private/function/Confirm-RSWinGet.ps1

@@ -40,7 +40,7 @@
         [string]$WinGet
     )
 
-    if ($null -eq $WinGet) {
+    if ($WinGet -eq "No") {
         Write-Output = "WinGet is not installed, downloading and installing WinGet..."
     }
     else {

.src/private/function/Get-RSInstallInfo.ps1

@@ -54,7 +54,7 @@
     # Collects everything in pscustomobject to get easier access to the information
     [System.Object]$SysInfo = [PSCustomObject]@{
         VCLibs           = $(Get-AppxPackage -Name "Microsoft.VCLibs.140.00" -AllUsers | Where-Object { $_.Architecture -eq $Arch })
-        WinGet           = $(try { (Get-AppxPackage -Name Microsoft.DesktopAppInstaller).version } catch { $Null })
+        WinGet           = $(try { (Get-AppxPackage -Name Microsoft.DesktopAppInstaller).version } catch { "No" })
         VisualCRedistUrl = $VisualCRedistUrl
         $VCLibsUrl       = $VCLibsUrl
         Arch             = $Arch

.src/public/function/Update-RSWinSoftware.ps1

@@ -66,8 +66,8 @@
     [System.Object]$SysInfo = Get-RSInstallInfo
 
     # If user has choosen to skip the WinGet version don't check, if WinGet is not installed this will install WinGet anyway.
-    if ($SkipVersionCheck -eq $false -or $null -eq $SysInfo.WinGet) {
-        Confirm-RSWinGet -GitHubUrl $GitHubUrl -GithubHeaders $GithubHeaders
+    if ($SkipVersionCheck -eq $false -or $SysInfo.WinGet -eq "No") {
+        Confirm-RSWinGet -GitHubUrl $GitHubUrl -GithubHeaders $GithubHeaders -WinGet $SysInfo.WinGet
     }
 
     # If VCLibs are not installed it will get installed

WinSoftwareUpdate/WinSoftwareUpdate.psm1

@@ -89,8 +89,8 @@ Function Update-RSWinSoftware {
     [System.Object]$SysInfo = Get-RSInstallInfo
 
     # If user has choosen to skip the WinGet version don't check, if WinGet is not installed this will install WinGet anyway.
-    if ($SkipVersionCheck -eq $false -or $null -eq $SysInfo.WinGet) {
-        Confirm-RSWinGet -GitHubUrl $GitHubUrl -GithubHeaders $GithubHeaders
+    if ($SkipVersionCheck -eq $false -or $SysInfo.WinGet -eq "No") {
+        Confirm-RSWinGet -GitHubUrl $GitHubUrl -GithubHeaders $GithubHeaders -WinGet $SysInfo.WinGet
     }
 
     # If VCLibs are not installed it will get installed
@@ -143,7 +143,7 @@ Function Confirm-RSWinGet {
         [string]$WinGet
     )
 
-    if ($null -eq $WinGet) {
+    if ($WinGet -eq "No") {
         Write-Output = "WinGet is not installed, downloading and installing WinGet..."
     }
     else {
@@ -244,7 +244,7 @@ Function Get-RSInstallInfo {
     # Collects everything in pscustomobject to get easier access to the information
     [System.Object]$SysInfo = [PSCustomObject]@{
         VCLibs           = $(Get-AppxPackage -Name "Microsoft.VCLibs.140.00" -AllUsers | Where-Object { $_.Architecture -eq $Arch })
-        WinGet           = $(try { (Get-AppxPackage -Name Microsoft.DesktopAppInstaller).version } catch { $Null })
+        WinGet           = $(try { (Get-AppxPackage -Name Microsoft.DesktopAppInstaller).version } catch { "No" })
         VisualCRedistUrl = $VisualCRedistUrl
         $VCLibsUrl       = $VCLibsUrl
         Arch             = $Arch