Isolate Godot NuGet restore from Unity package cache#5136
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of Changes
A follow-on to #5133 that fixes another Godot flake that was observed after #5133 merged. Specifically a C# SDK regen flake where the Godot package restore path reused
sdks/csharp/packages, which is also the Unity-visible package cache.During
cargo regen csharp dlls, the Godot flow previously did this:sdks/csharp/packages/godotsharpsdks/csharp/obj~/godotsdks/csharp/packagesThat meant a Godot-only cleanup could delete package content under the Unity SDK package cache. If a previous GodotSharp restore was partial or stale, regen tried to fix it by deleting
packages/godotsharp, but that path is visible to Unity and can cause dirty/missing package content during regen.With this change, Godot restore state is now isolated under
sdks/csharp/obj~/godot/packages, and the regen flow becomes:sdks/csharp/obj~/godotsdks/csharp/obj~/godot/packagesClearing
obj~/godotnow removes both Godot intermediates and Godot-only NuGet packages, while leaving the normal Unity SDK package cache undersdks/csharp/packagesuntouched.API and ABI breaking changes
N/A
Expected complexity level and risk
1
Testing
unity-testsuitepasses