Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[4.3] Fix mono SDK references temporarily #785

Merged
merged 1 commit into from
Oct 23, 2024
Merged

[4.3] Fix mono SDK references temporarily #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions modules/mono/build_scripts/build_assemblies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

<Description>MSBuild .NET Sdk for Redot projects.</Description>
<Authors>Redot Engine contributors</Authors>
<Authors>Godot Engine contributors;Redot Engine contributors</Authors>

<PackageId>Godot.NET.Sdk</PackageId>
<Version>4.3.1</Version>
<Version>4.3.0</Version>
<PackageVersion>$(PackageVersion_Godot_NET_Sdk)</PackageVersion>
<RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk</RepositoryUrl>
<RepositoryUrl>https://github.com/Redot-Engine/redot-engine/tree/master/modules/mono/editor/Godot.NET.Sdk</RepositoryUrl>
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
<PackageType>MSBuildSdk</PackageType>
<PackageTags>MSBuildSdk</PackageTags>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Copyright>Copyright (c) Godot Engine contributors</Copyright>
<Copyright>Copyright (c) Godot Engine contributors and Redot Engine contributors</Copyright>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

<!-- Exclude target framework from the package dependencies as we don't include the build output -->
Expand Down
10 changes: 5 additions & 5 deletions modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<Description>Core C# source generator for Godot projects.</Description>
<Authors>Godot Engine contributors</Authors>
<Description>Core C# source generator for Redot projects.</Description>
<Authors>Godot Engine contributors;Redot Engine contributors</Authors>

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

<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<!-- Do not include the generator as a lib dependency -->
Expand Down
6 changes: 3 additions & 3 deletions modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotTools.IdeMessaging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<PackageId>GodotTools.IdeMessaging</PackageId>
<Version>1.1.2</Version>
<AssemblyVersion>$(Version)</AssemblyVersion>
<Authors>Godot Engine contributors</Authors>
<Authors>Godot Engine contributors;Redot Engine contributors</Authors>
<Company />
<PackageTags>godot</PackageTags>
<RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/GodotTools/GodotTools.IdeMessaging</RepositoryUrl>
<RepositoryUrl>https://github.com/Redot-Engine/redot-engine/tree/master/modules/mono/editor/GodotTools/GodotTools.IdeMessaging</RepositoryUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Copyright>Copyright (c) Godot Engine contributors</Copyright>
<Copyright>Copyright (c) Godot Engine contributors and Redot Engine contributors</Copyright>
<Description>
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.
Expand Down
10 changes: 5 additions & 5 deletions modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
<AnalysisMode>Recommended</AnalysisMode>
</PropertyGroup>
<PropertyGroup>
<Description>Godot C# Core API.</Description>
<Authors>Godot Engine contributors</Authors>
<Description>Redot C# Core API.</Description>
<Authors>Godot Engine contributors;Redot Engine contributors</Authors>

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

<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<IncludeSymbols>true</IncludeSymbols>
Expand Down
10 changes: 5 additions & 5 deletions modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
<LangVersion>10</LangVersion>
</PropertyGroup>
<PropertyGroup>
<Description>Godot C# Editor API.</Description>
<Authors>Godot Engine contributors</Authors>
<Description>Redot C# Editor API.</Description>
<Authors>Godot Engine contributors;Redot Engine contributors</Authors>

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

<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<IncludeSymbols>true</IncludeSymbols>
Expand Down
Loading