godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Mono: Show custom error explaining that UWP is not supported

Browse Source 
Fixes #64490.
This commit is contained in:
Rémi Verschelde
2022-08-23 12:47:53 +02:00
parent aeabd3dcb9
commit ceef056146
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
platform/uwp/export/export.cpp
View File

@@ -29,6 +29,7 @@
/*************************************************************************/ /*************************************************************************/
#include "export.h" #include "export.h"
#include "core/bind/core_bind.h" #include "core/bind/core_bind.h"
#include "core/crypto/crypto_core.h" #include "core/crypto/crypto_core.h"
#include "core/io/marshalls.h" #include "core/io/marshalls.h"
@@ -42,6 +43,12 @@
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "platform/uwp/logo.gen.h" #include "platform/uwp/logo.gen.h"
// Mono build doesn't support UWP, so we show a specific error.
// We don't bypass the whole logic so that it doesn't lose potential UWP presets
// added to export_presets.cfg from a non-Mono build (and in case third-parties
// actually have Mono-enabled UWP templates they can use).
#include "modules/modules_enabled.gen.h" // For mono.
#include "thirdparty/minizip/unzip.h" #include "thirdparty/minizip/unzip.h"
#include "thirdparty/minizip/zip.h" #include "thirdparty/minizip/zip.h"
@@ -1110,11 +1117,20 @@ public:
} }
valid = dvalid || rvalid; valid = dvalid || rvalid;
#ifdef MODULE_MONO_ENABLED
// If this is a Mono build, provide a custom error so that users are not confused.
// We don't bypass the whole logic to check templates because third-parties might have
// Mono-enabled UWP builds using this path.
r_missing_templates = false; // Don't warn about those.
r_error = TTR("Godot's Mono version does not support the UWP platform. Use the standard build (no C# support) if you wish to target UWP.");
#else
r_missing_templates = !valid; r_missing_templates = !valid;
if (!err.empty()) { if (!err.empty()) {
r_error = err; r_error = err;
} }
#endif // MODULE_MONO_ENABLED
return valid; return valid;
} }
@@ -1123,6 +1139,17 @@ public:
String err; String err;
bool valid = true; bool valid = true;
#ifdef MODULE_MONO_ENABLED
// Don't warn about project configuration issue if this is a Mono build
// without custom-provided Mono-enabled UWP templates.
// We check if we have valid templates to decide if we should actually
// validate the config.
bool tmp;
if (!has_valid_export_configuration(p_preset, err, tmp)) {
return false;
}
#endif // MODULE_MONO_ENABLED
// Validate the rest of the configuration. // Validate the rest of the configuration.
if (!_valid_resource_name(p_preset->get("package/short_name"))) { if (!_valid_resource_name(p_preset->get("package/short_name"))) {