Merge branch 'master' of https://github.com/OpenByteDev/netcorehost

Author: OpenByteDev

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [OpenByteDev]

.github/scripts/uninstall-dotnet-windows.ps1

@@ -4,13 +4,25 @@ $headers = @{
 }
 $releases = Invoke-RestMethod -Uri "https://api.github.com/repos/dotnet/cli-lab/releases/latest" -Headers $headers
 $asset = $releases.assets | Where-Object { $_.name -eq "dotnet-core-uninstall.msi" } | Select-Object -First 1
+
+# Check if the asset is missing
+if (-not $asset) {
+    throw "Release asset 'dotnet-core-uninstall.msi' was not found in the latest release."
+}
+if (-not $asset.browser_download_url) {
+    throw "Release asset 'dotnet-core-uninstall.msi' does not have a browser_download_url."
+}
+
 $url = $asset.browser_download_url
 Invoke-WebRequest -Uri $url -OutFile $(Split-Path $url -Leaf)
 
 # Prepare uninstall tool
-$extractPath = Join-Path $pwd "dotnet-core-uninstall" # needs to be a new path
+$extractPath = Join-Path $pwd "dotnet-core-uninstall"
+
+# Run msiexec
 msiexec.exe /A dotnet-core-uninstall.msi TARGETDIR=$extractPath /QN /L*V log.txt
-$uninstallToolPath = Join-Path $extractPath "dotnet-core-uninstall" "dotnet-core-uninstall.exe"
+$uninstallToolPath = Join-Path $extractPath "PFiles" "dotnet-core-uninstall" "dotnet-core-uninstall.exe"
+
 # wait for the tool to be ready
 $maxRetries = 30
 $retry = 0
@@ -19,8 +31,8 @@ while (-not (Test-Path $uninstallToolPath) -and ($retry -lt $maxRetries)) {
     $retry++
 }
 if ($retry -eq $maxRetries) {
-    Write-Error "Uninstall tool was not found after $maxRetries seconds."
-    Get-Content -Path "log.txt" | Write-Host
+    Write-Host "Uninstall tool was not found after $maxRetries seconds."
+    if (Test-Path "log.txt") { Get-Content -Path "log.txt" | Write-Host }
     exit 1
 }
 

.github/workflows/rerun.yml

@@ -13,7 +13,7 @@ jobs:
   rerun_if_uninstall_dotnet_failed:
     if: >
       github.event.workflow_run.conclusion == 'failure' &&
-      github.event.workflow_run.run_attempt < 5
+      github.event.workflow_run.run_attempt < 3
     runs-on: ubuntu-latest
 
     steps: