Skip to content

Commit 3f7e6d9

Browse files
Spartan322Spartan322
authored
Merge pull request #1052 from Spartan322/4.4-cherry-pick/fix-rebranding-regressions
[4.4] Cherry-picks for the 4.4 branch - 1st rebranding regressions
2 parents 90cbdce + c4cc5c9 commit 3f7e6d9

File tree

50 files changed

+137
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+137
-97
lines changed

‎modules/mono/build_scripts/build_assemblies.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -196,15 +196,15 @@ def run_msbuild(tools: ToolsLocation, sln: str, chdir_to: str, msbuild_args: Opt
196196

197197
def build_godot_api(msbuild_tool, module_dir, output_dir, push_nupkgs_local, precision, no_deprecated, werror):
198198
target_filenames = [
199-
"GodotSharp.dll",
200-
"GodotSharp.pdb",
201-
"GodotSharp.xml",
202-
"GodotSharpEditor.dll",
203-
"GodotSharpEditor.pdb",
204-
"GodotSharpEditor.xml",
205-
"GodotPlugins.dll",
206-
"GodotPlugins.pdb",
207-
"GodotPlugins.runtimeconfig.json",
199+
"RedotSharp.dll",
200+
"RedotSharp.pdb",
201+
"RedotSharp.xml",
202+
"RedotSharpEditor.dll",
203+
"RedotSharpEditor.pdb",
204+
"RedotSharpEditor.xml",
205+
"RedotPlugins.dll",
206+
"RedotPlugins.pdb",
207+
"RedotPlugins.runtimeconfig.json",
208208
]
209209

210210
for build_config in ["Debug", "Release"]:
@@ -222,7 +222,7 @@ def build_godot_api(msbuild_tool, module_dir, output_dir, push_nupkgs_local, pre
222222
if werror:
223223
args += ["/p:TreatWarningsAsErrors=true"]
224224

225-
sln = os.path.join(module_dir, "glue/GodotSharp/GodotSharp.sln")
225+
sln = os.path.join(module_dir, "glue/GodotSharp/RedotSharp.sln")
226226
exit_code = run_msbuild(msbuild_tool, sln=sln, chdir_to=module_dir, msbuild_args=args)
227227
if exit_code != 0:
228228
return exit_code
@@ -354,7 +354,7 @@ def build_all(
354354
return exit_code
355355

356356
# GodotTools
357-
sln = os.path.join(module_dir, "editor/GodotTools/GodotTools.sln")
357+
sln = os.path.join(module_dir, "editor/GodotTools/RedotTools.sln")
358358
args = ["/restore", "/t:Build", "/p:Configuration=" + ("Debug" if dev_debug else "Release")] + (
359359
["/p:GodotPlatform=" + godot_platform] if godot_platform else []
360360
)
@@ -374,7 +374,7 @@ def build_all(
374374
args += ["/p:GodotFloat64=true"]
375375
if no_deprecated:
376376
args += ["/p:GodotNoDeprecated=true"]
377-
sln = os.path.join(module_dir, "editor/Godot.NET.Sdk/Godot.NET.Sdk.sln")
377+
sln = os.path.join(module_dir, "editor/Godot.NET.Sdk/Redot.NET.Sdk.sln")
378378
exit_code = run_msbuild(msbuild_tool, sln=sln, chdir_to=module_dir, msbuild_args=args)
379379
if exit_code != 0:
380380
return exit_code
@@ -392,7 +392,7 @@ def main():
392392
"--dev-debug",
393393
action="store_true",
394394
default=False,
395-
help="Build GodotTools and Godot.NET.Sdk with 'Configuration=Debug'",
395+
help="Build RedotTools and Redot.NET.Sdk with 'Configuration=Debug'",
396396
)
397397
parser.add_argument("--godot-platform", type=str, default="")
398398
parser.add_argument("--mono-prefix", type=str, default="")
@@ -404,7 +404,7 @@ def main():
404404
"--no-deprecated",
405405
action="store_true",
406406
default=False,
407-
help="Build GodotSharp without using deprecated features. This is required, if the engine was built with 'deprecated=no'.",
407+
help="Build RedotSharp without using deprecated features. This is required, if the engine was built with 'deprecated=no'.",
408408
)
409409
parser.add_argument("--werror", action="store_true", default=False, help="Treat compiler warnings as errors.")
410410

‎modules/mono/csharp_script.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,7 @@ void CSharpLanguage::_editor_init_callback() {
10611061
const void **interop_funcs = godotsharp::get_editor_interop_funcs(interop_funcs_size);
10621062

10631063
Object *editor_plugin_obj = GDMono::get_singleton()->get_plugin_callbacks().LoadToolsAssemblyCallback(
1064-
GodotSharpDirs::get_data_editor_tools_dir().path_join("GodotTools.dll").utf16(),
1064+
GodotSharpDirs::get_data_editor_tools_dir().path_join("RedotTools.dll").utf16(),
10651065
interop_funcs, interop_funcs_size);
10661066
CRASH_COND(editor_plugin_obj == nullptr);
10671067

modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj renamed to modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Redot.NET.Sdk.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Description>MSBuild .NET Sdk for Redot projects.</Description>
77
<Authors>Redot Engine contributors</Authors>
88

9-
<PackageId>Godot.NET.Sdk</PackageId>
9+
<PackageId>Redot.NET.Sdk</PackageId>
1010
<Version>4.4.1</Version>
1111
<PackageVersion>$(PackageVersion_Godot_NET_Sdk)</PackageVersion>
1212
<RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk</RepositoryUrl>
@@ -20,6 +20,7 @@
2020
<!-- Exclude target framework from the package dependencies as we don't include the build output -->
2121
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
2222
<IncludeBuildOutput>false</IncludeBuildOutput>
23+
<RootNamespace>Godot.NET.Sdk</RootNamespace>
2324
</PropertyGroup>
2425

2526
<ItemGroup>

‎modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
<!-- C# source generators -->
1414
<ItemGroup Condition=" '$(DisableImplicitGodotGeneratorReferences)' != 'true' ">
15-
<PackageReference Include="Godot.SourceGenerators" Version="$(PackageVersion_Godot_SourceGenerators)" />
15+
<PackageReference Include="Redot.SourceGenerators" Version="$(PackageVersion_Godot_SourceGenerators)" />
1616
</ItemGroup>
1717

1818
<!-- Godot API references -->
1919
<ItemGroup Condition=" '$(DisableImplicitGodotSharpReferences)' != 'true' ">
20-
<PackageReference Include="GodotSharp" Version="$(PackageVersion_GodotSharp)" />
21-
<PackageReference Include="GodotSharpEditor" Version="$(PackageVersion_GodotSharp)" Condition=" '$(Configuration)' == 'Debug' " />
20+
<PackageReference Include="RedotSharp" Version="$(PackageVersion_GodotSharp)" />
21+
<PackageReference Include="RedotSharpEditor" Version="$(PackageVersion_GodotSharp)" Condition=" '$(Configuration)' == 'Debug' " />
2222
</ItemGroup>
2323

2424
<!-- iOS-specific build targets -->

‎modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/iOSNativeAOT.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<ItemGroup>
3-
<TrimmerRootAssembly Include="GodotSharp" />
3+
<TrimmerRootAssembly Include="RedotSharp" />
44
<TrimmerRootAssembly Include="$(TargetName)" />
55
<LinkerArg Include="-install_name '@rpath/$(TargetName)$(NativeBinaryExt)'" />
66
</ItemGroup>

modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/Godot.SourceGenerators.Sample.csproj renamed to modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Sample/Redot.SourceGenerators.Sample.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<LangVersion>12</LangVersion>
6+
<RootNamespace>Godot.SourceGenerators.Sample</RootNamespace>
67
</PropertyGroup>
78

89
<PropertyGroup>
@@ -22,14 +23,14 @@
2223
</PropertyGroup>
2324

2425
<ItemGroup>
25-
<ProjectReference Include="..\..\..\glue\GodotSharp\GodotSharp\GodotSharp.csproj">
26+
<ProjectReference Include="..\..\..\glue\GodotSharp\GodotSharp\RedotSharp.csproj">
2627
<Private>False</Private>
2728
</ProjectReference>
28-
<ProjectReference Include="..\Godot.SourceGenerators\Godot.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
29+
<ProjectReference Include="..\Godot.SourceGenerators\Redot.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
2930
</ItemGroup>
3031

3132
<!-- This file is imported automatically when using PackageReference to
3233
reference Godot.SourceGenerators, but not when using ProjectReference -->
33-
<Import Project="..\Godot.SourceGenerators\Godot.SourceGenerators.props" />
34+
<Import Project="..\Godot.SourceGenerators\Redot.SourceGenerators.props" />
3435

3536
</Project>

‎modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/CSharpSourceGeneratorVerifier.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@ public static Test MakeVerifier(ICollection<string> sources, ICollection<string>
7777
private static string FullGeneratedSourceName(string name)
7878
{
7979
var generatorType = typeof(TSourceGenerator);
80-
return Path.Combine(generatorType.Namespace!, generatorType.FullName!, name);
80+
return Path.Combine(generatorType.Namespace!.Replace("Godot", "Redot"), generatorType.FullName!, name);
8181
}
8282
}

modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/Godot.SourceGenerators.Tests.csproj renamed to modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/Redot.SourceGenerators.Tests.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<Nullable>enable</Nullable>
88
<IsPackable>false</IsPackable>
99
<IsTestProject>true</IsTestProject>
10+
<RootNamespace>Godot.SourceGenerators.Tests</RootNamespace>
1011
</PropertyGroup>
1112

1213
<PropertyGroup>
@@ -33,8 +34,8 @@
3334
</ItemGroup>
3435

3536
<ItemGroup>
36-
<ProjectReference Include="..\..\..\glue\GodotSharp\GodotSharp\GodotSharp.csproj" />
37-
<ProjectReference Include="..\Godot.SourceGenerators\Godot.SourceGenerators.csproj" />
37+
<ProjectReference Include="..\..\..\glue\GodotSharp\GodotSharp\RedotSharp.csproj" />
38+
<ProjectReference Include="..\Godot.SourceGenerators\Redot.SourceGenerators.csproj" />
3839
</ItemGroup>
3940

4041
<ItemGroup>

‎modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/ScriptPathAttributeGeneratorTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class ScriptPathAttributeGeneratorTests
1313
private static (string, SourceText) MakeAssemblyScriptTypesGeneratedSource(ICollection<string> types)
1414
{
1515
return (
16-
Path.Combine("Godot.SourceGenerators", "Godot.SourceGenerators.ScriptPathAttributeGenerator", "AssemblyScriptTypes.generated.cs"),
16+
Path.Combine("Redot.SourceGenerators", "Godot.SourceGenerators.ScriptPathAttributeGenerator", "AssemblyScriptTypes.generated.cs"),
1717
SourceText.From($$"""
1818
[assembly:Godot.AssemblyHasScriptsAttribute(new System.Type[] {{{string.Join(", ", types.Select(type => $"typeof({type})"))}}})]
1919

‎modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ClassPartialModifierAnalyzer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ private void AnalyzeNode(SyntaxNodeAnalysisContext context)
3232
if (context.ContainingSymbol is not INamedTypeSymbol typeSymbol)
3333
return;
3434

35-
if (!typeSymbol.InheritsFrom("GodotSharp", GodotClasses.GodotObject))
35+
if (!typeSymbol.InheritsFrom("RedotSharp", GodotClasses.GodotObject))
3636
return;
3737

3838
if (!classDeclaration.IsPartial())

0 commit comments

Comments
 (0)