From 3217ade6c970270b3c9a88f9273a76e2f7e5c3e9 Mon Sep 17 00:00:00 2001
From: Aptivi CEO <eoflaoevicecity@gmail.com>
Date: Thu, 22 Aug 2024 18:08:39 +0300
Subject: [PATCH] imp - Don't invoke msbuild directly

---

For build scripts, invoking dotnet with msbuild is taking us back to the days where we would build "msbuild" for Mono in a PPA explicitly using mono-msbuild in April 2021. We've changed the dotnet command to be more current as the "msbuild" approach is so 2021.

---

Type: imp
Breaking: False
Doc Required: False
Backport Required: False
Part: 1/1
---
 tools/build.cmd | 6 +++---
 tools/build.sh  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/build.cmd b/tools/build.cmd
index ecb1085..afbce43 100644
--- a/tools/build.cmd
+++ b/tools/build.cmd
@@ -13,14 +13,14 @@ goto :finished
 
 :download
 echo Downloading packages...
-"%ProgramFiles%\dotnet\dotnet.exe" msbuild "..\Nettify.sln" -t:restore -p:Configuration=%releaseconfig%
+"%ProgramFiles%\dotnet\dotnet.exe" restore "..\Nettify.sln" --configuration %releaseconfig%
 if %errorlevel% == 0 goto :build
 echo There was an error trying to download packages (%errorlevel%).
 goto :finished
 
 :build
-echo Building Nitrocid KS...
-"%ProgramFiles%\dotnet\dotnet.exe" msbuild "..\Nettify.sln" -p:Configuration=%releaseconfig%
+echo Building Nettify...
+"%ProgramFiles%\dotnet\dotnet.exe" build "..\Nettify.sln" --configuration %releaseconfig%
 if %errorlevel% == 0 goto :success
 echo There was an error trying to build (%errorlevel%).
 goto :finished
diff --git a/tools/build.sh b/tools/build.sh
index 2598fd4..de2762d 100644
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -23,15 +23,15 @@ fi
 
 # Download packages
 echo Downloading packages...
-"$dotnetpath" msbuild "../Nettify.sln" -t:restore -p:Configuration=$releaseconf
+"$dotnetpath" restore "../Nettify.sln" --configuration $releaseconf
 if [ ! $? == 0 ]; then
 	echo Download failed.
 	exit 1
 fi
 
-# Build KS
-echo Building KS...
-"$dotnetpath" msbuild "../Nettify.sln" -p:Configuration=$releaseconf
+# Build Nettify
+echo Building Nettify...
+"$dotnetpath" build "../Nettify.sln" --configuration $releaseconf
 if [ ! $? == 0 ]; then
 	echo Build failed.
 	exit 1