update building cmds

.github/workflows/build.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  MSBuild_Path: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe
+
 jobs:
   build:
 
@@ -14,14 +17,10 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 8.0.x
-    - name: Restore
-      run: dotnet restore
+    - name: Clean up
+      run: "${{env.MSBuild_Path}}" ${{github.workspace}}/LenovoLegionToolkit.sln -clean /p:Configuration=Release
     - name: Build
-      run: .\make.bat
+      run: .\make.bat "${{env.MSBuild_Path}}"
     - name: Upload artifact
       uses: actions/upload-artifact@v3
       with:

.github/workflows/release.yml

@@ -5,6 +5,9 @@ on:
     tags:
       - "[0-9]*.[0-9]*.[0-9]*"
 
+env:
+  MSBuild_Path: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe
+
 jobs:
   build:
 
@@ -13,14 +16,10 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 8.0.x
-    - name: Restore
-      run: dotnet restore
+    - name: Clean up
+      run: "${{env.MSBuild_Path}}" ${{github.workspace}}/LenovoLegionToolkit.sln -clean /p:Configuration=Release
     - name: Build
-      run: .\make.bat ${{ github.ref_name }}
+      run: .\make.bat "${{env.MSBuild_Path}}" ${{github.ref_name}}
     - name: Release
       uses: softprops/[email protected]
       with:

make.bat

@@ -1,16 +1,18 @@
 @echo off
 
-IF "%1"=="" (
+IF "%~1"=="" (
+	SET COMPILER_PATH=msbuild
+) ELSE (
+	SET COMPILER_PATH="%~1"
+)
+IF "%~2"=="" (
 	SET VERSION=0.0.1
 ) ELSE (
-	SET VERSION=%1
+	SET VERSION=%2
 )
-
 
 SET PATH=%PATH%;"C:\Program Files (x86)\Inno Setup 6"
 
-dotnet publish LenovoLegionToolkit.WPF -c release -o build /p:DebugType=None /p:FileVersion=%VERSION% /p:Version=%VERSION% || exit /b
-dotnet publish LenovoLegionToolkit.SpectrumTester -c release -o build /p:DebugType=None /p:FileVersion=%VERSION% /p:Version=%VERSION% || exit /b
-dotnet publish LenovoLegionToolkit.CLI -c release -o build /p:DebugType=None /p:FileVersion=%VERSION% /p:Version=%VERSION% || exit /b
+%COMPILER_PATH% LenovoLegionToolkit.sln -restore /p:Configuration=Release /p:DebugType=None /p:OutDir=%~dp0build\ /p:FileVersion=%VERSION% /p:Version=%VERSION% || exit /b
 
 iscc make_installer.iss /DMyAppVersion=%VERSION% || exit /b