From a7413c4b0e5071b9da5a8df36fea8a1e8ee94e08 Mon Sep 17 00:00:00 2001
From: fristyxd <iletisim@fristy.net>
Date: Sat, 5 Sep 2026 16:23:07 +0300
Subject: [PATCH] ci: invoke vpk.dll directly, slim restore step

---
 .gitea/workflows/ci.yml              | 18 ------------------
 scripts/release/package-velopack.ps1 | 10 +++++++---
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 6dd8402..c06a130 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -39,17 +39,8 @@ jobs:
         shell: powershell
         run: |
           $ErrorActionPreference = "Stop"
-          Get-Location
-          Get-ChildItem .config -File
-          Write-Output "USERPROFILE=$env:USERPROFILE"
-          Write-Output "DOTNET_CLI_HOME=$env:DOTNET_CLI_HOME"
-          Write-Output "DOTNET_ROOT=$env:DOTNET_ROOT"
-          Write-Output "NUGET_PACKAGES=$env:NUGET_PACKAGES"
-          dotnet --list-sdks
           dotnet tool restore --tool-manifest .config/dotnet-tools.json
           if ($LASTEXITCODE -ne 0) { throw "tool restore failed ($LASTEXITCODE)" }
-          dotnet tool list
-          Get-ChildItem "$env:USERPROFILE/.dotnet/tools" -Recurse -ErrorAction SilentlyContinue | Select-Object FullName
       - name: Restore
         shell: powershell
         run: dotnet restore src/RgbLedStripController/RgbLedStripController.csproj --configfile NuGet.Config
@@ -95,17 +86,8 @@ jobs:
         shell: powershell
         run: |
           $ErrorActionPreference = "Stop"
-          Get-Location
-          Get-ChildItem .config -File
-          Write-Output "USERPROFILE=$env:USERPROFILE"
-          Write-Output "DOTNET_CLI_HOME=$env:DOTNET_CLI_HOME"
-          Write-Output "DOTNET_ROOT=$env:DOTNET_ROOT"
-          Write-Output "NUGET_PACKAGES=$env:NUGET_PACKAGES"
-          dotnet --list-sdks
           dotnet tool restore --tool-manifest .config/dotnet-tools.json
           if ($LASTEXITCODE -ne 0) { throw "tool restore failed ($LASTEXITCODE)" }
-          dotnet tool list
-          Get-ChildItem "$env:USERPROFILE/.dotnet/tools" -Recurse -ErrorAction SilentlyContinue | Select-Object FullName
       - name: Assert tag matches csproj version
         shell: powershell
         run: |
diff --git a/scripts/release/package-velopack.ps1 b/scripts/release/package-velopack.ps1
index 50dd536..295ec45 100644
--- a/scripts/release/package-velopack.ps1
+++ b/scripts/release/package-velopack.ps1
@@ -10,7 +10,7 @@
     5. Çıktı: artifacts/velopack/win-x64-stable/
 
 .NOTES
-    Velopack CLI: dotnet tool restore ile yüklenen vpk kullanılır
+    Velopack CLI: NuGet paketinden dogrudan calistirilan vpk.dll kullanilir
     Icon: Assets/AppIcon.ico (installer ikonu)
     Velopack CLI args: camelCase (--outputDir, --packId, --packTitle, --packAuthors, --packVersion, --packDir, --mainExe)
 #>
@@ -72,6 +72,10 @@ if (-not $WhatIf) {
 }
 
 # 2. vpk pack (args camelCase)
+$nugetPkgs = $env:NUGET_PACKAGES
+if (-not $nugetPkgs) { $nugetPkgs = Join-Path $env:USERPROFILE ".nuget/packages" }
+$vpkDll = Join-Path $nugetPkgs "vpk/0.0.1298/tools/net8.0/any/vpk.dll"
+if (-not (Test-Path $vpkDll)) { throw "vpk.dll not found at $vpkDll" }
 $vpkArgs = @(
     "pack",
     "--outputDir", $velopackDir,
@@ -85,10 +89,10 @@ $vpkArgs = @(
 )
 Write-Host "vpk pack..." -ForegroundColor Cyan
 if (-not $WhatIf) {
-    & dotnet tool run vpk $vpkArgs
+    & dotnet $vpkDll $vpkArgs
     if ($LASTEXITCODE -ne 0) { throw "vpk pack failed ($LASTEXITCODE)" }
 } else {
-    Write-Host "[WhatIf] dotnet tool run vpk $vpkArgs"
+    Write-Host "[WhatIf] dotnet $vpkDll $vpkArgs"
 }
 
 # 3. Sadece Setup.exe ve Portable.zip'i istenen formata rename et