From 07d8649bb262f8f74e7b1fa22f74bbb110a9cc36 Mon Sep 17 00:00:00 2001
From: "J. Fronny" <33260128+JFronny@users.noreply.github.com>
Date: Fri, 13 Mar 2020 20:47:03 +0100
Subject: [PATCH] Clean up main.yml a bit

---
 .github/workflows/main.yml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3423270..c7b3774 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,19 +18,11 @@ jobs:
       run: |
         cd $Env:GITHUB_WORKSPACE
         nuget restore
-        cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\"
-        .\MSBuild.exe -noLogo -verbosity:m $Env:GITHUB_WORKSPACE\UpTool2.sln -p:Configuration=Release
-        cp "$Env:GITHUB_WORKSPACE\UpTool build tool\bin\Release\netcoreapp3.1\package.zip" $Env:GITHUB_WORKSPACE\Tools.zip
-        cd "C:\Program Files\7-Zip\"
-        .\7z a $Env:GITHUB_WORKSPACE\Release.zip $Env:GITHUB_WORKSPACE\UpTool2\bin\Release\netcoreapp3.1
-        cd $Env:GITHUB_WORKSPACE\UpTool2\bin\Release\netcoreapp3.1
-        ls
-        echo "UpTool version"
-        $asmver = $([Reflection.Assembly]::Loadfile($(pwd).Path + "\\UpTool2.dll").GetName().version.ToString())
-        echo "pkgtool version"
-        cd "$Env:GITHUB_WORKSPACE\UpTool build tool\bin\Release\netcoreapp3.1"
-        $pkgtoolver = $([Reflection.Assembly]::Loadfile($(pwd).Path + "\\pkgtool.dll").GetName().version.ToString())
-        cd $Env:GITHUB_WORKSPACE
+        & "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" -noLogo -verbosity:m .\UpTool2.sln -p:Configuration=Release
+        cp ".\UpTool build tool\bin\Release\netcoreapp3.1\package.zip" $Env:GITHUB_WORKSPACE\Tools.zip
+        & "C:\Program Files\7-Zip\7z" a .\Release.zip .\UpTool2\bin\Release\netcoreapp3.1
+        $asmver = $([Reflection.Assembly]::Loadfile($(pwd).Path + "\\UpTool2\\bin\\Release\\netcoreapp3.1\\UpTool2.dll").GetName().version.ToString())
+        $pkgtoolver = $([Reflection.Assembly]::Loadfile($(pwd).Path + "\\UpTool build tool\\bin\\Release\\netcoreapp3.1\\pkgtool.dll").GetName().version.ToString())
         echo "::set-output name=vers::$asmver"
         echo "::set-output name=pkgvers::$pkgtoolver"
     - name: Create Release