Add upm support #14

rogerbarton · 2020-03-21T13:39:50Z

Users can then nicely add the repo as a submodule in the Packages folder and so get updates.

Add main author to packages.json @mcpiroman
Update readme
Adapt "Only Executing Assembly" to reference "Assembly-CSharp.dll", because of the .asmdef
Should .meta files be included (for consistent guids)? Yes

If users do not want to use upm, e.g. if they are on an older version, it should still work.

(The "revision": "6c6b..." is currently the lastest commit on the master branch)

Allow users to add this to the Packages folder for it to be used as an embedded package Users can then nicely add the repo as a submodule

This would not work with the `upm-support` branch mcpiroman#14 as the attributes are not searched for in the attribute that these scripts are in by default.

mcpiroman · 2020-03-21T20:29:07Z

Well, admittedly, I've never heard of upm, but it looks really cool. (I guess it works similarly to other package managers I know ;)). So yes, thanks for bringing that in. The only thing I'm worried about are the .asmdef files. Are they necessary? Because as you pointed out, they may interfere with assembly resolution (and for this little code there is here, this seems like little overkill?). I'm nevertheless not familiar with that solution, so I'll rely on your words.

rogerbarton · 2020-03-21T21:06:08Z

Yes upm is based on npm (it's been around since 2018.1 I believe). From what I know the you need an asmdef per package and a separate one for any editor code, which we have here. It is overkill to have them but it doesn't work without them.

Renamed Editor asmdef

EditorGUI for the target assemblies is now just a string array. Removed code to find _allKnownAssemblies. assemblyPaths renamed to assemblyNames is now a list. By default only Assembly-CSharp and the Editor variant is targeted. The assembly containing this tool is always included so we find the attributes.

Simplified finding all assemblies, moved to RefreshAllKnownAssemblies() Unity Assemblies are ignored by default. Option to add all known assemblies. Increased refresh time to 5 seconds from 1.

rogerbarton · 2020-04-07T12:27:33Z

a5fd455 also links to #17 (comment) and implements the whitelisting of assemblies, by their name (without extension). By default Assembly-CSharp and Assembly-CSharp-Editor are included. Our two asmdefs are always included, and so searched for the attributes. So #17 should be resolved by this.

(042c4aa and 06abb19) I've now adapted the GUI for selecting the assemblies, it should be quite similar to before with a dropdown. I've slightly modified how _allKnownAssemblies is calculated, so Unity assemblies are ignored (theres a IGNORED_ASSEMBLY_PREFIXES string[] for exact control). The Find dropdown allows you to select from this list.

rogerbarton · 2020-04-07T13:04:58Z

Added some headers and reordered. Any suggestions?

scripts/Editor/DllManipulatorEditor.cs

…e UnityEditorInternal dependency Use original code to find all assemblies, use `Path.GetFileNameWithoutExtension` instead of `PathUtils.NormallizeUnityAssemblyPath`.

mcpiroman · 2020-04-08T19:04:55Z

Added some headers and reordered. Any suggestions?

Yea, I very like that,, maybe because I have thought about sth like this either :).

Generally, please let me know when I can review this. Btw Github allows you to declare a PR as preview, idk if they have already enabled marking existing ones as preview, which was requested a long time ago.

rogerbarton · 2020-04-09T10:40:10Z

Ah I didn't know about the marking as preview, I'll do it in the future. This PR and #15 aren't ready for review yet. I'll tell you when they are...

This reverts commit 8e1d0e3.

Some project may not have any editor scripts so will always get an error as Assembly-CSharp-Editor does not exist.

rogerbarton · 2020-04-24T16:33:36Z

Once #15 is merged, this PR is also ready for review.

* Repaint editor GUIs on shortcut * Editor variable changes saved properly Before changing a variable would not be detected and so not saved/serialized in some cases. * Use callback attributes to repaint editors This would not work with the `upm-support` branch #14 as the attributes are not searched for in the attribute that these scripts are in by default. * Allow multiple un/loadTrigger attributes, use action to trigger repaints * Remove SceneManagement, it's not required The scene is automatically set as dirty when the gui target is * Fixes to gui with enableInEdit mode Admittedly this should have been in #12. However, here are the fixes anyways. GUI buttons to un/load show in edit mode if enableInEditMode is true. Disabling and re-enabling the DllManipulatorScript works now. * Properly reset custom triggers (fix duplicates) Previously triggers would not be cleared properly and so be duplicated. (Static variables seem to persist between entering/exiting playmode) * Custom triggers optional execute on main thread Allow custom triggers to be executed on the main thread in a queue. We need this internally to repaint the editor GUI as it uses the Unity API. * Update README.md * Mark scene dirty only if options changed * Bug fix, resetting when not initialized Initialize() is not always called so we should not always reset. * small fix * Review fixes Also RegisterTriggerMethod receives attribute instead of bool, Fix naming in DllManipulatorOptions * Add comments

mcpiroman · 2020-05-01T12:17:14Z

package.json

+  ],
+  "category": "Unity",
+  "author": {
+    "name": "John Doe",


If I recall correctly, that's not my name :)

Nor an email

Where can I find them? they're not in your public profile.

I think we can live without that unless that's somehow mandatory

I can remove the author field if you want it to stay anonymous? (fyi John Doe is just a placeholder name)

mcpiroman · 2020-05-01T12:20:24Z

scripts/DllManipulator.cs

            return PInvokes_Linux.dlopen(filepath, (int)Options.posixDlopenFlags);
 #elif UNITY_STANDALONE_OSX
            return PInvokes_Osx.dlopen(filepath, (int)Options.posixDlopenFlags);
+#else // UNITY_STANDALONE_WIN


Is the way it was somehow bad? I understand the addition of || UNITY_EDITOR_XXX (which should also go there), but not the commented else. I mean, if for any reason the running platform happens not to be listed here, the code should not even compile.

I though it might be useful in some cases as there's quite a lot of platforms. But then it probably makes most sense to leave it as #elif UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN as this is what is directly supported. I will change it to that.

scripts/Editor/MCpiroman.UnityNativeTool.Editor.asmdef

scripts/DllManipulator.cs

scripts/Editor/DllManipulatorEditor.cs

mcpiroman · 2020-05-01T15:07:26Z

Thanks

rogerbarton · 2020-05-01T16:15:34Z

Thanks for reviewing!! I hope its not too much of a pain. I've got two small PRs left and then that should be it :D

Add upm support

b6fbd98

Allow users to add this to the Packages folder for it to be used as an embedded package Users can then nicely add the repo as a submodule

rogerbarton mentioned this pull request Mar 21, 2020

Editor GUI Fixes #15

Merged

rogerbarton mentioned this pull request Mar 21, 2020

Meta files - Inconsistent guids #16

Closed

Add meta files

97e04d8

rogerbarton mentioned this pull request Mar 22, 2020

Use relative path for assemblyPaths #17

Closed

rogerbarton added 6 commits March 25, 2020 19:51

Potential fix for assemblyPaths using their manifest name

4ff8168

Fallback to windows #if

4c3d948

Rename asmdefs

00cc2ce

Improve finding assemblies, always search in our assembly

a5fd455

Renamed Editor asmdef

Improve UI, dropdowns, add _allKnownAssemblies back

06abb19

Simplified finding all assemblies, moved to RefreshAllKnownAssemblies() Unity Assemblies are ignored by default. Option to add all known assemblies. Increased refresh time to 5 seconds from 1.

Add gui headers, info box

f93f3c5

rogerbarton commented Apr 7, 2020

View reviewed changes

scripts/Editor/DllManipulatorEditor.cs Show resolved Hide resolved

Update README.md

83b3751

rogerbarton commented Apr 8, 2020

View reviewed changes

scripts/Editor/DllManipulatorEditor.cs Outdated Show resolved Hide resolved

rogerbarton and others added 2 commits April 8, 2020 18:39

Partial revert "assemblyPaths small fixes, editor gui adapted", remov…

a2a212c

…e UnityEditorInternal dependency Use original code to find all assemblies, use `Path.GetFileNameWithoutExtension` instead of `PathUtils.NormallizeUnityAssemblyPath`.

Merge branch 'master' into upm-support

bc1a749

rogerbarton added 2 commits April 17, 2020 10:04

Use string[] for Options.assemblyNames

8e1d0e3

Changed package.json

f4bb9dc

rogerbarton force-pushed the upm-support branch from 4617095 to f4bb9dc Compare April 17, 2020 08:48

Bug fix, disable whole gui in play mode

6ca1ba0

rogerbarton added 2 commits April 17, 2020 11:37

Revert "Use string[] for Options.assemblyNames"

e64dd99

This reverts commit 8e1d0e3.

Bug fix, hide errors for not finding default assemblies

b5d22b2

Some project may not have any editor scripts so will always get an error as Assembly-CSharp-Editor does not exist.

rogerbarton added 2 commits May 1, 2020 13:24

Merge branch 'master' into upm-support

e737ee3

Merge fixes

24ce6c5

rogerbarton force-pushed the upm-support branch from 019c1e5 to 24ce6c5 Compare May 1, 2020 11:28

mcpiroman reviewed May 1, 2020

View reviewed changes

rogerbarton added 2 commits May 1, 2020 15:45

Review changes

6ed69a9

Removed upm author field

7d397ba

mcpiroman merged commit f4eb21d into mcpiroman:master May 1, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add upm support #14

Add upm support #14

rogerbarton commented Mar 21, 2020 •

edited

mcpiroman commented Mar 21, 2020

rogerbarton commented Mar 21, 2020

rogerbarton commented Apr 7, 2020 •

edited

rogerbarton commented Apr 7, 2020

mcpiroman commented Apr 8, 2020

rogerbarton commented Apr 9, 2020

rogerbarton commented Apr 24, 2020

mcpiroman May 1, 2020

mcpiroman May 1, 2020

rogerbarton May 1, 2020

mcpiroman May 1, 2020

rogerbarton May 1, 2020

mcpiroman May 1, 2020

rogerbarton May 1, 2020

mcpiroman commented May 1, 2020

rogerbarton commented May 1, 2020 •

edited

Add upm support #14

Add upm support #14

Conversation

rogerbarton commented Mar 21, 2020 • edited

mcpiroman commented Mar 21, 2020

rogerbarton commented Mar 21, 2020

rogerbarton commented Apr 7, 2020 • edited

rogerbarton commented Apr 7, 2020

mcpiroman commented Apr 8, 2020

rogerbarton commented Apr 9, 2020

rogerbarton commented Apr 24, 2020

mcpiroman May 1, 2020

Choose a reason for hiding this comment

mcpiroman May 1, 2020

Choose a reason for hiding this comment

rogerbarton May 1, 2020

Choose a reason for hiding this comment

mcpiroman May 1, 2020

Choose a reason for hiding this comment

rogerbarton May 1, 2020

Choose a reason for hiding this comment

mcpiroman May 1, 2020

Choose a reason for hiding this comment

rogerbarton May 1, 2020

Choose a reason for hiding this comment

mcpiroman commented May 1, 2020

rogerbarton commented May 1, 2020 • edited

rogerbarton commented Mar 21, 2020 •

edited

rogerbarton commented Apr 7, 2020 •

edited

rogerbarton commented May 1, 2020 •

edited