Skip to content

Conversation

corngood
Copy link

This conflicts with ::MonoGCHandle in mono 6.14 (maintained by winehq).

Fixes: #44068

Godot3 is currently broken in nixpkgs due to this.

This conflicts with ::MonoGCHandle in mono 6.14 (maintained by winehq).
Copy link
Member

@raulsntos raulsntos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, sounds reasonable although we still use 6.12 in our official builds.

@raulsntos raulsntos modified the milestones: 4.5, 3.7 May 25, 2025
@lawnjelly lawnjelly merged commit 9cf1151 into godotengine:3.x May 25, 2025
14 checks passed
@lawnjelly
Copy link
Member

Thanks!

@akien-mga akien-mga changed the title mono: move MonoGCHandle into gdmono namespace [3.x] Mono: Move MonoGCHandle into gdmono namespace May 25, 2025
@akien-mga akien-mga added cherrypick:3.6 Considered for cherry-picking into a future 3.6.x release cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release labels May 25, 2025
@lawnjelly
Copy link
Member

Cherry-picked for 3.6.1.

@lawnjelly lawnjelly removed the cherrypick:3.6 Considered for cherry-picking into a future 3.6.x release label May 25, 2025
@lawnjelly lawnjelly added the cherrypick:3.6 Considered for cherry-picking into a future 3.6.x release label Jun 13, 2025
@akien-mga akien-mga removed the cherrypick:3.6 Considered for cherry-picking into a future 3.6.x release label Jun 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release topic:buildsystem topic:dotnet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants