From 4f905b27ed67494dc58ea7118127a9ebd5b1db73 Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Wed, 23 Oct 2024 04:37:52 -0400 Subject: [PATCH] Fix mono SDK references temporarily Rebrand dotnet project metadata to reference Redot --- modules/mono/build_scripts/build_assemblies.py | 11 ++++------- .../Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj | 8 ++++---- .../Godot.SourceGenerators.csproj | 10 +++++----- .../GodotTools.IdeMessaging.csproj | 6 +++--- .../mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj | 10 +++++----- .../GodotSharpEditor/GodotSharpEditor.csproj | 10 +++++----- 6 files changed, 26 insertions(+), 29 deletions(-) diff --git a/modules/mono/build_scripts/build_assemblies.py b/modules/mono/build_scripts/build_assemblies.py index 62b2e42efb4..f832ae912d0 100755 --- a/modules/mono/build_scripts/build_assemblies.py +++ b/modules/mono/build_scripts/build_assemblies.py @@ -275,13 +275,10 @@ def generate_sdk_package_versions(): if version_status != "stable": # Pre-release # If version was overridden to be e.g. "beta3", we insert a dot between # "beta" and "3" to follow SemVer 2.0. - import re - - match = re.search(r"[\d]+$", version_status) - if match: - pos = match.start() - version_status = version_status[:pos] + "." + version_status[pos:] - version_str += "-" + version_status + if version_info["status_version"] != 0: + version_status += "." + str(version_info["status_version"]) + # TODO: waiting for https://www.nuget.org/packages/Redot.NET.Sdk to be made + # version_str += "-" + version_status import version 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/Godot.NET.Sdk.csproj index 698e95e5b9f..a7dad15768a 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/Godot.NET.Sdk.csproj @@ -4,17 +4,17 @@ false MSBuild .NET Sdk for Redot projects. - Redot Engine contributors + Godot Engine contributors;Redot Engine contributors Godot.NET.Sdk - 4.3.1 + 4.3.0 $(PackageVersion_Godot_NET_Sdk) - https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk + https://github.com/Redot-Engine/redot-engine/tree/master/modules/mono/editor/Godot.NET.Sdk $(RepositoryUrl) MSBuildSdk MSBuildSdk MIT - Copyright (c) Godot Engine contributors + Copyright (c) Godot Engine contributors and Redot Engine contributors true diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj index 180145faafc..521e8fd6e79 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj @@ -5,16 +5,16 @@ enable - Core C# source generator for Godot projects. - Godot Engine contributors + Core C# source generator for Redot projects. + Godot Engine contributors;Redot Engine contributors Godot.SourceGenerators - 4.3.1 + 4.3.0 $(PackageVersion_Godot_SourceGenerators) - https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators + https://github.com/Redot-Engine/redot-engine/tree/master/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators $(RepositoryUrl) MIT - Copyright (c) Godot Engine contributors + Copyright (c) Godot Engine contributors and Redot Engine contributors true diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotTools.IdeMessaging.csproj b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotTools.IdeMessaging.csproj index 2ee28715bfd..76bd61cd286 100644 --- a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotTools.IdeMessaging.csproj +++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotTools.IdeMessaging.csproj @@ -7,12 +7,12 @@ GodotTools.IdeMessaging 1.1.2 $(Version) - Godot Engine contributors + Godot Engine contributors;Redot Engine contributors godot - https://github.com/godotengine/godot/tree/master/modules/mono/editor/GodotTools/GodotTools.IdeMessaging + https://github.com/Redot-Engine/redot-engine/tree/master/modules/mono/editor/GodotTools/GodotTools.IdeMessaging MIT - Copyright (c) Godot Engine contributors + Copyright (c) Godot Engine contributors and Redot Engine contributors This library enables communication with the Godot Engine editor (the version with .NET support). It's intended for use in IDEs/editors plugins for a better experience working with Godot C# projects. diff --git a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj index 23829fd35f3..fcb4dbc0839 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj @@ -13,16 +13,16 @@ Recommended - Godot C# Core API. - Godot Engine contributors + Redot C# Core API. + Godot Engine contributors;Redot Engine contributors GodotSharp - 4.3.1 + 4.3.0 $(PackageVersion_GodotSharp) - https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharp + https://github.com/Redot-Engine/redot-engine/tree/master/modules/mono/glue/GodotSharp/GodotSharp $(RepositoryUrl) MIT - Copyright (c) Godot Engine contributors + Copyright (c) Godot Engine contributors and Redot Engine contributors true true diff --git a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj index a478570fc3f..d643addd7e2 100644 --- a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj +++ b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj @@ -11,16 +11,16 @@ 10 - Godot C# Editor API. - Godot Engine contributors + Redot C# Editor API. + Godot Engine contributors;Redot Engine contributors GodotSharpEditor - 4.3.1 + 4.3.0 $(PackageVersion_GodotSharp) - https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharpEditor + https://github.com/Redot-Engine/redot-engine/tree/master/modules/mono/glue/GodotSharp/GodotSharpEditor $(RepositoryUrl) MIT - Copyright (c) Godot Engine contributors + Copyright (c) Godot Engine contributors and Redot Engine contributors true true