From aaf3d67eedce3c399aca91e95795db0937d6e09d Mon Sep 17 00:00:00 2001 From: Kah Wei Date: Fri, 16 Sep 2022 14:02:55 +0800 Subject: [PATCH] Downgraded back to .NET 5.0 due to lack of VS 2019 support --- SHADE_Engine/src/Scripting/SHDotNetRuntime.cpp | 4 ++-- SHADE_Engine/src/Scripting/SHScriptEngine.cpp | 4 ++-- SHADE_Managed/premake5.lua | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SHADE_Engine/src/Scripting/SHDotNetRuntime.cpp b/SHADE_Engine/src/Scripting/SHDotNetRuntime.cpp index 89603524..6226949e 100644 --- a/SHADE_Engine/src/Scripting/SHDotNetRuntime.cpp +++ b/SHADE_Engine/src/Scripting/SHDotNetRuntime.cpp @@ -126,7 +126,7 @@ namespace SHADE throwIfFailed("[DotNetRuntime] Failed to initialize CoreCLR.", result); initialised = true; - SHLOG_INFO("[DotNetRuntime] Successfully loaded the .NET 6.0 Runtime."); + SHLOG_INFO("[DotNetRuntime] Successfully loaded the .NET 5.0 Runtime."); } void SHDotNetRuntime::Exit() @@ -144,7 +144,7 @@ namespace SHADE domainId = 0; initialised = false; - SHLOG_INFO("[DotNetRuntime] Successfully shut down the .NET 6.0 Runtime."); + SHLOG_INFO("[DotNetRuntime] Successfully shut down the .NET 5.0 Runtime."); } /*---------------------------------------------------------------------------------*/ diff --git a/SHADE_Engine/src/Scripting/SHScriptEngine.cpp b/SHADE_Engine/src/Scripting/SHScriptEngine.cpp index 47c722dd..09f6ecec 100644 --- a/SHADE_Engine/src/Scripting/SHScriptEngine.cpp +++ b/SHADE_Engine/src/Scripting/SHScriptEngine.cpp @@ -190,7 +190,7 @@ namespace SHADE } // Prepare directory (delete useless files) - deleteFolder("net6.0"); + deleteFolder("net5.0"); deleteFolder("ref"); deleteFolder("../SHADE_Scripting"); deleteFolder("../obj"); @@ -236,7 +236,7 @@ namespace SHADE static std::string_view FILE_CONTENTS = "\n\ \n\ - net6.0\n\ + net5.0\n\ x64\n\ Release;Debug\n\ \n\ diff --git a/SHADE_Managed/premake5.lua b/SHADE_Managed/premake5.lua index 092e92af..e50e9e86 100644 --- a/SHADE_Managed/premake5.lua +++ b/SHADE_Managed/premake5.lua @@ -2,7 +2,7 @@ project "SHADE_Managed" kind "SharedLib" language "C++" clr "NetCore" - dotnetframework "net6.0" + dotnetframework "net5.0" cppdialect "C++17" targetdir (outputdir) objdir (interdir) -- 2.40.1