From d30afba2274df2bfe3a53a5a61c17cc6f0936f4a Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Sat, 28 Nov 2020 23:56:02 +0200 Subject: [PATCH] Use msbuild from .NET Core rather than Mono Signed-off-by: Dimitar Dobrev --- build/build.sh | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/build/build.sh b/build/build.sh index 28b6080d..830c026e 100755 --- a/build/build.sh +++ b/build/build.sh @@ -35,8 +35,7 @@ build() config=$(tr '[:upper:]' '[:lower:]' <<< ${configuration}_$platform) make -C $builddir/gmake/ fi - find_msbuild - $msbuild $slnpath -p:Configuration=$configuration -p:Platform=$platform -v:$verbosity + dotnet build $slnpath -p:Configuration=$configuration -p:Platform=$platform -v:$verbosity if [ $ci = true ]; then test @@ -56,8 +55,7 @@ generate() restore() { - find_msbuild - $msbuild $slnpath -p:Configuration=$configuration -p:Platform=$platform -v:$verbosity -t:restore + dotnet build $slnpath -p:Configuration=$configuration -p:Platform=$platform -v:$verbosity -t:restore } test() @@ -135,15 +133,6 @@ detect_os() os=$oshost } -find_msbuild() -{ - if [ -x "$(command -v MSBuild.exe)" ]; then - msbuild="MSBuild.exe" - else - msbuild="msbuild" - fi -} - cmd=$(tr '[:upper:]' '[:lower:]' <<< $1) detect_os download_premake