From 57393ad7e48be9effeece77ebf27bf712b6c9613 Mon Sep 17 00:00:00 2001 From: Kah Wei Date: Wed, 14 Sep 2022 20:29:40 +0800 Subject: [PATCH] Updated projects to use .NET 6.0 --- 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 6226949e..89603524 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 5.0 Runtime."); + SHLOG_INFO("[DotNetRuntime] Successfully loaded the .NET 6.0 Runtime."); } void SHDotNetRuntime::Exit() @@ -144,7 +144,7 @@ namespace SHADE domainId = 0; initialised = false; - SHLOG_INFO("[DotNetRuntime] Successfully shut down the .NET 5.0 Runtime."); + SHLOG_INFO("[DotNetRuntime] Successfully shut down the .NET 6.0 Runtime."); } /*---------------------------------------------------------------------------------*/ diff --git a/SHADE_Engine/src/Scripting/SHScriptEngine.cpp b/SHADE_Engine/src/Scripting/SHScriptEngine.cpp index 682841cd..cb8f24c9 100644 --- a/SHADE_Engine/src/Scripting/SHScriptEngine.cpp +++ b/SHADE_Engine/src/Scripting/SHScriptEngine.cpp @@ -183,7 +183,7 @@ namespace SHADE constexpr std::string_view BUILD_LOG_PATH = "../Build.log"; // Prepare directory (delete useless files) - deleteFolder("net5.0"); + deleteFolder("net6.0"); deleteFolder("ref"); deleteFolder("../SHADE_Scripting"); deleteFolder("../obj"); @@ -229,7 +229,7 @@ namespace SHADE static std::string_view FILE_CONTENTS = "\n\ \n\ - net5.0\n\ + net6.0\n\ x64\n\ Release;Debug\n\ \n\ diff --git a/SHADE_Managed/premake5.lua b/SHADE_Managed/premake5.lua index 0cbf0288..4651e68e 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 "net5.0" + dotnetframework "net6.0" cppdialect "C++17" targetdir ("bin/" .. outputdir .. "/%{prj.name}") objdir ("bin-int/" .. outputdir .. "/%{prj.name}")