diff --git a/Source/Engine/Scripting/Runtime/DotNet.cpp b/Source/Engine/Scripting/Runtime/DotNet.cpp index cc041d886..f4b37e869 100644 --- a/Source/Engine/Scripting/Runtime/DotNet.cpp +++ b/Source/Engine/Scripting/Runtime/DotNet.cpp @@ -28,7 +28,7 @@ #include "Engine/Profiler/ProfilerCPU.h" #include "Engine/Threading/Threading.h" #include "Engine/Debug/Exceptions/CLRInnerException.h" -#if DOTNET_HOST_CORECRL +#if DOTNET_HOST_CORECLR #include #include #include @@ -1478,7 +1478,7 @@ void* GetCustomAttribute(const MClass* klass, const MClass* attributeClass) return CallStaticMethod(GetCustomAttributePtr, klass->GetNative(), attributeClass ? attributeClass->GetNative() : nullptr); } -#if DOTNET_HOST_CORECRL +#if DOTNET_HOST_CORECLR const char_t* NativeInteropTypeName = FLAX_CORECLR_TEXT("FlaxEngine.Interop.NativeInterop, FlaxEngine.CSharp"); hostfxr_initialize_for_runtime_config_fn hostfxr_initialize_for_runtime_config; diff --git a/Source/ThirdParty/nethost/nethost.Build.cs b/Source/ThirdParty/nethost/nethost.Build.cs index 666aff56b..380ec4d11 100644 --- a/Source/ThirdParty/nethost/nethost.Build.cs +++ b/Source/ThirdParty/nethost/nethost.Build.cs @@ -49,7 +49,7 @@ public class nethost : ThirdPartyModule case TargetPlatform.XboxOne: case TargetPlatform.XboxScarlett: case TargetPlatform.UWP: - if (hostRuntime.Type == DotNetSdk.HostType.CoreCRL) + if (hostRuntime.Type == DotNetSdk.HostType.CoreCLR) { options.OutputFiles.Add(Path.Combine(hostRuntime.Path, "nethost.lib")); options.DependencyFiles.Add(Path.Combine(hostRuntime.Path, "nethost.dll")); @@ -93,10 +93,10 @@ public class nethost : ThirdPartyModule options.PublicDefinitions.Add("DOTNET_HOST_RUNTIME_IDENTIFIER=" + DotNetSdk.GetHostRuntimeIdentifier(options.Platform.Target, options.Architecture)); switch (hostRuntime.Type) { - case DotNetSdk.HostType.CoreCRL: + case DotNetSdk.HostType.CoreCLR: { - // Use CoreCRL for runtime hosting - options.PublicDefinitions.Add("DOTNET_HOST_CORECRL"); + // Use CoreCLR for runtime hosting + options.PublicDefinitions.Add("DOTNET_HOST_CORECLR"); options.PublicIncludePaths.Add(hostRuntime.Path); break; } diff --git a/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs b/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs index 5eb9fdc0e..39ee0d374 100644 --- a/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs +++ b/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs @@ -32,9 +32,9 @@ namespace Flax.Build public enum HostType { /// - /// Core CRL runtime. + /// Core CLR runtime. /// - CoreCRL, + CoreCLR, /// /// Old-school Mono runtime. @@ -73,7 +73,7 @@ namespace Flax.Build case TargetPlatform.Windows: case TargetPlatform.Linux: case TargetPlatform.Mac: - Type = HostType.CoreCRL; + Type = HostType.CoreCLR; break; default: Type = HostType.Mono;