Merge pull request #101 from brunomikoski/fix/unity-2021-compability

fix: issue with runtimeinitialize method

Author: brunomikoski

CHANGELOG.MD

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+# [1.8.3]
+### Changed
+- Fixed `[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]` issue with unity 2021 and generics.
 
 # [1.8.2]
 ### Changed
@@ -333,6 +336,7 @@ public bool IsValidConsumable(Consumable consumable)
  - First initial working version 
 
 
+[1.8.3]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.8.3
 [1.8.2]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.8.2
 [1.8.1]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.8.1
 [1.8.0]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.8.0

Scripts/Runtime/Core/CollectionsRegistry.cs

@@ -16,14 +16,12 @@ public class CollectionsRegistry : ResourceScriptableObjectSingleton<Collections
         [SerializeField] 
         private List<ScriptableObjectCollection> collections = new List<ScriptableObjectCollection>();
 
-        [Preserve]
-        public void UsedOnlyForAOTCodeGeneration()
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
+        private static void Initialize()
         {
             LoadOrCreateInstance<CollectionsRegistry>();
-            // Include an exception so we can be sure to know if this method is ever called.
-            throw new InvalidOperationException("This method is used for AOT code generation only. Do not call it at runtime.");
         }
-
+        
         public bool IsKnowCollection(ScriptableObjectCollection targetCollection)
         {
             for (int i = 0; i < collections.Count; i++)

Scripts/Runtime/Core/ResourceScriptableObjectSingleton.cs

@@ -17,7 +17,6 @@ public static T Instance
             }
         }
 
-        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
         public static TInstance LoadOrCreateInstance<TInstance>() where TInstance : ScriptableObject
         {
             if (!TryToLoadInstance<TInstance>(out TInstance resultInstance))

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.brunomikoski.scriptableobjectcollection",
   "displayName": "Scriptable Object Collection",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "unity": "2018.4",
   "description": "A library to help improve the usability of Unity3D Scriptable Objects by grouping then into a collection and exposing then by code or nice inspectors!",
   "keywords": [