From ad7ed1bfe963509c0738d6ef489e058c1ae9fd48 Mon Sep 17 00:00:00 2001 From: Vicente Ferrer Date: Thu, 27 May 2021 17:18:27 +0200 Subject: [PATCH] Update netcore to 5.0.6 --- source/loaders/CMakeLists.txt | 4 ++-- tools/metacall-clear.sh | 1 + tools/metacall-configure.sh | 2 +- tools/metacall-environment.sh | 3 ++- tools/metacall-runtime.sh | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/source/loaders/CMakeLists.txt b/source/loaders/CMakeLists.txt index 56de857e2..465b8a15c 100644 --- a/source/loaders/CMakeLists.txt +++ b/source/loaders/CMakeLists.txt @@ -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) @@ -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 diff --git a/tools/metacall-clear.sh b/tools/metacall-clear.sh index 03035bfa1..ce922622b 100755 --- a/tools/metacall-clear.sh +++ b/tools/metacall-clear.sh @@ -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 } diff --git a/tools/metacall-configure.sh b/tools/metacall-configure.sh index 1de3c9a3a..af5bd6785 100755 --- a/tools/metacall-configure.sh +++ b/tools/metacall-configure.sh @@ -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" diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 98ba54851..691817c40 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -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 @@ -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 diff --git a/tools/metacall-runtime.sh b/tools/metacall-runtime.sh index ee6ef790b..e051ba475 100755 --- a/tools/metacall-runtime.sh +++ b/tools/metacall-runtime.sh @@ -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