Merge pull request #217 from jhochwald/main

ARM64 workarounds
pull/218/head
Romain 2022-10-26 14:15:47 +02:00 committed by GitHub
commit fa1004f4b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 23 deletions

View File

@ -3,7 +3,9 @@
Function Get-WingetCmd { Function Get-WingetCmd {
#Get WinGet Path (if admin context) #Get WinGet Path (if admin context)
$ResolveWingetPath = Resolve-Path "$env:ProgramFiles\WindowsApps\Microsoft.DesktopAppInstaller_*_x64__8wekyb3d8bbwe" | Sort-Object { [version]($_.Path -replace '^[^\d]+_((\d+\.)*\d+)_.*', '$1') } # Includes Workaround for ARM64 (removed X64 and replaces it with a wildcard)
$ResolveWingetPath = Resolve-Path "$env:ProgramFiles\WindowsApps\Microsoft.DesktopAppInstaller_*_*__8wekyb3d8bbwe" | Sort-Object { [version]($_.Path -replace '^[^\d]+_((\d+\.)*\d+)_.*', '$1') }
if ($ResolveWingetPath) { if ($ResolveWingetPath) {
#If multiple version, pick last one #If multiple version, pick last one
$WingetPath = $ResolveWingetPath[-1].Path $WingetPath = $ResolveWingetPath[-1].Path

View File

@ -5,6 +5,9 @@ function Test-Network {
#Init #Init
$timeout = 0 $timeout = 0
# Workaround for ARM64 (Access Denied / Win32 internal Server error)
$ProgressPreference = 'SilentlyContinue'
#Test connectivity during 30 min then timeout #Test connectivity during 30 min then timeout
Write-Log "Checking internet connection..." "Yellow" Write-Log "Checking internet connection..." "Yellow"
While ($timeout -lt 1800) { While ($timeout -lt 1800) {

View File

@ -32,23 +32,23 @@
</output> </output>
<output id="5"> <output id="5">
<!--Logs are not available yet--> <!--Logs are not available yet-->
<message>Logs are not available yet!</message> <message>Die Logs sind aktuell nicht verfügbar!</message>
</output> </output>
<output id="6"> <output id="6">
<!--Starting a manual check for updated apps--> <!--Starting a manual check for updated apps-->
<message>Starting a manual check for updated apps...</message> <message>Starte die manuelle Suche nach Updates.</message>
</output> </output>
<output id="7"> <output id="7">
<!--Couldn't start a manual check for updated apps--> <!--Couldn't start a manual check for updated apps-->
<message>Couldn't start a manual check for updated apps!</message> <message>Die manuelle Suche nach Updates konnte nicht gestartet werden!</message>
</output> </output>
<output id="8"> <output id="8">
<!--Check for updated apps already running--> <!--Check for updated apps already running-->
<message>Check for updated apps already running...</message> <message>Die Such nach Updates läuft bereits.</message>
</output> </output>
<output id="9"> <output id="9">
<!--Manual check for updated apps completed--> <!--Manual check for updated apps completed-->
<message>Manual check for updated apps completed...</message> <message>Die manuelle suche nach Updates wurde abgeschlossen.</message>
</output> </output>
</outputs> </outputs>
</local> </local>