-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
Merge Unity SDK into C# SDK #117
Conversation
One thing to note is that if we make this the new com.clockworklabs.spacetimedbsdk repo, we'll lose all the branches/tags from the other repo. I'm not sure which ones bitcraft (or other users) are still using. |
@@ -1,137 +1,77 @@ | |||
## Ignore Visual Studio temporary files, build results, and |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For reviewers:
$ diff com.clockworklabs.spacetimedbsdk/.gitignore spacetimedb-csharp-sdk/.gitignore
35d34
< *.csproj
37d35
< *.sln
72a71,77
>
> bin~
> obj~
>
> # This is used for local paths to SpacetimeDB packages.
> /nuget.config
> /nuget.config.meta
Unity gives me this error when I use this merged branch:
It doesn't seem to prevent it from running, but I don't know if it'll cause any issues down the line. |
Hm I get these errors when I run
|
Weird, it works on CI. Can you try to clean all the |
That seems really odd as that DLL is not marked as RoslynAnalyzer :/ I didn't see this issue. |
Works now! I thought I ran |
Wouldn't it be because it bundles in SpacetimeDB.BSATN.Codegen now? |
Shouldn't be because only Codegen.dll.meta has RoslynAnalyzer label: https://github.com/clockworklabs/spacetimedb-csharp-sdk/blob/0d135c8abe579a1a3e83927c4ee79329baafcf6f/packages/spacetimedb.bsatn.runtime/0.11.0/analyzers/dotnet/cs/SpacetimeDB.BSATN.Codegen.dll.meta#L4 So it's odd that it complains about Runtime.dll.meta which is not a source generator. |
Just in case, did this error also disappear by any chance after |
The error only came up on first import, not on subsequent loads. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems good to me! I
- Ran BitCraft pointed at this branch, ran around in a world
- Ran
dotnet test
successfully - Reviewed the diff itself
I still don't know the best way to deal with branch names/tags after the repo rename though (#117 (comment))
Good point, I don't know either. Let's bring it up in the meeting. |
Actually I think this must be unrelated to a |
But you said you don't see it anymore, right? |
I see it consistently when first loading the package (i.e. when switching |
I thought maybe GUID in meta files got clashes between previous / modern versions of DLLs, but doesn't seem so. Idk, I'm out of ideas, but if it only happens when switching between package versions before / after the change, it sounds like some internal Unity cache and hopefully won't affect end users. |
## Description of Changes Redo these PRs: - clockworklabs/com.clockworklabs.spacetimedbsdk-archive#56 - clockworklabs/com.clockworklabs.spacetimedbsdk-archive#59 - clockworklabs/com.clockworklabs.spacetimedbsdk-archive#61 I'm not sure how these repos were merged in #117, but it appears that this wasn't carried over. (Either way we need to make this a required check). ## API No ## Requires SpacetimeDB PRs *List any PRs here that are required for this SDK change to work* Co-authored-by: Zeke Foppa <[email protected]>
(just to follow up here - I should not have mindlessly merged |
## Description of Changes Revert `master` to the original state of this PR: #53. We should prevent merging into `master` from now on, since the repositories are now merged. ## API - [ ] This is an API breaking change to the SDK *If the API is breaking, please state below what will break* ## Requires SpacetimeDB PRs *List any PRs here that are required for this SDK change to work* ## Testing I loaded a bitcraft world and ran around. I used the versions listed here: clockworklabs/com.clockworklabs.spacetimedbsdk-archive#57 --------- Co-authored-by: Ingvar Stepanyan <[email protected]> Co-authored-by: Zeke Foppa <[email protected]>
## Description of Changes For some reason, this repo was not quite properly synced up with the state of https://github.com/clockworklabs/com.clockworklabs.spacetimedbsdk-archive after #117. It's unclear to me how this happened, since the current state seems to be compatible with 0.11, but the [0.11 release commit/PR](clockworklabs/com.clockworklabs.spacetimedbsdk-archive@382cce0) also bumped the `package.json` version, which didn't happen in this repo. I re-copied files over. Fortunately, the only real changes were to `package.json` and `README.md`. ## API No breaking changes. ## Requires SpacetimeDB PRs None Co-authored-by: Zeke Foppa <[email protected]>
## Description of Changes For some reason, this repo was not quite properly synced up with the state of https://github.com/clockworklabs/com.clockworklabs.spacetimedbsdk-archive after #117. It's unclear to me how this happened, since the current state seems to be compatible with 0.11, but the [0.11 release commit/PR](clockworklabs/com.clockworklabs.spacetimedbsdk-archive@382cce0) also bumped the `package.json` version, which didn't happen in this repo. I re-copied files over. Fortunately, the only real changes were to `package.json` and `README.md`. ## API No breaking changes. ## Requires SpacetimeDB PRs None Co-authored-by: Zeke Foppa <[email protected]>
Description of Changes
This creates a frankenstein monster of a repo that is compatible with both .NET / MSBuild as well as can be consumed as a Unity package.
.meta
files, Unity manifests and Unity README were copied over from the Unity repo.examples
andtests
folders were renamed toexamples~
andtests~
correspondingly, as the~
suffix is the only way to get entire folders ignored by Unity.bin
andobj
tobin~
andobj~
for the same reasons. This doesn't matter for the Git repo, but helpful for local development where you don't want Unity to try and load local DLL artifacts..csproj
and via standarddotnet restore
/dotnet build
.After this change, this repo should be compatible with both .NET CLI (e.g.
dotnet test
) as well as consumable from Unity, but due to amount of metadata changes, it needs further testing before we merge repos properly.Fixes #114.
API
If the API is breaking, please state below what will break
Requires SpacetimeDB PRs
List any PRs here that are required for this SDK change to work