From 032dc7946a168526f1d1afeabd72132be436072f Mon Sep 17 00:00:00 2001 From: Kitsune4295 Date: Mon, 21 Jul 2025 20:08:55 -0500 Subject: [PATCH] Refactored .Net Glue to ship Redot versions of Nuget packages --- .../mono/build_scripts/build_assemblies.py | 28 +++++++++---------- modules/mono/csharp_script.cpp | 2 +- ...ot.NET.Sdk.csproj => Redot.NET.Sdk.csproj} | 3 +- .../Godot.NET.Sdk/Sdk/Sdk.targets | 6 ++-- .../Godot.NET.Sdk/Sdk/iOSNativeAOT.targets | 2 +- ...j => Redot.SourceGenerators.Sample.csproj} | 7 +++-- .../CSharpSourceGeneratorVerifier.cs | 2 +- ...oj => Redot.SourceGenerators.Tests.csproj} | 5 ++-- .../ScriptPathAttributeGeneratorTests.cs | 2 +- .../ClassPartialModifierAnalyzer.cs | 2 +- .../ExtensionMethods.cs | 4 +-- .../GlobalClassAnalyzer.cs | 2 +- .../Godot.SourceGenerators/MarshalUtils.cs | 6 ++-- ...s.csproj => Redot.SourceGenerators.csproj} | 5 ++-- ...ors.props => Redot.SourceGenerators.props} | 0 .../ScriptPropertiesGenerator.cs | 4 +-- .../ScriptPropertyDefValGenerator.cs | 8 +++--- .../ScriptSignalsGenerator.cs | 3 ++ .../{Godot.NET.Sdk.sln => Redot.NET.Sdk.sln} | 10 +++---- ...r.csproj => RedotTools.BuildLogger.csproj} | 1 + ....csproj => RedotTools.IdeMessaging.csproj} | 3 +- .../GodotTools.OpenVisualStudio/Program.cs | 2 +- ...roj => RedotTools.OpenVisualStudio.csproj} | 1 + .../ProjectGenerator.cs | 2 +- ...csproj => RedotTools.ProjectEditor.csproj} | 5 ++-- ...Shared.csproj => RedotTools.Shared.csproj} | 1 + .../GodotTools/Build/BuildSystem.cs | 2 +- .../GodotTools/Build/MSBuildPanel.cs | 2 +- .../GodotTools/GodotTools/GodotSharpEditor.cs | 4 +-- .../{GodotTools.csproj => RedotTools.csproj} | 24 ++++++++-------- .../FileUtils.cs | 0 .../ProcessExtensions.cs | 0 .../RedotTools.Core.csproj} | 1 + .../StringExtensions.cs | 0 .../{GodotTools.sln => RedotTools.sln} | 18 ++++++------ ...=> Redot.SourceGenerators.Internal.csproj} | 1 + .../mono/glue/GodotSharp/GodotPlugins/Main.cs | 4 +-- .../GodotPlugins/PluginLoadContext.cs | 2 +- ...odotPlugins.csproj => RedotPlugins.csproj} | 3 +- .../Core/Bridge/ScriptManagerBridge.cs | 2 +- .../GodotSharp/Core/GodotObject.base.cs | 2 +- .../GodotSharp/Properties/AssemblyInfo.cs | 2 +- .../{GodotSharp.csproj => RedotSharp.csproj} | 4 +-- ...Settings => RedotSharp.csproj.DotSettings} | 0 ...pEditor.csproj => RedotSharpEditor.csproj} | 4 +-- ...gs => RedotSharpEditor.csproj.DotSettings} | 0 .../{GodotSharp.sln => RedotSharp.sln} | 8 +++--- .../GodotSharp/RedotSharp.sln.DotSettings | 8 ++++++ modules/mono/mono_gd/gd_mono.cpp | 6 ++-- 49 files changed, 119 insertions(+), 94 deletions(-) rename modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/{Godot.NET.Sdk.csproj => Redot.NET.Sdk.csproj} (95%) rename modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/{Godot.SourceGenerators.Sample.csproj => Redot.SourceGenerators.Sample.csproj} (87%) rename modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/{Godot.SourceGenerators.Tests.csproj => Redot.SourceGenerators.Tests.csproj} (92%) rename modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/{Godot.SourceGenerators.csproj => Redot.SourceGenerators.csproj} (91%) rename modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/{Godot.SourceGenerators.props => Redot.SourceGenerators.props} (100%) rename modules/mono/editor/Godot.NET.Sdk/{Godot.NET.Sdk.sln => Redot.NET.Sdk.sln} (80%) rename modules/mono/editor/GodotTools/GodotTools.BuildLogger/{GodotTools.BuildLogger.csproj => RedotTools.BuildLogger.csproj} (87%) rename modules/mono/editor/GodotTools/GodotTools.IdeMessaging/{GodotTools.IdeMessaging.csproj => RedotTools.IdeMessaging.csproj} (91%) rename modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/{GodotTools.OpenVisualStudio.csproj => RedotTools.OpenVisualStudio.csproj} (93%) rename modules/mono/editor/GodotTools/GodotTools.ProjectEditor/{GodotTools.ProjectEditor.csproj => RedotTools.ProjectEditor.csproj} (79%) rename modules/mono/editor/GodotTools/GodotTools.Shared/{GodotTools.Shared.csproj => RedotTools.Shared.csproj} (87%) rename modules/mono/editor/GodotTools/GodotTools/{GodotTools.csproj => RedotTools.csproj} (72%) rename modules/mono/editor/GodotTools/{GodotTools.Core => RedotTools.Core}/FileUtils.cs (100%) rename modules/mono/editor/GodotTools/{GodotTools.Core => RedotTools.Core}/ProcessExtensions.cs (100%) rename modules/mono/editor/GodotTools/{GodotTools.Core/GodotTools.Core.csproj => RedotTools.Core/RedotTools.Core.csproj} (84%) rename modules/mono/editor/GodotTools/{GodotTools.Core => RedotTools.Core}/StringExtensions.cs (100%) rename modules/mono/editor/GodotTools/{GodotTools.sln => RedotTools.sln} (78%) rename modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/{Godot.SourceGenerators.Internal.csproj => Redot.SourceGenerators.Internal.csproj} (88%) rename modules/mono/glue/GodotSharp/GodotPlugins/{GodotPlugins.csproj => RedotPlugins.csproj} (79%) rename modules/mono/glue/GodotSharp/GodotSharp/{GodotSharp.csproj => RedotSharp.csproj} (98%) rename modules/mono/glue/GodotSharp/GodotSharp/{GodotSharp.csproj.DotSettings => RedotSharp.csproj.DotSettings} (100%) rename modules/mono/glue/GodotSharp/GodotSharpEditor/{GodotSharpEditor.csproj => RedotSharpEditor.csproj} (95%) rename modules/mono/glue/GodotSharp/GodotSharpEditor/{GodotSharpEditor.csproj.DotSettings => RedotSharpEditor.csproj.DotSettings} (100%) rename modules/mono/glue/GodotSharp/{GodotSharp.sln => RedotSharp.sln} (80%) create mode 100644 modules/mono/glue/GodotSharp/RedotSharp.sln.DotSettings diff --git a/modules/mono/build_scripts/build_assemblies.py b/modules/mono/build_scripts/build_assemblies.py index bf990468ef..f4f0d9dbbe 100755 --- a/modules/mono/build_scripts/build_assemblies.py +++ b/modules/mono/build_scripts/build_assemblies.py @@ -196,15 +196,15 @@ def run_msbuild(tools: ToolsLocation, sln: str, chdir_to: str, msbuild_args: Opt def build_godot_api(msbuild_tool, module_dir, output_dir, push_nupkgs_local, precision, no_deprecated, werror): target_filenames = [ - "GodotSharp.dll", - "GodotSharp.pdb", - "GodotSharp.xml", - "GodotSharpEditor.dll", - "GodotSharpEditor.pdb", - "GodotSharpEditor.xml", - "GodotPlugins.dll", - "GodotPlugins.pdb", - "GodotPlugins.runtimeconfig.json", + "RedotSharp.dll", + "RedotSharp.pdb", + "RedotSharp.xml", + "RedotSharpEditor.dll", + "RedotSharpEditor.pdb", + "RedotSharpEditor.xml", + "RedotPlugins.dll", + "RedotPlugins.pdb", + "RedotPlugins.runtimeconfig.json", ] for build_config in ["Debug", "Release"]: @@ -222,7 +222,7 @@ def build_godot_api(msbuild_tool, module_dir, output_dir, push_nupkgs_local, pre if werror: args += ["/p:TreatWarningsAsErrors=true"] - sln = os.path.join(module_dir, "glue/GodotSharp/GodotSharp.sln") + sln = os.path.join(module_dir, "glue/GodotSharp/RedotSharp.sln") exit_code = run_msbuild(msbuild_tool, sln=sln, chdir_to=module_dir, msbuild_args=args) if exit_code != 0: return exit_code @@ -354,7 +354,7 @@ def build_all( return exit_code # GodotTools - sln = os.path.join(module_dir, "editor/GodotTools/GodotTools.sln") + sln = os.path.join(module_dir, "editor/GodotTools/RedotTools.sln") args = ["/restore", "/t:Build", "/p:Configuration=" + ("Debug" if dev_debug else "Release")] + ( ["/p:GodotPlatform=" + godot_platform] if godot_platform else [] ) @@ -374,7 +374,7 @@ def build_all( args += ["/p:GodotFloat64=true"] if no_deprecated: args += ["/p:GodotNoDeprecated=true"] - sln = os.path.join(module_dir, "editor/Godot.NET.Sdk/Godot.NET.Sdk.sln") + sln = os.path.join(module_dir, "editor/Godot.NET.Sdk/Redot.NET.Sdk.sln") exit_code = run_msbuild(msbuild_tool, sln=sln, chdir_to=module_dir, msbuild_args=args) if exit_code != 0: return exit_code @@ -392,7 +392,7 @@ def main(): "--dev-debug", action="store_true", default=False, - help="Build GodotTools and Godot.NET.Sdk with 'Configuration=Debug'", + help="Build RedotTools and Redot.NET.Sdk with 'Configuration=Debug'", ) parser.add_argument("--godot-platform", type=str, default="") parser.add_argument("--mono-prefix", type=str, default="") @@ -404,7 +404,7 @@ def main(): "--no-deprecated", action="store_true", default=False, - help="Build GodotSharp without using deprecated features. This is required, if the engine was built with 'deprecated=no'.", + help="Build RedotSharp without using deprecated features. This is required, if the engine was built with 'deprecated=no'.", ) parser.add_argument("--werror", action="store_true", default=False, help="Treat compiler warnings as errors.") diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 7c956e815d..e444a4b0a6 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -1081,7 +1081,7 @@ void CSharpLanguage::_editor_init_callback() { const void **interop_funcs = godotsharp::get_editor_interop_funcs(interop_funcs_size); Object *editor_plugin_obj = GDMono::get_singleton()->get_plugin_callbacks().LoadToolsAssemblyCallback( - GodotSharpDirs::get_data_editor_tools_dir().path_join("GodotTools.dll").utf16().get_data(), + GodotSharpDirs::get_data_editor_tools_dir().path_join("RedotTools.dll").utf16().get_data(), interop_funcs, interop_funcs_size); CRASH_COND(editor_plugin_obj == nullptr); diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Redot.NET.Sdk.csproj similarity index 95% rename from modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj rename to modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Redot.NET.Sdk.csproj index 000798271b..a3ae38354b 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Redot.NET.Sdk.csproj @@ -6,7 +6,7 @@ MSBuild .NET Sdk for Redot projects. Redot Engine contributors - Godot.NET.Sdk + Redot.NET.Sdk 4.5.0 $(PackageVersion_Godot_NET_Sdk) https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk @@ -20,6 +20,7 @@ true false + Godot.NET.Sdk diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets index 80749a9e11..3cc949ccab 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets @@ -25,13 +25,13 @@ - + - - + + diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/iOSNativeAOT.targets b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/iOSNativeAOT.targets index 2ac8e48517..02fb332b95 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/iOSNativeAOT.targets +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/iOSNativeAOT.targets @@ -1,6 +1,6 @@ - + diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/Godot.SourceGenerators.Sample.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/Redot.SourceGenerators.Sample.csproj similarity index 87% rename from modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/Godot.SourceGenerators.Sample.csproj rename to modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/Redot.SourceGenerators.Sample.csproj index bbb180914c..47338b095c 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/Godot.SourceGenerators.Sample.csproj +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/Redot.SourceGenerators.Sample.csproj @@ -3,6 +3,7 @@ net8.0 12 + Godot.SourceGenerators.Sample @@ -22,14 +23,14 @@ - + False - + - + diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/CSharpSourceGeneratorVerifier.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/CSharpSourceGeneratorVerifier.cs index 975f9f4e3f..75ddef664f 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/CSharpSourceGeneratorVerifier.cs +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/CSharpSourceGeneratorVerifier.cs @@ -77,6 +77,6 @@ where TSourceGenerator : ISourceGenerator, new() private static string FullGeneratedSourceName(string name) { var generatorType = typeof(TSourceGenerator); - return Path.Combine(generatorType.Namespace!, generatorType.FullName!, name); + return Path.Combine(generatorType.Namespace!.Replace("Godot", "Redot"), generatorType.FullName!, name); } } diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/Godot.SourceGenerators.Tests.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/Redot.SourceGenerators.Tests.csproj similarity index 92% rename from modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/Godot.SourceGenerators.Tests.csproj rename to modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/Redot.SourceGenerators.Tests.csproj index 676facf90d..4a348c2682 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/Godot.SourceGenerators.Tests.csproj +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/Redot.SourceGenerators.Tests.csproj @@ -7,6 +7,7 @@ enable false true + Godot.SourceGenerators.Tests @@ -33,8 +34,8 @@ - - + + diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/ScriptPathAttributeGeneratorTests.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/ScriptPathAttributeGeneratorTests.cs index 4f6b50cf02..252f6a0f02 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/ScriptPathAttributeGeneratorTests.cs +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/ScriptPathAttributeGeneratorTests.cs @@ -13,7 +13,7 @@ public class ScriptPathAttributeGeneratorTests private static (string, SourceText) MakeAssemblyScriptTypesGeneratedSource(ICollection types) { return ( - Path.Combine("Godot.SourceGenerators", "Godot.SourceGenerators.ScriptPathAttributeGenerator", "AssemblyScriptTypes.generated.cs"), + Path.Combine("Redot.SourceGenerators", "Godot.SourceGenerators.ScriptPathAttributeGenerator", "AssemblyScriptTypes.generated.cs"), SourceText.From($$""" [assembly:Godot.AssemblyHasScriptsAttribute(new System.Type[] {{{string.Join(", ", types.Select(type => $"typeof({type})"))}}})] diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ClassPartialModifierAnalyzer.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ClassPartialModifierAnalyzer.cs index e4bdb8db84..59636583aa 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ClassPartialModifierAnalyzer.cs +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ClassPartialModifierAnalyzer.cs @@ -32,7 +32,7 @@ namespace Godot.SourceGenerators if (context.ContainingSymbol is not INamedTypeSymbol typeSymbol) return; - if (!typeSymbol.InheritsFrom("GodotSharp", GodotClasses.GodotObject)) + if (!typeSymbol.InheritsFrom("RedotSharp", GodotClasses.GodotObject)) return; if (!classDeclaration.IsPartial()) diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs index 12e2538943..a717212f5c 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs @@ -54,7 +54,7 @@ namespace Godot.SourceGenerators while (symbol != null) { - if (symbol.ContainingAssembly?.Name == "GodotSharp") + if (symbol.ContainingAssembly?.Name == "RedotSharp") return symbol; symbol = symbol.BaseType; @@ -91,7 +91,7 @@ namespace Godot.SourceGenerators var classTypeSymbol = sm.GetDeclaredSymbol(cds); if (classTypeSymbol?.BaseType == null - || !classTypeSymbol.BaseType.InheritsFrom("GodotSharp", GodotClasses.GodotObject)) + || !classTypeSymbol.BaseType.InheritsFrom("RedotSharp", GodotClasses.GodotObject)) { symbol = null; return false; diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/GlobalClassAnalyzer.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/GlobalClassAnalyzer.cs index 22af25b9c4..5cdc1b682c 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/GlobalClassAnalyzer.cs +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/GlobalClassAnalyzer.cs @@ -37,7 +37,7 @@ namespace Godot.SourceGenerators )); } - if (!typeSymbol.InheritsFrom("GodotSharp", GodotClasses.GodotObject)) + if (!typeSymbol.InheritsFrom("RedotSharp", GodotClasses.GodotObject)) { context.ReportDiagnostic(Diagnostic.Create( Common.GlobalClassMustDeriveFromGodotObjectRule, diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/MarshalUtils.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/MarshalUtils.cs index f5f51722b4..56aef873ee 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/MarshalUtils.cs +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/MarshalUtils.cs @@ -125,7 +125,7 @@ namespace Godot.SourceGenerators if (typeKind == TypeKind.Struct) { - if (type.ContainingAssembly?.Name == "GodotSharp" && + if (type.ContainingAssembly?.Name == "RedotSharp" && type.ContainingNamespace?.Name == "Godot") { return type switch @@ -182,7 +182,7 @@ namespace Godot.SourceGenerators if (elementType.SimpleDerivesFrom(typeCache.GodotObjectType)) return MarshalType.GodotObjectOrDerivedArray; - if (elementType.ContainingAssembly?.Name == "GodotSharp" && + if (elementType.ContainingAssembly?.Name == "RedotSharp" && elementType.ContainingNamespace?.Name == "Godot") { switch (elementType) @@ -211,7 +211,7 @@ namespace Godot.SourceGenerators if (type.SimpleDerivesFrom(typeCache.GodotObjectType)) return MarshalType.GodotObjectOrDerived; - if (type.ContainingAssembly?.Name == "GodotSharp") + if (type.ContainingAssembly?.Name == "RedotSharp") { switch (type.ContainingNamespace?.Name) { diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Redot.SourceGenerators.csproj similarity index 91% rename from modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj rename to modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Redot.SourceGenerators.csproj index ecf36ef1bc..aa231a5ccb 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Redot.SourceGenerators.csproj @@ -4,12 +4,13 @@ 10 enable true + Godot.SourceGenerators Core C# source generator for Godot projects. Godot Engine contributors - Godot.SourceGenerators + Redot.SourceGenerators 4.5.0 $(PackageVersion_Godot_SourceGenerators) https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators @@ -35,6 +36,6 @@ - + diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.props b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Redot.SourceGenerators.props similarity index 100% rename from modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.props rename to modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Redot.SourceGenerators.props diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertiesGenerator.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertiesGenerator.cs index ca517b534d..07a2849d97 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertiesGenerator.cs +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertiesGenerator.cs @@ -716,7 +716,7 @@ namespace Godot.SourceGenerators return true; } - if (memberNamedType.InheritsFrom("GodotSharp", "Godot.Resource")) + if (memberNamedType.InheritsFrom("RedotSharp", "Godot.Resource")) { hint = PropertyHint.ResourceType; hintString = GetTypeName(memberNamedType); @@ -724,7 +724,7 @@ namespace Godot.SourceGenerators return true; } - if (memberNamedType.InheritsFrom("GodotSharp", "Godot.Node")) + if (memberNamedType.InheritsFrom("RedotSharp", "Godot.Node")) { hint = PropertyHint.NodeType; hintString = GetTypeName(memberNamedType); diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertyDefValGenerator.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertyDefValGenerator.cs index 96faab4aae..480f15495d 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertyDefValGenerator.cs +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertyDefValGenerator.cs @@ -69,7 +69,7 @@ namespace Godot.SourceGenerators : string.Empty; bool hasNamespace = classNs.Length != 0; - bool isNode = symbol.InheritsFrom("GodotSharp", GodotClasses.Node); + bool isNode = symbol.InheritsFrom("RedotSharp", GodotClasses.Node); bool isInnerClass = symbol.ContainingType != null; @@ -533,18 +533,18 @@ namespace Godot.SourceGenerators { if (marshalType == MarshalType.GodotObjectOrDerived) { - return memberType.InheritsFrom("GodotSharp", GodotClasses.Node); + return memberType.InheritsFrom("RedotSharp", GodotClasses.Node); } if (marshalType == MarshalType.GodotObjectOrDerivedArray) { var elementType = ((IArrayTypeSymbol)memberType).ElementType; - return elementType.InheritsFrom("GodotSharp", GodotClasses.Node); + return elementType.InheritsFrom("RedotSharp", GodotClasses.Node); } if (memberType is INamedTypeSymbol { IsGenericType: true } genericType) { return genericType.TypeArguments .Any(static typeArgument - => typeArgument.InheritsFrom("GodotSharp", GodotClasses.Node)); + => typeArgument.InheritsFrom("RedotSharp", GodotClasses.Node)); } return false; diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptSignalsGenerator.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptSignalsGenerator.cs index 4bc0a42266..527a3d88d8 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptSignalsGenerator.cs +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptSignalsGenerator.cs @@ -1,7 +1,10 @@ +using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Text; using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln b/modules/mono/editor/Godot.NET.Sdk/Redot.NET.Sdk.sln similarity index 80% rename from modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln rename to modules/mono/editor/Godot.NET.Sdk/Redot.NET.Sdk.sln index 2c78645493..a4191be179 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln +++ b/modules/mono/editor/Godot.NET.Sdk/Redot.NET.Sdk.sln @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.9.34728.123 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Godot.NET.Sdk", "Godot.NET.Sdk\Godot.NET.Sdk.csproj", "{31B00BFA-DEA1-42FA-A472-9E54A92A8A5F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Redot.NET.Sdk", "Godot.NET.Sdk\Redot.NET.Sdk.csproj", "{31B00BFA-DEA1-42FA-A472-9E54A92A8A5F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Godot.SourceGenerators", "Godot.SourceGenerators\Godot.SourceGenerators.csproj", "{32D31B23-2A45-4099-B4F5-95B4C8FF7D9F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Redot.SourceGenerators", "Godot.SourceGenerators\Redot.SourceGenerators.csproj", "{32D31B23-2A45-4099-B4F5-95B4C8FF7D9F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Godot.SourceGenerators.Sample", "Godot.SourceGenerators.Sample\Godot.SourceGenerators.Sample.csproj", "{7297A614-8DF5-43DE-9EAD-99671B26BD1F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Redot.SourceGenerators.Sample", "Godot.SourceGenerators.Sample\Redot.SourceGenerators.Sample.csproj", "{7297A614-8DF5-43DE-9EAD-99671B26BD1F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Godot.SourceGenerators.Tests", "Godot.SourceGenerators.Tests\Godot.SourceGenerators.Tests.csproj", "{07E6D201-35C9-4463-9B29-D16621EA733D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Redot.SourceGenerators.Tests", "Godot.SourceGenerators.Tests\Redot.SourceGenerators.Tests.csproj", "{07E6D201-35C9-4463-9B29-D16621EA733D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotSharp", "..\..\glue\GodotSharp\GodotSharp\GodotSharp.csproj", "{AEBF0036-DA76-4341-B651-A3F2856AB2FA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedotSharp", "..\..\glue\GodotSharp\GodotSharp\RedotSharp.csproj", "{AEBF0036-DA76-4341-B651-A3F2856AB2FA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj b/modules/mono/editor/GodotTools/GodotTools.BuildLogger/RedotTools.BuildLogger.csproj similarity index 87% rename from modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj rename to modules/mono/editor/GodotTools/GodotTools.BuildLogger/RedotTools.BuildLogger.csproj index f807132509..56b7d9e474 100644 --- a/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj +++ b/modules/mono/editor/GodotTools/GodotTools.BuildLogger/RedotTools.BuildLogger.csproj @@ -4,6 +4,7 @@ net6.0 10 enable + GodotTools.BuildLogger diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotTools.IdeMessaging.csproj b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/RedotTools.IdeMessaging.csproj similarity index 91% rename from modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotTools.IdeMessaging.csproj rename to modules/mono/editor/GodotTools/GodotTools.IdeMessaging/RedotTools.IdeMessaging.csproj index 2ee28715bf..2f0284607c 100644 --- a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotTools.IdeMessaging.csproj +++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/RedotTools.IdeMessaging.csproj @@ -4,7 +4,7 @@ netstandard2.0 9 enable - GodotTools.IdeMessaging + RedotTools.IdeMessaging 1.1.2 $(Version) Godot Engine contributors @@ -19,6 +19,7 @@ It's intended for use in IDEs/editors plugins for a better experience working wi A client using this library is only compatible with servers of the same major version and of a lower or equal minor version. + GodotTools.IdeMessaging diff --git a/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs b/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs index 5bf07f626b..d6a3073485 100644 --- a/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs +++ b/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs @@ -24,7 +24,7 @@ namespace GodotTools.OpenVisualStudio Console.WriteLine("If an existing instance for the solution is not found, a new one is created."); Console.WriteLine(); Console.WriteLine("Usage:"); - Console.WriteLine(@" GodotTools.OpenVisualStudio.exe solution [file[;line[;col]]...]"); + Console.WriteLine(@" RedotTools.OpenVisualStudio.exe solution [file[;line[;col]]...]"); Console.WriteLine(); Console.WriteLine("Lines and columns begin at one. Zero or lower will result in an error."); Console.WriteLine("If a line is specified but a column is not, the line is selected in the text editor."); diff --git a/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj b/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/RedotTools.OpenVisualStudio.csproj similarity index 93% rename from modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj rename to modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/RedotTools.OpenVisualStudio.csproj index 208e6d8f41..cb29aa54b7 100644 --- a/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj +++ b/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/RedotTools.OpenVisualStudio.csproj @@ -7,6 +7,7 @@ enable False LatestMajor + GodotTools.OpenVisualStudio $(SolutionDir)/../../../../bin/GodotSharp/Tools diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs index e969f31c8b..06522a6b26 100644 --- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs +++ b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs @@ -10,7 +10,7 @@ namespace GodotTools.ProjectEditor { public static class ProjectGenerator { - public static string GodotSdkAttrValue => $"Godot.NET.Sdk/{GeneratedGodotNupkgsVersions.GodotNETSdk}"; + public static string GodotSdkAttrValue => $"Redot.NET.Sdk/{GeneratedGodotNupkgsVersions.GodotNETSdk}"; public static string GodotMinimumRequiredTfm => "net8.0"; diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/GodotTools.ProjectEditor.csproj b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/RedotTools.ProjectEditor.csproj similarity index 79% rename from modules/mono/editor/GodotTools/GodotTools.ProjectEditor/GodotTools.ProjectEditor.csproj rename to modules/mono/editor/GodotTools/GodotTools.ProjectEditor/RedotTools.ProjectEditor.csproj index 157e2bac79..da7777ef51 100644 --- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/GodotTools.ProjectEditor.csproj +++ b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/RedotTools.ProjectEditor.csproj @@ -5,6 +5,7 @@ net8.0 12 enable + GodotTools.ProjectEditor @@ -15,8 +16,8 @@ - - + + diff --git a/modules/mono/editor/GodotTools/GodotTools.Shared/GodotTools.Shared.csproj b/modules/mono/editor/GodotTools/GodotTools.Shared/RedotTools.Shared.csproj similarity index 87% rename from modules/mono/editor/GodotTools/GodotTools.Shared/GodotTools.Shared.csproj rename to modules/mono/editor/GodotTools/GodotTools.Shared/RedotTools.Shared.csproj index a281853f68..3c2a420534 100644 --- a/modules/mono/editor/GodotTools/GodotTools.Shared/GodotTools.Shared.csproj +++ b/modules/mono/editor/GodotTools/GodotTools.Shared/RedotTools.Shared.csproj @@ -5,6 +5,7 @@ 12 false + GodotTools.Shared diff --git a/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs b/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs index 5ae4dfa076..2dd6e7bb2b 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs @@ -264,7 +264,7 @@ namespace GodotTools.Build private static void AddLoggerArgument(BuildInfo buildInfo, Collection arguments) { string buildLoggerPath = Path.Combine(Internals.GodotSharpDirs.DataEditorToolsDir, - "GodotTools.BuildLogger.dll"); + "RedotTools.BuildLogger.dll"); arguments.Add( $"-l:{typeof(GodotBuildLogger).FullName},{buildLoggerPath};{buildInfo.LogsDirPath}"); diff --git a/modules/mono/editor/GodotTools/GodotTools/Build/MSBuildPanel.cs b/modules/mono/editor/GodotTools/GodotTools/Build/MSBuildPanel.cs index 986da47860..afc5d7e0cb 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Build/MSBuildPanel.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Build/MSBuildPanel.cs @@ -290,7 +290,7 @@ namespace GodotTools.Build UpdateBuildLogText(); // NOTE: - // Currently, GodotTools is loaded in its own load context. This load context is not reloaded, but the script still are. + // Currently, RedotTools is loaded in its own load context. This load context is not reloaded, but the script still are. // Until that changes, we need workarounds like this one because events keep strong references to disposed objects. BuildManager.BuildLaunchFailed -= BuildLaunchFailed; BuildManager.BuildStarted -= BuildStarted; diff --git a/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs b/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs index 50aa6811b0..9ff706d075 100644 --- a/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs +++ b/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs @@ -260,7 +260,7 @@ namespace GodotTools var args = new List { - Path.Combine(GodotSharpDirs.DataEditorToolsDir, "GodotTools.OpenVisualStudio.dll"), + Path.Combine(GodotSharpDirs.DataEditorToolsDir, "RedotTools.OpenVisualStudio.dll"), GodotSharpDirs.ProjectSlnPath, line >= 0 ? $"{scriptPath};{line + 1};{col + 1}" : scriptPath }; @@ -741,7 +741,7 @@ namespace GodotTools var populateConstructorMethod = AppDomain.CurrentDomain .GetAssemblies() - .First(x => x.GetName().Name == "GodotSharpEditor") + .First(x => x.GetName().Name == "RedotSharpEditor") .GetType("Godot.EditorConstructors")? .GetMethod("AddEditorConstructors", BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public); diff --git a/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj b/modules/mono/editor/GodotTools/GodotTools/RedotTools.csproj similarity index 72% rename from modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj rename to modules/mono/editor/GodotTools/GodotTools/RedotTools.csproj index e027b7df0c..39cc069ce7 100644 --- a/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj +++ b/modules/mono/editor/GodotTools/GodotTools/RedotTools.csproj @@ -13,6 +13,7 @@ $(GodotOutputDataDir)/Api/$(GodotApiConfiguration) false true + GodotTools @@ -24,7 +25,7 @@ - + $(GodotOutputDataDir)/Tools @@ -37,26 +38,27 @@ - - $(GodotApiAssembliesDir)/GodotSharp.dll + + $(GodotApiAssembliesDir)/RedotSharp.dll False - - $(GodotApiAssembliesDir)/GodotSharpEditor.dll + + $(GodotApiAssembliesDir)/RedotSharpEditor.dll False - - + + + - - - - + + + + diff --git a/modules/mono/editor/GodotTools/GodotTools.Core/FileUtils.cs b/modules/mono/editor/GodotTools/RedotTools.Core/FileUtils.cs similarity index 100% rename from modules/mono/editor/GodotTools/GodotTools.Core/FileUtils.cs rename to modules/mono/editor/GodotTools/RedotTools.Core/FileUtils.cs diff --git a/modules/mono/editor/GodotTools/GodotTools.Core/ProcessExtensions.cs b/modules/mono/editor/GodotTools/RedotTools.Core/ProcessExtensions.cs similarity index 100% rename from modules/mono/editor/GodotTools/GodotTools.Core/ProcessExtensions.cs rename to modules/mono/editor/GodotTools/RedotTools.Core/ProcessExtensions.cs diff --git a/modules/mono/editor/GodotTools/GodotTools.Core/GodotTools.Core.csproj b/modules/mono/editor/GodotTools/RedotTools.Core/RedotTools.Core.csproj similarity index 84% rename from modules/mono/editor/GodotTools/GodotTools.Core/GodotTools.Core.csproj rename to modules/mono/editor/GodotTools/RedotTools.Core/RedotTools.Core.csproj index 833f6b269a..f548b31007 100644 --- a/modules/mono/editor/GodotTools/GodotTools.Core/GodotTools.Core.csproj +++ b/modules/mono/editor/GodotTools/RedotTools.Core/RedotTools.Core.csproj @@ -5,6 +5,7 @@ net8.0 12 enable + GodotTools.Core diff --git a/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs b/modules/mono/editor/GodotTools/RedotTools.Core/StringExtensions.cs similarity index 100% rename from modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs rename to modules/mono/editor/GodotTools/RedotTools.Core/StringExtensions.cs diff --git a/modules/mono/editor/GodotTools/GodotTools.sln b/modules/mono/editor/GodotTools/RedotTools.sln similarity index 78% rename from modules/mono/editor/GodotTools/GodotTools.sln rename to modules/mono/editor/GodotTools/RedotTools.sln index 1182e2467b..b5fbedf1ed 100644 --- a/modules/mono/editor/GodotTools/GodotTools.sln +++ b/modules/mono/editor/GodotTools/RedotTools.sln @@ -3,23 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.9.34728.123 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotTools.ProjectEditor", "GodotTools.ProjectEditor\GodotTools.ProjectEditor.csproj", "{A8CDAD94-C6D4-4B19-A7E7-76C53CC92984}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedotTools.ProjectEditor", "GodotTools.ProjectEditor\RedotTools.ProjectEditor.csproj", "{A8CDAD94-C6D4-4B19-A7E7-76C53CC92984}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotTools", "GodotTools\GodotTools.csproj", "{27B00618-A6F2-4828-B922-05CAEB08C286}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedotTools", "GodotTools\RedotTools.csproj", "{27B00618-A6F2-4828-B922-05CAEB08C286}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotTools.Core", "GodotTools.Core\GodotTools.Core.csproj", "{639E48BD-44E5-4091-8EDD-22D36DC0768D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedotTools.Core", "RedotTools.Core\RedotTools.Core.csproj", "{639E48BD-44E5-4091-8EDD-22D36DC0768D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotTools.BuildLogger", "GodotTools.BuildLogger\GodotTools.BuildLogger.csproj", "{6CE9A984-37B1-4F8A-8FE9-609F05F071B3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedotTools.BuildLogger", "GodotTools.BuildLogger\RedotTools.BuildLogger.csproj", "{6CE9A984-37B1-4F8A-8FE9-609F05F071B3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotTools.IdeMessaging", "GodotTools.IdeMessaging\GodotTools.IdeMessaging.csproj", "{92600954-25F0-4291-8E11-1FEE9FC4BE20}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedotTools.IdeMessaging", "GodotTools.IdeMessaging\RedotTools.IdeMessaging.csproj", "{92600954-25F0-4291-8E11-1FEE9FC4BE20}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotTools.OpenVisualStudio", "GodotTools.OpenVisualStudio\GodotTools.OpenVisualStudio.csproj", "{EAFFF236-FA96-4A4D-BD23-0E51EF988277}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedotTools.OpenVisualStudio", "GodotTools.OpenVisualStudio\RedotTools.OpenVisualStudio.csproj", "{EAFFF236-FA96-4A4D-BD23-0E51EF988277}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotTools.Shared", "GodotTools.Shared\GodotTools.Shared.csproj", "{2758FFAF-8237-4CF2-B569-66BF8B3587BB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedotTools.Shared", "GodotTools.Shared\RedotTools.Shared.csproj", "{2758FFAF-8237-4CF2-B569-66BF8B3587BB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Godot.SourceGenerators", "..\Godot.NET.Sdk\Godot.SourceGenerators\Godot.SourceGenerators.csproj", "{D8C421B2-8911-41EB-B983-F675C7141EB7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Redot.SourceGenerators", "..\Godot.NET.Sdk\Godot.SourceGenerators\Redot.SourceGenerators.csproj", "{D8C421B2-8911-41EB-B983-F675C7141EB7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Godot.SourceGenerators.Internal", "..\..\glue\GodotSharp\Godot.SourceGenerators.Internal\Godot.SourceGenerators.Internal.csproj", "{55666071-BEC1-4A52-8A98-9A4A7A947DBF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Redot.SourceGenerators.Internal", "..\..\glue\GodotSharp\Godot.SourceGenerators.Internal\Redot.SourceGenerators.Internal.csproj", "{55666071-BEC1-4A52-8A98-9A4A7A947DBF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/Godot.SourceGenerators.Internal.csproj b/modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/Redot.SourceGenerators.Internal.csproj similarity index 88% rename from modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/Godot.SourceGenerators.Internal.csproj rename to modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/Redot.SourceGenerators.Internal.csproj index d291199ad0..dbea705ec1 100644 --- a/modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/Godot.SourceGenerators.Internal.csproj +++ b/modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/Redot.SourceGenerators.Internal.csproj @@ -5,6 +5,7 @@ 10 enable true + Godot.SourceGenerators.Internal diff --git a/modules/mono/glue/GodotSharp/GodotPlugins/Main.cs b/modules/mono/glue/GodotSharp/GodotPlugins/Main.cs index 36a8130f79..149b17ceeb 100644 --- a/modules/mono/glue/GodotSharp/GodotPlugins/Main.cs +++ b/modules/mono/glue/GodotSharp/GodotPlugins/Main.cs @@ -105,7 +105,7 @@ namespace GodotPlugins if (_editorHint) { - _editorApiAssembly = Assembly.Load("GodotSharpEditor"); + _editorApiAssembly = Assembly.Load("RedotSharpEditor"); SharedAssemblies.Add(_editorApiAssembly.GetName()); NativeLibrary.SetDllImportResolver(_editorApiAssembly, _dllImportResolver); } @@ -183,7 +183,7 @@ namespace GodotPlugins if (method == null) { - throw new MissingMethodException("GodotTools.GodotSharpEditor", + throw new MissingMethodException("GodotTools.RedotSharpEditor", "InternalCreateInstance"); } diff --git a/modules/mono/glue/GodotSharp/GodotPlugins/PluginLoadContext.cs b/modules/mono/glue/GodotSharp/GodotPlugins/PluginLoadContext.cs index 93baf4e51c..d472581f16 100644 --- a/modules/mono/glue/GodotSharp/GodotPlugins/PluginLoadContext.cs +++ b/modules/mono/glue/GodotSharp/GodotPlugins/PluginLoadContext.cs @@ -37,7 +37,7 @@ namespace GodotPlugins } else { - // TODO: How to log from GodotPlugins? (delegate pointer?) + // TODO: How to log from RedotPlugins? (delegate pointer?) Console.Error.WriteLine("Failed to set AppContext.BaseDirectory. Dynamic loading of libraries may fail."); } } diff --git a/modules/mono/glue/GodotSharp/GodotPlugins/GodotPlugins.csproj b/modules/mono/glue/GodotSharp/GodotPlugins/RedotPlugins.csproj similarity index 79% rename from modules/mono/glue/GodotSharp/GodotPlugins/GodotPlugins.csproj rename to modules/mono/glue/GodotSharp/GodotPlugins/RedotPlugins.csproj index 6d557c1eac..defb4ea53b 100644 --- a/modules/mono/glue/GodotSharp/GodotPlugins/GodotPlugins.csproj +++ b/modules/mono/glue/GodotSharp/GodotPlugins/RedotPlugins.csproj @@ -9,10 +9,11 @@ true LatestMajor + GodotPlugins - + diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs index 0ed36d43ed..22f625963c 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs @@ -294,7 +294,7 @@ namespace Godot.Bridge } } - // Called from GodotPlugins + // Called from RedotPlugins // ReSharper disable once UnusedMember.Local public static void LookupScriptsInAssembly(Assembly assembly) { diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotObject.base.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotObject.base.cs index 52ce86d728..58b776286a 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotObject.base.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotObject.base.cs @@ -203,7 +203,7 @@ namespace Godot if (ReflectionUtils.IsEditorHintCached) { - return t.Assembly.GetName().Name == "GodotSharpEditor"; + return t.Assembly.GetName().Name == "RedotSharpEditor"; } return false; diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Properties/AssemblyInfo.cs b/modules/mono/glue/GodotSharp/GodotSharp/Properties/AssemblyInfo.cs index da6f293871..664351b2a5 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Properties/AssemblyInfo.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Properties/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("GodotSharpEditor")] +[assembly: InternalsVisibleTo("RedotSharpEditor")] diff --git a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj b/modules/mono/glue/GodotSharp/GodotSharp/RedotSharp.csproj similarity index 98% rename from modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj rename to modules/mono/glue/GodotSharp/GodotSharp/RedotSharp.csproj index 78c2981fea..1b738b534d 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharp/RedotSharp.csproj @@ -18,7 +18,7 @@ Godot C# Core API. Godot Engine contributors - GodotSharp + RedotSharp 4.5.0 $(PackageVersion_GodotSharp) https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharp @@ -49,7 +49,7 @@ - + diff --git a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj.DotSettings b/modules/mono/glue/GodotSharp/GodotSharp/RedotSharp.csproj.DotSettings similarity index 100% rename from modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj.DotSettings rename to modules/mono/glue/GodotSharp/GodotSharp/RedotSharp.csproj.DotSettings diff --git a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj b/modules/mono/glue/GodotSharp/GodotSharpEditor/RedotSharpEditor.csproj similarity index 95% rename from modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj rename to modules/mono/glue/GodotSharp/GodotSharpEditor/RedotSharpEditor.csproj index f7a7f7a7ff..80d060f5cf 100644 --- a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharpEditor/RedotSharpEditor.csproj @@ -14,7 +14,7 @@ Godot C# Editor API. Godot Engine contributors - GodotSharpEditor + RedotSharpEditor 4.5.0 $(PackageVersion_GodotSharp) https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharpEditor @@ -31,7 +31,7 @@ REAL_T_IS_DOUBLE;$(DefineConstants) - + false diff --git a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj.DotSettings b/modules/mono/glue/GodotSharp/GodotSharpEditor/RedotSharpEditor.csproj.DotSettings similarity index 100% rename from modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj.DotSettings rename to modules/mono/glue/GodotSharp/GodotSharpEditor/RedotSharpEditor.csproj.DotSettings diff --git a/modules/mono/glue/GodotSharp/GodotSharp.sln b/modules/mono/glue/GodotSharp/RedotSharp.sln similarity index 80% rename from modules/mono/glue/GodotSharp/GodotSharp.sln rename to modules/mono/glue/GodotSharp/RedotSharp.sln index 81ff7d7550..a68b9ec1d9 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp.sln +++ b/modules/mono/glue/GodotSharp/RedotSharp.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.9.34728.123 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotSharp", "GodotSharp\GodotSharp.csproj", "{AEBF0036-DA76-4341-B651-A3F2856AB2FA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedotSharp", "GodotSharp\RedotSharp.csproj", "{AEBF0036-DA76-4341-B651-A3F2856AB2FA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotSharpEditor", "GodotSharpEditor\GodotSharpEditor.csproj", "{8FBEC238-D944-4074-8548-B3B524305905}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedotSharpEditor", "GodotSharpEditor\RedotSharpEditor.csproj", "{8FBEC238-D944-4074-8548-B3B524305905}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotPlugins", "GodotPlugins\GodotPlugins.csproj", "{944B77DB-497B-47F5-A1E3-81C35E3E9D4E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedotPlugins", "GodotPlugins\RedotPlugins.csproj", "{944B77DB-497B-47F5-A1E3-81C35E3E9D4E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Godot.SourceGenerators.Internal", "Godot.SourceGenerators.Internal\Godot.SourceGenerators.Internal.csproj", "{7749662B-E30C-419A-B745-13852573360A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Redot.SourceGenerators.Internal", "Godot.SourceGenerators.Internal\Redot.SourceGenerators.Internal.csproj", "{7749662B-E30C-419A-B745-13852573360A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/modules/mono/glue/GodotSharp/RedotSharp.sln.DotSettings b/modules/mono/glue/GodotSharp/RedotSharp.sln.DotSettings new file mode 100644 index 0000000000..65f33e43a8 --- /dev/null +++ b/modules/mono/glue/GodotSharp/RedotSharp.sln.DotSettings @@ -0,0 +1,8 @@ + + GC + True + True + True + True + True + True diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp index 71cbf1a8ce..bbeff5ad8c 100644 --- a/modules/mono/mono_gd/gd_mono.cpp +++ b/modules/mono/mono_gd/gd_mono.cpp @@ -432,10 +432,10 @@ godot_plugins_initialize_fn initialize_hostfxr_and_godot_plugins(bool &r_runtime godot_plugins_initialize_fn godot_plugins_initialize = nullptr; HostFxrCharString godot_plugins_path = str_to_hostfxr( - GodotSharpDirs::get_api_assemblies_dir().path_join("GodotPlugins.dll")); + GodotSharpDirs::get_api_assemblies_dir().path_join("RedotPlugins.dll")); HostFxrCharString config_path = str_to_hostfxr( - GodotSharpDirs::get_api_assemblies_dir().path_join("GodotPlugins.runtimeconfig.json")); + GodotSharpDirs::get_api_assemblies_dir().path_join("RedotPlugins.runtimeconfig.json")); load_assembly_and_get_function_pointer_fn load_assembly_and_get_function_pointer = initialize_hostfxr_for_config(get_data(config_path)); @@ -451,7 +451,7 @@ godot_plugins_initialize_fn initialize_hostfxr_and_godot_plugins(bool &r_runtime print_verbose(".NET: hostfxr initialized"); int rc = load_assembly_and_get_function_pointer(get_data(godot_plugins_path), - HOSTFXR_STR("GodotPlugins.Main, GodotPlugins"), + HOSTFXR_STR("GodotPlugins.Main, RedotPlugins"), HOSTFXR_STR("InitializeFromEngine"), UNMANAGEDCALLERSONLY_METHOD, nullptr,