xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Merge branch 'main' into SP3-1-Rendering

This commit is contained in:
Brandon Mak 2022-09-16 14:09:14 +08:00
parent eb975d96c6 7a7807b7fa
commit 4b168fb2d7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SHADE_Engine/src/Scripting/SHDotNetRuntime.cpp
View File

@ -126,7 +126,7 @@ namespace SHADE
throwIfFailed("[DotNetRuntime] Failed to initialize CoreCLR.", result); throwIfFailed("[DotNetRuntime] Failed to initialize CoreCLR.", result);
initialised = true; 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() void SHDotNetRuntime::Exit()
@ -144,7 +144,7 @@ namespace SHADE
domainId = 0; domainId = 0;
initialised = false; initialised = false;
SHLOG_INFO("[DotNetRuntime] Successfully shut down the .NET 6.0 Runtime."); SHLOG_INFO("[DotNetRuntime] Successfully shut down the .NET 5.0 Runtime.");
} }
/*---------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------*/

4
SHADE_Engine/src/Scripting/SHScriptEngine.cpp
View File

@ -190,7 +190,7 @@ namespace SHADE
} }
// Prepare directory (delete useless files) // Prepare directory (delete useless files)
deleteFolder("net6.0"); deleteFolder("net5.0");
deleteFolder("ref"); deleteFolder("ref");
deleteFolder("../SHADE_Scripting"); deleteFolder("../SHADE_Scripting");
deleteFolder("../obj"); deleteFolder("../obj");
@ -236,7 +236,7 @@ namespace SHADE
static std::string_view FILE_CONTENTS = static std::string_view FILE_CONTENTS =
"<Project Sdk=\"Microsoft.NET.Sdk\">\n\ "<Project Sdk=\"Microsoft.NET.Sdk\">\n\
<PropertyGroup>\n\ <PropertyGroup>\n\
<TargetFramework>net6.0</TargetFramework>\n\ <TargetFramework>net5.0</TargetFramework>\n\
<Platforms>x64</Platforms>\n\ <Platforms>x64</Platforms>\n\
<Configurations>Release;Debug</Configurations>\n\ <Configurations>Release;Debug</Configurations>\n\
</PropertyGroup>\n\ </PropertyGroup>\n\

2
SHADE_Managed/premake5.lua
View File

@ -2,7 +2,7 @@ project "SHADE_Managed"
kind "SharedLib" kind "SharedLib"
language "C++" language "C++"
clr "NetCore" clr "NetCore"
dotnetframework "net6.0" dotnetframework "net5.0"
cppdialect "C++17" cppdialect "C++17"
targetdir (outputdir) targetdir (outputdir)
objdir (interdir) objdir (interdir)