Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #71638 from raulsntos/dotnet/export-plugin

Browse source 
C#: Implement `ExportPlugin::_get_name` and move `GLOBAL_DEF` to CSharpLanguage
This commit is contained in:
Rémi Verschelde 2023-01-18 22:29:37 +01:00
commit 5dd3a6dbe2
No known key found for this signature in database
GPG key ID: C3336907360768E1
5 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/mono/csharp_script.cpp
View file

@ -113,6 +113,11 @@ void CSharpLanguage::init() {
BindingsGenerator::handle_cmdline_args(cmdline_args);
#endif
GLOBAL_DEF("dotnet/project/assembly_name", "");
#ifdef TOOLS_ENABLED
GLOBAL_DEF("dotnet/project/solution_directory", "");
#endif
gdmono = memnew(GDMono);
gdmono->initialize();

2
modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
View file

@ -17,6 +17,8 @@ namespace GodotTools.Export
{
public partial class ExportPlugin : EditorExportPlugin
{
public override string _GetName() => "C#";
private List<string> _tempFolders = new List<string>();
public void RegisterExportSettings()

2
modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
View file

@ -411,8 +411,6 @@ namespace GodotTools
_editorSettings = editorInterface.GetEditorSettings();
GodotSharpDirs.RegisterProjectSettings();
_errorDialog = new AcceptDialog();
editorBaseControl.AddChild(_errorDialog);

6
modules/mono/editor/GodotTools/GodotTools/Internals/GodotSharpDirs.cs
View file

@ -48,12 +48,6 @@ namespace GodotTools.Internals
}
}
public static void RegisterProjectSettings()
{
GlobalDef("dotnet/project/assembly_name", "");
GlobalDef("dotnet/project/solution_directory", "");
}
public static void DetermineProjectLocation()
{
static string DetermineProjectName()