Skip to content

Optimise version #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rwidmark merged 3 commits into from
Jan 18, 2023
Merged

Optimise version #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9256217
update
Jan 18, 2023
7c3f548
beta3
Jan 18, 2023
a323271
fixed version agian
Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions .src/private/function/Confirm-RSWinGet.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,16 @@
# Checking if the installed version of WinGet are the same as the latest version of WinGet
[version]$vWinGet = [string]$SysInfo.WinGet
[version]$vGitHub = [string]$GitHubInfo.Tag
if ($WinGet -ne "1.19.3531.0") {
if ([Version]$vWinGet -lt [Version]$vGitHub) {
Write-Output "WinGet has a newer version $($GitHubInfo.Tag), downloading and installing it..."
Invoke-WebRequest -UseBasicParsing -Uri $GitHubInfo.DownloadUrl -OutFile $GitHubInfo.OutFile

if ([Version]$vWinGet -lt [Version]$vGitHub -or $WinGet -like "1.19.3531.0") {
Write-Output "WinGet has a newer version $($GitHubInfo.Tag), downloading and installing it..."
Invoke-WebRequest -UseBasicParsing -Uri $GitHubInfo.DownloadUrl -OutFile $GitHubInfo.OutFile

Write-Output "Installing version $($GitHubInfo.Tag) of WinGet..."
Add-AppxPackage $($GitHubInfo.OutFile)
}
else {
Write-OutPut "Your already on the latest version of WinGet $($WinGet), no need to update."
Write-Output "Installing version $($GitHubInfo.Tag) of WinGet..."
Add-AppxPackage $($GitHubInfo.OutFile)
}
else {
Write-OutPut "Your already on the latest version of WinGet $($WinGet), no need to update."
}
}
}
2 changes: 1 addition & 1 deletion .src/private/function/Get-RSInstallInfo.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -AllUsers | Where-Object { $_.name -like "Microsoft.DesktopAppInstaller" } | Sort-Object { $_.Version -as [version] } -Descending | Select-Object Version -First 1).version } catch { "0.0.0.0" })
WinGet = $(try { (Get-AppxPackage -AllUsers | Where-Object { $_.PackageFamilyName -like "Microsoft.DesktopAppInstaller_8wekyb3d8bbwe" } | Sort-Object { $_.Version -as [version] } -Descending | Select-Object Version -First 1).version } catch { "0.0.0.0" })
VisualCRedistUrl = $VisualCRedistUrl
VCLibsUrl = $VCLibsUrl
Arch = $Arch
Expand Down
2 changes: 1 addition & 1 deletion RSModuleBuilder.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[string]$apiKey = ""
#
# Changes on every build
[string]$Version = "0.1.2"
[string]$Version = "0.1.3"
[string]$PowerShellVersion = "5.1"
[string]$Tags = '"windows", "maintenance", "autoupdate", "autoupdate-script", "psmodule", "update", "winget", "windows10", "windows11"'
[string]$ProcessorArchitecture = ""
Expand Down
2 changes: 1 addition & 1 deletion WinSoftwareUpdate/WinSoftwareUpdate.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
RootModule = '.\WinSoftwareUpdate.psm1'

# Version number of this module.
ModuleVersion = '0.1.2'
ModuleVersion = '0.1.3'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down
21 changes: 11 additions & 10 deletions WinSoftwareUpdate/WinSoftwareUpdate.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,17 @@ Function Confirm-RSWinGet {
# Checking if the installed version of WinGet are the same as the latest version of WinGet
[version]$vWinGet = [string]$SysInfo.WinGet
[version]$vGitHub = [string]$GitHubInfo.Tag
if ($WinGet -ne "1.19.3531.0") {
if ([Version]$vWinGet -lt [Version]$vGitHub) {
Write-Output "WinGet has a newer version $($GitHubInfo.Tag), downloading and installing it..."
Invoke-WebRequest -UseBasicParsing -Uri $GitHubInfo.DownloadUrl -OutFile $GitHubInfo.OutFile

if ([Version]$vWinGet -lt [Version]$vGitHub -or $WinGet -like "1.19.3531.0") {
Write-Output "WinGet has a newer version $($GitHubInfo.Tag), downloading and installing it..."
Invoke-WebRequest -UseBasicParsing -Uri $GitHubInfo.DownloadUrl -OutFile $GitHubInfo.OutFile

Write-Output "Installing version $($GitHubInfo.Tag) of WinGet..."
Add-AppxPackage $($GitHubInfo.OutFile)
}
else {
Write-OutPut "Your already on the latest version of WinGet $($WinGet), no need to update."
Write-Output "Installing version $($GitHubInfo.Tag) of WinGet..."
Add-AppxPackage $($GitHubInfo.OutFile)
}
else {
Write-OutPut "Your already on the latest version of WinGet $($WinGet), no need to update."
}
}
}
Function Get-RSInstallInfo {
Expand Down Expand Up @@ -249,7 +250,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 -AllUsers | Where-Object { $_.name -like "Microsoft.DesktopAppInstaller" } | Sort-Object { $_.Version -as [version] } -Descending | Select-Object Version -First 1).version } catch { "0.0.0.0" })
WinGet = $(try { (Get-AppxPackage -AllUsers | Where-Object { $_.PackageFamilyName -like "Microsoft.DesktopAppInstaller_8wekyb3d8bbwe" } | Sort-Object { $_.Version -as [version] } -Descending | Select-Object Version -First 1).version } catch { "0.0.0.0" })
VisualCRedistUrl = $VisualCRedistUrl
VCLibsUrl = $VCLibsUrl
Arch = $Arch
Expand Down
2 changes: 1 addition & 1 deletion test/PSScriptAnalyzer_WinSoftwareUpdate.psm1_2023-01-18.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RuleSuppressionID :
SuggestedCorrections :
IsSuppressed : False

Line : 311
Line : 312
Column : 10
Message : Function 'Start-RSWinGet' has verb that could change system state. Therefore, the function has to support 'ShouldProcess'.
Extent : Start-RSWinGet
Expand Down