Skip to content

Commit

Permalink
Update netcore to 5.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
viferga committed May 27, 2021
1 parent 9113282 commit ad7ed1b
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions source/loaders/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ endif()
option(OPTION_BUILD_LOADERS_C "Build C Foreign Function Interface library loader plugin." OFF)
option(OPTION_BUILD_LOADERS_COB "Build GNU/COBOL 2.2 loader plugin." OFF)
option(OPTION_BUILD_LOADERS_CR "Build Crystal 0.33.0 loader plugin." OFF)
option(OPTION_BUILD_LOADERS_CS "Build C# CoreCLR 5.0.5 Runtime loader plugin." OFF)
option(OPTION_BUILD_LOADERS_CS "Build C# CoreCLR 5.0.6 Runtime loader plugin." OFF)
option(OPTION_BUILD_LOADERS_DART "Build Dart VM 2.8.4 Runtime loader plugin." OFF)
option(OPTION_BUILD_LOADERS_FILE "Build File System loader plugin." OFF)
option(OPTION_BUILD_LOADERS_JAVA "Build Java Virtual Machine loader plugin." OFF)
Expand All @@ -29,7 +29,7 @@ add_subdirectory(c_loader) # Foreign Function Interface library
add_subdirectory(cob_loader) # GNU/Cobol 2.2 Runtime
add_subdirectory(cr_loader) # Crystal 0.33.0 Runtime
add_subdirectory(dart_loader) # Dart VM 2.8.4 Runtime
add_subdirectory(cs_loader) # CoreCLR 5.0.5 Runtime
add_subdirectory(cs_loader) # CoreCLR 5.0.6 Runtime
add_subdirectory(file_loader) # File System
add_subdirectory(java_loader) # Java Virtual Machine
add_subdirectory(jl_loader) # Julia Runtime
Expand Down
1 change: 1 addition & 0 deletions tools/metacall-clear.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ sub_python(){
/usr/bin/yes | $SUDO_CMD pip3 uninstall django
/usr/bin/yes | $SUDO_CMD pip3 uninstall requests
/usr/bin/yes | $SUDO_CMD pip3 uninstall rsa
/usr/bin/yes | $SUDO_CMD pip3 uninstall fn
/usr/bin/yes | $SUDO_CMD pip3 uninstall joblib
}

Expand Down
2 changes: 1 addition & 1 deletion tools/metacall-configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ sub_configure() {
if [ $BUILD_NETCORE5 = 1 ]; then
BUILD_STRING="$BUILD_STRING \
-DOPTION_BUILD_LOADERS_CS=On \
-DDOTNET_CORE_PATH=/usr/share/dotnet/shared/Microsoft.NETCore.App/5.0.5/"
-DDOTNET_CORE_PATH=/usr/share/dotnet/shared/Microsoft.NETCore.App/5.0.6/"

if [ $BUILD_SCRIPTS = 1 ]; then
BUILD_STRING="$BUILD_STRING -DOPTION_BUILD_SCRIPTS_CS=On"
Expand Down
3 changes: 2 additions & 1 deletion tools/metacall-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ sub_python(){
$SUDO_CMD pip3 install setuptools
$SUDO_CMD pip3 install wheel
$SUDO_CMD pip3 install rsa
$SUDO_CMD pip3 install fn
$SUDO_CMD pip3 install scipy
$SUDO_CMD pip3 install numpy
$SUDO_CMD pip3 install scikit-learn
Expand Down Expand Up @@ -338,7 +339,7 @@ sub_metacall(){
elif [ INSTALL_NETCORE2 = 1 ]; then
NETCORE_VERSION=2.2.8
elif [ INSTALL_NETCORE5 = 1 ]; then
NETCORE_VERSION=5.0.5
NETCORE_VERSION=5.0.6
else
NETCORE_VERSION=0
fi
Expand Down
2 changes: 1 addition & 1 deletion tools/metacall-runtime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ sub_netcore5(){
rm packages-microsoft-prod.deb

$SUDO_CMD apt-get update
sub_apt_install_hold dotnet-runtime-5.0=5.0.5-1
sub_apt_install_hold dotnet-runtime-5.0=5.0.6-1
}

# V8
Expand Down

0 comments on commit ad7ed1b

Please sign in to comment.