GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix .NET files deploy regression on AOT platforms

Browse Source
This commit is contained in:
Wojtek Figat
2025-03-10 18:46:15 +01:00
parent 52c09b95ca
commit 48343897cd
1 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Source/Editor/Cooker/Steps/DeployDataStep.cpp
View File

@@ -214,31 +214,39 @@ bool DeployDataStep::Perform(CookingData& data)
FileSystem::NormalizePath(srcDotnet); FileSystem::NormalizePath(srcDotnet);
LOG(Info, "Using .NET Runtime {} at {}", TEXT("Host"), srcDotnet); LOG(Info, "Using .NET Runtime {} at {}", TEXT("Host"), srcDotnet);
// Get major Version // Get .NET runtime version
Array<String> pathParts;
srcDotnet.Split('/', pathParts);
String version; String version;
for (int i = 0; i < pathParts.Count(); i++) if (usAOT)
{ {
if (pathParts[i] == TEXT("runtimes")) // Precompiled
version = StringUtils::ToString(GAME_BUILD_DOTNET_RUNTIME_MIN_VER);
}
else
{
// Detect from path
Array<String> pathParts;
srcDotnet.Split('/', pathParts);
for (int i = 0; i < pathParts.Count(); i++)
{ {
Array<String> versionParts; if (pathParts[i] == TEXT("runtimes"))
pathParts[i - 1].Split('.', versionParts);
if (!versionParts.IsEmpty())
{ {
const String majorVersion = versionParts[0].TrimTrailing(); Array<String> versionParts;
int32 versionNum; pathParts[i - 1].Split('.', versionParts);
StringUtils::Parse(*majorVersion, majorVersion.Length(), &versionNum); if (!versionParts.IsEmpty())
if (Math::IsInRange(versionNum, GAME_BUILD_DOTNET_RUNTIME_MIN_VER, GAME_BUILD_DOTNET_RUNTIME_MAX_VER)) // Check for major part {
version = majorVersion; const String majorVersion = versionParts[0].TrimTrailing();
int32 versionNum;
StringUtils::Parse(*majorVersion, majorVersion.Length(), &versionNum);
if (Math::IsInRange(versionNum, GAME_BUILD_DOTNET_RUNTIME_MIN_VER, GAME_BUILD_DOTNET_RUNTIME_MAX_VER)) // Check for major part
version = majorVersion;
}
} }
} }
} if (version.IsEmpty())
{
if (version.IsEmpty()) data.Error(TEXT("Failed to find supported .NET version for the current host platform."));
{ return true;
data.Error(TEXT("Failed to find supported .NET version for the current host platform.")); }
return true;
} }
// Deploy runtime files // Deploy runtime files