diff --git a/KoreBuild-dotnet/build/KoreBuild.cmd b/KoreBuild-dotnet/build/KoreBuild.cmd index 3b91726b08..1a57a355eb 100644 --- a/KoreBuild-dotnet/build/KoreBuild.cmd +++ b/KoreBuild-dotnet/build/KoreBuild.cmd @@ -22,10 +22,16 @@ IF NOT EXIST xunit.core ( "%NUGET_PATH%" install xunit.core -ExcludeVersion -Source https://api.nuget.org/v3/index.json -o %~dp0 ) +IF "%KOREBUILD_SKIP_RUNTIME_INSTALL%"=="1" ( + ECHO Skipping runtime installation because KOREBUILD_SKIP_RUNTIME_INSTALL = 1 + GOTO :SKIP_RUNTIME_INSTALL +) + SET DOTNET_LOCAL_INSTALL_FOLDER=%LOCALAPPDATA%\Microsoft\dotnet\cli SET DOTNET_LOCAL_INSTALL_FOLDER_BIN=%DOTNET_LOCAL_INSTALL_FOLDER%\bin CALL %~dp0dotnet-install.cmd -version "1.0.0.000973" + ECHO Adding %DOTNET_LOCAL_INSTALL_FOLDER_BIN% to PATH SET PATH=%DOTNET_LOCAL_INSTALL_FOLDER_BIN%;%PATH% ECHO Setting DOTNET_HOME to %DOTNET_LOCAL_INSTALL_FOLDER% @@ -42,7 +48,9 @@ IF "%SKIP_DNX_INSTALL%"=="" ( CALL %KOREBUILD_FOLDER%\build\dnvm use default -runtime CLR -arch x86 ) REM ============================ - + +:SKIP_RUNTIME_INSTALL + SET MAKEFILE_PATH=makefile.shade IF NOT EXIST %MAKEFILE_PATH% ( SET MAKEFILE_PATH=%KOREBUILD_FOLDER%\build\makefile.shade diff --git a/KoreBuild-dotnet/build/KoreBuild.sh b/KoreBuild-dotnet/build/KoreBuild.sh index 8fc68e3e28..049db2ec4d 100755 --- a/KoreBuild-dotnet/build/KoreBuild.sh +++ b/KoreBuild-dotnet/build/KoreBuild.sh @@ -46,25 +46,31 @@ fi if [ ! -d $thisDir/xunit.core ]; then mono $nugetPath install xunit.core -ExcludeVersion -o $thisDir -nocache -pre fi -# Need to set this variable because by default the install script -# requires sudo -export DOTNET_INSTALL_DIR=~/.dotnet -export PATH=~/.dotnet/bin:$PATH -export DOTNET_HOME=DOTNET_INSTALL_DIR -export KOREBUILD_FOLDER="$(dirname $thisDir)" -chmod +x $thisDir/dotnet-install.sh -$thisDir/dotnet-install.sh -# ==== Temporary ==== -if ! type dnvm > /dev/null 2>&1; then - source $thisDir/dnvm.sh + +if [ ! -z "$KOREBUILD_SKIP_RUNTIME_INSTALL" ]; then + echo "Skipping runtime installation because KOREBUILD_SKIP_RUNTIME_INSTALL is set" +else + # Need to set this variable because by default the install script + # requires sudo + export DOTNET_INSTALL_DIR=~/.dotnet + export PATH=~/.dotnet/bin:$PATH + export DOTNET_HOME=DOTNET_INSTALL_DIR + export KOREBUILD_FOLDER="$(dirname $thisDir)" + chmod +x $thisDir/dotnet-install.sh + $thisDir/dotnet-install.sh + # ==== Temporary ==== + if ! type dnvm > /dev/null 2>&1; then + source $thisDir/dnvm.sh + fi + if ! type dnx > /dev/null 2>&1 || [ -z "$SKIP_DNX_INSTALL" ]; then + dnvm install latest -runtime coreclr -alias default + dnvm install default -runtime mono -alias default + else + dnvm use default -runtime mono + fi + # ============ fi - if ! type dnx > /dev/null 2>&1 || [ -z "$SKIP_DNX_INSTALL" ]; then - dnvm install latest -runtime coreclr -alias default - dnvm install default -runtime mono -alias default - else - dnvm use default -runtime mono -fi -# ============ + # Probe for Mono Reference assemblies if [ -z "$DOTNET_REFERENCE_ASSEMBLIES_PATH" ]; then if [ $(uname) == Darwin ] && [ -d "/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/xbuild-frameworks" ]; then