Skip to content

Commit

Permalink
imp - Don't invoke msbuild directly
Browse files Browse the repository at this point in the history
---

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
  • Loading branch information
AptiviCEO committed Aug 22, 2024
1 parent 48cc7fc commit 3217ade
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions tools/build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tools/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3217ade

Please # to comment.