From f21315f0c0bd5f50c4726722b78ac2208e8402fe Mon Sep 17 00:00:00 2001
From: "J. Fronny" <6260391-JFronny@users.noreply.gitlab.com>
Date: Mon, 31 Aug 2020 19:03:32 +0000
Subject: [PATCH] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22d4a16..c9252a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,28 +1,32 @@
 .shared_windows_runners:
   tags:
-  - shared-windows
   - windows
-  - windows-1809
 
 image: mcr.microsoft.com/dotnet/core/sdk
 
-before_script:
-  - dotnet restore
-
 uptool:
   extends:
   - .shared_windows_runners
   stage: deploy
   script: |
-    $(new-object System.Net.WebClient).DownloadFile("https://gitlab.com/JFronny/UpTool2/-/jobs/artifacts/master/raw/Tools.zip?job=uptool", "$($(pwd).Path)\Tools.zip")
-    & "C:\Program Files\7-Zip\7z.exe" x .\Tools.zip
-    rm Tools.zip
-    rm Install.bat
-    rm Remove.bat
+    mkdir i
+    cd i
+    $(new-object System.Net.WebClient).DownloadFile("https://gitlab.com/JFronny/UpTool2/-/jobs/artifacts/master/raw/Installer-generic.zip?job=uptool", "$($(pwd).Path)\Install.zip")
+    & "C:\Program Files\7-Zip\7z.exe" x .\Install.zip
+    .\Installer.exe i -p
+    cd ..
+    rm -R i
+    $Env:Path="$Env:Path;$Env:APPDATA\UpTool2\Install"
+    uptool --basic remove-repo "UpTool2 official Repo"
+    uptool --basic add-repo DevTools https://gitlab.com/JFronny/UpTool2/-/snippets/2010392/raw
+    uptool --basic update
+    uptool --basic install "UpTool2 package tools"
+    $Env:Path="$Env:Path;$Env:APPDATA\UpTool2\Apps\0e35d154-d0d3-45e0-b080-62f521263a44\app"
+
     mkdir .\build
     dotnet publish -o .\build -c Release
     $file = Get-Item $(Resolve-Path .\build\*.exe).Path
-    .\Data\pkgtool.exe build --binDir build --mainBin $file --packageFile .\package.zip --noLogo
+    pkgtool build --binDir build --mainBin $file --packageFile .\package.zip --noLogo
     $asm = $([Reflection.Assembly]::LoadFile($file.DirectoryName + "\" + $file.BaseName + ".dll"))
     $asmver = $asm.GetName().Version.ToString()
     [System.XML.XMLDocument]$xml=New-Object System.XML.XMLDocument