From e8b46f8b1937f73ca478095a72a53ba0ce076bb4 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Wed, 20 Nov 2024 22:37:51 +0100 Subject: [PATCH] Fix dotnet runtime version selection with min/max range #3058 --- Source/Editor/Cooker/CookingData.h | 4 +++- Source/Editor/Cooker/Steps/DeployDataStep.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Editor/Cooker/CookingData.h b/Source/Editor/Cooker/CookingData.h index 8fe930335..51df2a1ac 100644 --- a/Source/Editor/Cooker/CookingData.h +++ b/Source/Editor/Cooker/CookingData.h @@ -19,7 +19,9 @@ class PlatformTools; #define GAME_BUILD_DOTNET_VER TEXT("") #endif -#define COOKER_MIN_DOTNET_RUNTIME_VERSION 8 +// Range of dotnet runtime versions +#define GAME_BUILD_DOTNET_RUNTIME_MIN_VER 8 +#define GAME_BUILD_DOTNET_RUNTIME_MAX_VER 9 /// /// Game building options. Used as flags. diff --git a/Source/Editor/Cooker/Steps/DeployDataStep.cpp b/Source/Editor/Cooker/Steps/DeployDataStep.cpp index a6f6c40b2..6b1a6829e 100644 --- a/Source/Editor/Cooker/Steps/DeployDataStep.cpp +++ b/Source/Editor/Cooker/Steps/DeployDataStep.cpp @@ -121,7 +121,7 @@ bool DeployDataStep::Perform(CookingData& data) int majorVersion = 0; if (dot != -1) StringUtils::Parse(version.Substring(0, dot).Get(), &majorVersion); - if (majorVersion >= COOKER_MIN_DOTNET_RUNTIME_VERSION) // Check for major part of 8.0 + if (majorVersion < GAME_BUILD_DOTNET_RUNTIME_MIN_VER || majorVersion > GAME_BUILD_DOTNET_RUNTIME_MAX_VER) // Check for major part version.Clear(); } Sorting::QuickSort(versions);