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 70f7e34 commit 77af55f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tools/build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ if "%buildoptions%" == "*=" set buildoptions=

:download
echo Downloading packages...
"%ProgramFiles%\dotnet\dotnet.exe" msbuild "..\Nitrocid.sln" -t:restore -p:Configuration=%releaseconfig% %buildoptions%
"%ProgramFiles%\dotnet\dotnet.exe" restore "..\Nitrocid.sln" --configuration %releaseconfig% %buildoptions%
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 "..\Nitrocid.sln" -p:Configuration=%releaseconfig% -maxCpuCount:1 %buildoptions%
"%ProgramFiles%\dotnet\dotnet.exe" build "..\Nitrocid.sln" --configuration %releaseconfig% -maxCpuCount:1 %buildoptions%
if %errorlevel% == 0 goto :success
echo There was an error trying to build (%errorlevel%).
goto :finished
Expand Down
4 changes: 2 additions & 2 deletions tools/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ fi

# Download packages
echo Downloading packages...
"$dotnetpath" msbuild "../Nitrocid.sln" -t:restore -p:Configuration=$ksreleaseconf ${@:2}
"$dotnetpath" restore "../Nitrocid.sln" --configuration $ksreleaseconf ${@:2}
if [ ! $? == 0 ]; then
echo Download failed.
exit 1
fi

# Build KS
echo Building KS...
"$dotnetpath" msbuild "../Nitrocid.sln" -p:Configuration=$ksreleaseconf -maxCpuCount:1 ${@:2}
"$dotnetpath" build "../Nitrocid.sln" --configuration $ksreleaseconf -maxCpuCount:1 ${@:2}
if [ ! $? == 0 ]; then
echo Build failed.
exit 1
Expand Down

0 comments on commit 77af55f

Please sign in to comment.