Merge pull request #671 from Romanitho/msi-prerequisites
[MSI Prerequisites] Remove Pre-Release version from Nightliespull/673/head
commit
32fb1f2cf9
|
@ -56,7 +56,7 @@ jobs:
|
||||||
uses: MCKanpolat/auto-semver-action@5003b8d37f4b03d95f15303ea10242cbf7c13141 # 2
|
uses: MCKanpolat/auto-semver-action@5003b8d37f4b03d95f15303ea10242cbf7c13141 # 2
|
||||||
id: versioning
|
id: versioning
|
||||||
with:
|
with:
|
||||||
releaseType: prerelease
|
releaseType: Patch
|
||||||
incrementPerCommit: false
|
incrementPerCommit: false
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
|
|
@ -300,7 +300,7 @@ function Get-WAUConfiguratorLatestVersion {
|
||||||
|
|
||||||
#Get latest stable info
|
#Get latest stable info
|
||||||
$WAUConfiguratorURL = 'https://api.github.com/repos/Romanitho/Winget-AutoUpdate/releases/latest'
|
$WAUConfiguratorURL = 'https://api.github.com/repos/Romanitho/Winget-AutoUpdate/releases/latest'
|
||||||
$WAUConfiguratorLatestVersion = (((Invoke-WebRequest $WAUConfiguratorURL -UseBasicParsing | ConvertFrom-Json)[0].tag_name).Replace("v", "")).Replace("-", ".")
|
$WAUConfiguratorLatestVersion = (((Invoke-WebRequest $WAUConfiguratorURL -UseBasicParsing | ConvertFrom-Json)[0].tag_name).Replace("v", ""))
|
||||||
|
|
||||||
if ([version]$WAUConfiguratorVersion -lt [version]$WAUConfiguratorLatestVersion) {
|
if ([version]$WAUConfiguratorVersion -lt [version]$WAUConfiguratorLatestVersion) {
|
||||||
|
|
||||||
|
|
|
@ -263,12 +263,7 @@ function Install-WingetAutoUpdate {
|
||||||
New-ItemProperty $regPath -Name Publisher -Value "Romanitho" -Force | Out-Null
|
New-ItemProperty $regPath -Name Publisher -Value "Romanitho" -Force | Out-Null
|
||||||
New-ItemProperty $regPath -Name URLInfoAbout -Value "https://github.com/Romanitho/Winget-AutoUpdate" -Force | Out-Null
|
New-ItemProperty $regPath -Name URLInfoAbout -Value "https://github.com/Romanitho/Winget-AutoUpdate" -Force | Out-Null
|
||||||
New-ItemProperty $regPath -Name WAU_NotificationLevel -Value $NotificationLevel -Force | Out-Null
|
New-ItemProperty $regPath -Name WAU_NotificationLevel -Value $NotificationLevel -Force | Out-Null
|
||||||
if ($WAUVersion -match "-") {
|
New-ItemProperty $regPath -Name WAU_UpdatePrerelease -Value 0 -PropertyType DWord -Force | Out-Null
|
||||||
New-ItemProperty $regPath -Name WAU_UpdatePrerelease -Value 1 -PropertyType DWord -Force | Out-Null
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
New-ItemProperty $regPath -Name WAU_UpdatePrerelease -Value 0 -PropertyType DWord -Force | Out-Null
|
|
||||||
}
|
|
||||||
New-ItemProperty $regPath -Name WAU_PostUpdateActions -Value 0 -PropertyType DWord -Force | Out-Null
|
New-ItemProperty $regPath -Name WAU_PostUpdateActions -Value 0 -PropertyType DWord -Force | Out-Null
|
||||||
New-ItemProperty $regPath -Name WAU_MaxLogFiles -Value $MaxLogFiles -PropertyType DWord -Force | Out-Null
|
New-ItemProperty $regPath -Name WAU_MaxLogFiles -Value $MaxLogFiles -PropertyType DWord -Force | Out-Null
|
||||||
New-ItemProperty $regPath -Name WAU_MaxLogSize -Value $MaxLogSize -PropertyType DWord -Force | Out-Null
|
New-ItemProperty $regPath -Name WAU_MaxLogSize -Value $MaxLogSize -PropertyType DWord -Force | Out-Null
|
||||||
|
|
|
@ -149,7 +149,7 @@ if (Test-Network) {
|
||||||
#Get Available Version
|
#Get Available Version
|
||||||
$Script:WAUAvailableVersion = Get-WAUAvailableVersion
|
$Script:WAUAvailableVersion = Get-WAUAvailableVersion
|
||||||
#Compare
|
#Compare
|
||||||
if ([version]$WAUAvailableVersion.Replace("-", ".") -ne [version]$WAUCurrentVersion.Replace("-", ".")) {
|
if ([version]$WAUAvailableVersion -gt [version]$WAUCurrentVersion) {
|
||||||
#If new version is available, update it
|
#If new version is available, update it
|
||||||
Write-ToLog "WAU Available version: $WAUAvailableVersion" "Yellow"
|
Write-ToLog "WAU Available version: $WAUAvailableVersion" "Yellow"
|
||||||
Update-WAU
|
Update-WAU
|
||||||
|
|
Loading…
Reference in New Issue