Skip to content

Commit 7e93ced

Browse files
authored
Merge pull request #785 from Spartan322/4.3-fix/temp-mono-sdk
[4.3] Fix mono SDK references temporarily
2 parents 859c31f + 4f905b2 commit 7e93ced

File tree

6 files changed

+26
-29
lines changed

6 files changed

+26
-29
lines changed

modules/mono/build_scripts/build_assemblies.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,10 @@ def generate_sdk_package_versions():
275275
if version_status != "stable": # Pre-release
276276
# If version was overridden to be e.g. "beta3", we insert a dot between
277277
# "beta" and "3" to follow SemVer 2.0.
278-
import re
279-
280-
match = re.search(r"[\d]+$", version_status)
281-
if match:
282-
pos = match.start()
283-
version_status = version_status[:pos] + "." + version_status[pos:]
284-
version_str += "-" + version_status
278+
if version_info["status_version"] != 0:
279+
version_status += "." + str(version_info["status_version"])
280+
# TODO: waiting for https://www.nuget.org/packages/Redot.NET.Sdk to be made
281+
# version_str += "-" + version_status
285282

286283
import version
287284

modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
55

66
<Description>MSBuild .NET Sdk for Redot projects.</Description>
7-
<Authors>Redot Engine contributors</Authors>
7+
<Authors>Godot Engine contributors;Redot Engine contributors</Authors>
88

99
<PackageId>Godot.NET.Sdk</PackageId>
10-
<Version>4.3.1</Version>
10+
<Version>4.3.0</Version>
1111
<PackageVersion>$(PackageVersion_Godot_NET_Sdk)</PackageVersion>
12-
<RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk</RepositoryUrl>
12+
<RepositoryUrl>https://github.com/Redot-Engine/redot-engine/tree/master/modules/mono/editor/Godot.NET.Sdk</RepositoryUrl>
1313
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
1414
<PackageType>MSBuildSdk</PackageType>
1515
<PackageTags>MSBuildSdk</PackageTags>
1616
<PackageLicenseExpression>MIT</PackageLicenseExpression>
17-
<Copyright>Copyright (c) Godot Engine contributors</Copyright>
17+
<Copyright>Copyright (c) Godot Engine contributors and Redot Engine contributors</Copyright>
1818
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1919

2020
<!-- Exclude target framework from the package dependencies as we don't include the build output -->

modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
<Nullable>enable</Nullable>
66
</PropertyGroup>
77
<PropertyGroup>
8-
<Description>Core C# source generator for Godot projects.</Description>
9-
<Authors>Godot Engine contributors</Authors>
8+
<Description>Core C# source generator for Redot projects.</Description>
9+
<Authors>Godot Engine contributors;Redot Engine contributors</Authors>
1010

1111
<PackageId>Godot.SourceGenerators</PackageId>
12-
<Version>4.3.1</Version>
12+
<Version>4.3.0</Version>
1313
<PackageVersion>$(PackageVersion_Godot_SourceGenerators)</PackageVersion>
14-
<RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators</RepositoryUrl>
14+
<RepositoryUrl>https://github.com/Redot-Engine/redot-engine/tree/master/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators</RepositoryUrl>
1515
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
1616
<PackageLicenseExpression>MIT</PackageLicenseExpression>
17-
<Copyright>Copyright (c) Godot Engine contributors</Copyright>
17+
<Copyright>Copyright (c) Godot Engine contributors and Redot Engine contributors</Copyright>
1818

1919
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2020
<!-- Do not include the generator as a lib dependency -->

modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotTools.IdeMessaging.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<PackageId>GodotTools.IdeMessaging</PackageId>
88
<Version>1.1.2</Version>
99
<AssemblyVersion>$(Version)</AssemblyVersion>
10-
<Authors>Godot Engine contributors</Authors>
10+
<Authors>Godot Engine contributors;Redot Engine contributors</Authors>
1111
<Company />
1212
<PackageTags>godot</PackageTags>
13-
<RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/GodotTools/GodotTools.IdeMessaging</RepositoryUrl>
13+
<RepositoryUrl>https://github.com/Redot-Engine/redot-engine/tree/master/modules/mono/editor/GodotTools/GodotTools.IdeMessaging</RepositoryUrl>
1414
<PackageLicenseExpression>MIT</PackageLicenseExpression>
15-
<Copyright>Copyright (c) Godot Engine contributors</Copyright>
15+
<Copyright>Copyright (c) Godot Engine contributors and Redot Engine contributors</Copyright>
1616
<Description>
1717
This library enables communication with the Godot Engine editor (the version with .NET support).
1818
It's intended for use in IDEs/editors plugins for a better experience working with Godot C# projects.

modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
<AnalysisMode>Recommended</AnalysisMode>
1414
</PropertyGroup>
1515
<PropertyGroup>
16-
<Description>Godot C# Core API.</Description>
17-
<Authors>Godot Engine contributors</Authors>
16+
<Description>Redot C# Core API.</Description>
17+
<Authors>Godot Engine contributors;Redot Engine contributors</Authors>
1818

1919
<PackageId>GodotSharp</PackageId>
20-
<Version>4.3.1</Version>
20+
<Version>4.3.0</Version>
2121
<PackageVersion>$(PackageVersion_GodotSharp)</PackageVersion>
22-
<RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharp</RepositoryUrl>
22+
<RepositoryUrl>https://github.com/Redot-Engine/redot-engine/tree/master/modules/mono/glue/GodotSharp/GodotSharp</RepositoryUrl>
2323
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
2424
<PackageLicenseExpression>MIT</PackageLicenseExpression>
25-
<Copyright>Copyright (c) Godot Engine contributors</Copyright>
25+
<Copyright>Copyright (c) Godot Engine contributors and Redot Engine contributors</Copyright>
2626

2727
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2828
<IncludeSymbols>true</IncludeSymbols>

modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
<LangVersion>10</LangVersion>
1212
</PropertyGroup>
1313
<PropertyGroup>
14-
<Description>Godot C# Editor API.</Description>
15-
<Authors>Godot Engine contributors</Authors>
14+
<Description>Redot C# Editor API.</Description>
15+
<Authors>Godot Engine contributors;Redot Engine contributors</Authors>
1616

1717
<PackageId>GodotSharpEditor</PackageId>
18-
<Version>4.3.1</Version>
18+
<Version>4.3.0</Version>
1919
<PackageVersion>$(PackageVersion_GodotSharp)</PackageVersion>
20-
<RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharpEditor</RepositoryUrl>
20+
<RepositoryUrl>https://github.com/Redot-Engine/redot-engine/tree/master/modules/mono/glue/GodotSharp/GodotSharpEditor</RepositoryUrl>
2121
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
2222
<PackageLicenseExpression>MIT</PackageLicenseExpression>
23-
<Copyright>Copyright (c) Godot Engine contributors</Copyright>
23+
<Copyright>Copyright (c) Godot Engine contributors and Redot Engine contributors</Copyright>
2424

2525
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2626
<IncludeSymbols>true</IncludeSymbols>

0 commit comments

Comments
 (0)