From ebbb6bd25abed9365f06b3795e6fdb8aba2a8d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Buratto?=
 <46575243+joaoburatto@users.noreply.github.com>
Date: Sat, 4 Mar 2023 23:23:56 -0300
Subject: [PATCH] Update Unity version and fix errors (#1071)

---
 .../SS3D/Core/ApplicationStateSystem.cs       |  2 +-
 .../Interactions/ClientDelayedInteraction.cs  |  2 +-
 .../Scripts/SS3D/Interactions/LoadingBar.cs   |  2 +-
 .../Interactions/UI/InteractionMenuView.cs    |  4 +-
 .../SS3D/Systems/Entities/EntitySystem.cs     |  2 +-
 .../SS3D/Systems/Gamemodes/Modes/Gamemode.cs  |  2 +-
 .../UI/GamemodeObjectivePanelView.cs          |  2 +-
 .../SS3D/Systems/Health/HealthController.cs   |  4 +-
 Assets/Scripts/SS3D/Systems/Input/Controls.cs |  8 +--
 .../SS3D/Systems/Inventory/UI/ContainerUi.cs  |  2 +-
 .../Systems/Inventory/UI/InventoryView.cs     |  2 +-
 .../SS3D/Systems/Inventory/UI/ItemGrid.cs     |  2 +-
 .../SS3D/Systems/Inventory/UI/ItemGridItem.cs |  2 +-
 .../Lobby/UI/PlayerUsernameListView.cs        |  4 +-
 .../Systems/Permissions/DisableIfNotAdmin.cs  |  2 +-
 .../Tile/TileMapCreator/GhostManager.cs       | 10 ++--
 .../Tile/TileMapCreator/TileMapCreator.cs     |  4 +-
 Packages/manifest.json                        | 14 +++---
 Packages/packages-lock.json                   | 50 +++++++++----------
 ProjectSettings/PackageManagerSettings.asset  | 30 +++++------
 .../LintingSettings.asset                     | 31 ++++++++++++
 ProjectSettings/ProjectVersion.txt            |  4 +-
 22 files changed, 105 insertions(+), 80 deletions(-)
 create mode 100644 ProjectSettings/Packages/com.coimbrastudios.core/LintingSettings.asset

diff --git a/Assets/Scripts/SS3D/Core/ApplicationStateSystem.cs b/Assets/Scripts/SS3D/Core/ApplicationStateSystem.cs
index 0c5f79da4b..988a8782d6 100644
--- a/Assets/Scripts/SS3D/Core/ApplicationStateSystem.cs
+++ b/Assets/Scripts/SS3D/Core/ApplicationStateSystem.cs
@@ -69,7 +69,7 @@ private void InitializeDiscordIntegration()
             }
             else
             {
-                FindObjectOfType<DiscordManager>().Destroy();
+                Destroy(FindObjectOfType<DiscordManager>());
             }
         }
 
diff --git a/Assets/Scripts/SS3D/Interactions/ClientDelayedInteraction.cs b/Assets/Scripts/SS3D/Interactions/ClientDelayedInteraction.cs
index 5b741a792b..5cc1d66f2f 100644
--- a/Assets/Scripts/SS3D/Interactions/ClientDelayedInteraction.cs
+++ b/Assets/Scripts/SS3D/Interactions/ClientDelayedInteraction.cs
@@ -56,7 +56,7 @@ public bool ClientUpdate(InteractionEvent interactionEvent)
         /// <inheritdoc />
         public void ClientCancel(InteractionEvent interactionEvent)
         {
-            _loadingBarInstance.Destroy();
+            _loadingBarInstance.Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/SS3D/Interactions/LoadingBar.cs b/Assets/Scripts/SS3D/Interactions/LoadingBar.cs
index 3e274f8ea5..1521e34f6f 100644
--- a/Assets/Scripts/SS3D/Interactions/LoadingBar.cs
+++ b/Assets/Scripts/SS3D/Interactions/LoadingBar.cs
@@ -44,7 +44,7 @@ private void UpdateLoadingProgressTask()
         {
             if (StartTime + Duration < Time.time)
             {
-                GameObjectCache.Destroy();
+                GameObjectCache.Dispose(true);
                 return;
             }
 
diff --git a/Assets/Scripts/SS3D/Interactions/UI/InteractionMenuView.cs b/Assets/Scripts/SS3D/Interactions/UI/InteractionMenuView.cs
index ef63f60908..0ad4bc555b 100644
--- a/Assets/Scripts/SS3D/Interactions/UI/InteractionMenuView.cs
+++ b/Assets/Scripts/SS3D/Interactions/UI/InteractionMenuView.cs
@@ -68,7 +68,7 @@ private void Update()
 
             if (!hasSelfAsParent)
             {
-                gameObject.Destroy();
+                gameObject.Dispose(true);
             }
         }
 
@@ -92,7 +92,7 @@ private void UpdateInteractions()
                 button.GetComponentInChildren<TextMeshProUGUI>().text = interaction.GetName(Event);
                 button.GetComponent<Button>().onClick.AddListener(() =>
                 {
-                    GameObjectCache.Destroy();
+                    GameObjectCache.Dispose(true);
                     OnSelect?.Invoke(interaction);
                 });
             }
diff --git a/Assets/Scripts/SS3D/Systems/Entities/EntitySystem.cs b/Assets/Scripts/SS3D/Systems/Entities/EntitySystem.cs
index 016dd836b4..d223864c9b 100644
--- a/Assets/Scripts/SS3D/Systems/Entities/EntitySystem.cs
+++ b/Assets/Scripts/SS3D/Systems/Entities/EntitySystem.cs
@@ -210,7 +210,7 @@ private void DestroySpawnedPlayers()
             foreach (Entity player in SpawnedPlayers)
             {
                 ServerManager.Despawn(player.NetworkObject);
-                player.GameObjectCache.Destroy();
+                player.GameObjectCache.Dispose(true);
             }
 
             _hasSpawnedInitialPlayers = false;
diff --git a/Assets/Scripts/SS3D/Systems/Gamemodes/Modes/Gamemode.cs b/Assets/Scripts/SS3D/Systems/Gamemodes/Modes/Gamemode.cs
index 79b9b9d262..1f8ef729b8 100644
--- a/Assets/Scripts/SS3D/Systems/Gamemodes/Modes/Gamemode.cs
+++ b/Assets/Scripts/SS3D/Systems/Gamemodes/Modes/Gamemode.cs
@@ -134,7 +134,7 @@ private void DestroyAllObjectives()
         {
             foreach (GamemodeObjective gamemodeObjective in _roundObjectives)
             {
-                gamemodeObjective.Destroy();
+                gamemodeObjective.Dispose(true);
             }
             _roundObjectives.Clear();
         }
diff --git a/Assets/Scripts/SS3D/Systems/Gamemodes/UI/GamemodeObjectivePanelView.cs b/Assets/Scripts/SS3D/Systems/Gamemodes/UI/GamemodeObjectivePanelView.cs
index 77e87cd618..741695ce1f 100644
--- a/Assets/Scripts/SS3D/Systems/Gamemodes/UI/GamemodeObjectivePanelView.cs
+++ b/Assets/Scripts/SS3D/Systems/Gamemodes/UI/GamemodeObjectivePanelView.cs
@@ -97,7 +97,7 @@ private void ClearObjectivesList()
         {
             foreach (KeyValuePair<int,GamemodeObjectiveItemView> view in _gamemodeObjectiveItems)
             {
-                view.Value.GameObjectCache.Destroy();
+                view.Value.GameObjectCache.Dispose(true);
             }
 
             _gamemodeObjectiveItems.Clear();
diff --git a/Assets/Scripts/SS3D/Systems/Health/HealthController.cs b/Assets/Scripts/SS3D/Systems/Health/HealthController.cs
index d519e90d6b..2593a70850 100644
--- a/Assets/Scripts/SS3D/Systems/Health/HealthController.cs
+++ b/Assets/Scripts/SS3D/Systems/Health/HealthController.cs
@@ -29,8 +29,8 @@ private void BecomeGhost(GameObject player, GameObject ghost)
     [ObserversRpc]
     private void destroyObjects(Entity originEntity, Entity ghostEntity)
     {
-        originEntity.gameObject.GetComponent<StaminaController>().Destroy();
-        originEntity.gameObject.GetComponent<HumanoidController>().Destroy();
+        originEntity.gameObject.GetComponent<StaminaController>().Dispose(true);
+        originEntity.gameObject.GetComponent<HumanoidController>().Dispose(true);
         originEntity.gameObject.transform.Rotate(new Vector3(90, 0, 0));
         ghostEntity.transform.position = originEntity.transform.position;
         ghostEntity.transform.rotation = originEntity.transform.rotation;
diff --git a/Assets/Scripts/SS3D/Systems/Input/Controls.cs b/Assets/Scripts/SS3D/Systems/Input/Controls.cs
index 0664b98b8c..56e5da47cf 100644
--- a/Assets/Scripts/SS3D/Systems/Input/Controls.cs
+++ b/Assets/Scripts/SS3D/Systems/Input/Controls.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.3.0
+//     version 1.4.4
 //     from Assets/Content/Input/Controls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -517,7 +517,7 @@ public @Controls()
                     ""initialStateCheck"": false
                 },
                 {
-                    ""name"": ""ToggleMenu"",
+                    ""name"": ""Toggle Menu"",
                     ""type"": ""Button"",
                     ""id"": ""3425a866-8013-4556-bd14-6f493998eb0c"",
                     ""expectedControlType"": ""Button"",
@@ -587,7 +587,7 @@ public @Controls()
                     ""interactions"": """",
                     ""processors"": """",
                     ""groups"": """",
-                    ""action"": ""ToggleMenu"",
+                    ""action"": ""Toggle Menu"",
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
                 },
@@ -636,7 +636,7 @@ public @Controls()
         m_Other_SwapMinds = m_Other.FindAction("Swap Minds", throwIfNotFound: true);
         m_Other_PrimaryClick = m_Other.FindAction("Primary Click", throwIfNotFound: true);
         m_Other_SecondaryClick = m_Other.FindAction("Secondary Click", throwIfNotFound: true);
-        m_Other_ToggleMenu = m_Other.FindAction("ToggleMenu", throwIfNotFound: true);
+        m_Other_ToggleMenu = m_Other.FindAction("Toggle Menu", throwIfNotFound: true);
         m_Other_SpawnCans = m_Other.FindAction("Spawn Cans", throwIfNotFound: true);
     }
 
diff --git a/Assets/Scripts/SS3D/Systems/Inventory/UI/ContainerUi.cs b/Assets/Scripts/SS3D/Systems/Inventory/UI/ContainerUi.cs
index e765039f18..1d6b3f2066 100644
--- a/Assets/Scripts/SS3D/Systems/Inventory/UI/ContainerUi.cs
+++ b/Assets/Scripts/SS3D/Systems/Inventory/UI/ContainerUi.cs
@@ -32,7 +32,7 @@ public AttachedContainer AttachedContainer
         public void Close()
         {
             Inventory.CmdContainerClose(_attachedContainer);
-            gameObject.Destroy();
+            gameObject.Dispose(true);
         }
 
         private void UpdateContainer(Container container)
diff --git a/Assets/Scripts/SS3D/Systems/Inventory/UI/InventoryView.cs b/Assets/Scripts/SS3D/Systems/Inventory/UI/InventoryView.cs
index 324a098764..5787e128ec 100644
--- a/Assets/Scripts/SS3D/Systems/Inventory/UI/InventoryView.cs
+++ b/Assets/Scripts/SS3D/Systems/Inventory/UI/InventoryView.cs
@@ -72,7 +72,7 @@ private void InventoryOnContainerClosed(AttachedContainer container)
                     continue;
                 }
 
-                _containerDisplays[i].UiElement.Destroy();
+                _containerDisplays[i].UiElement.Dispose(true);
                 _containerDisplays.RemoveAt(i);
                 return;
             }
diff --git a/Assets/Scripts/SS3D/Systems/Inventory/UI/ItemGrid.cs b/Assets/Scripts/SS3D/Systems/Inventory/UI/ItemGrid.cs
index 0ca3467d80..9bc35e95fe 100644
--- a/Assets/Scripts/SS3D/Systems/Inventory/UI/ItemGrid.cs
+++ b/Assets/Scripts/SS3D/Systems/Inventory/UI/ItemGrid.cs
@@ -107,7 +107,7 @@ private void ContainerOnContentsChanged(Container container, IEnumerable<Item> o
                             }
 
                             _gridItems.RemoveAt(i);
-                            gridItem.gameObject.Destroy();
+                            gridItem.gameObject.Dispose(true);
                             break;
                         }
                     }
diff --git a/Assets/Scripts/SS3D/Systems/Inventory/UI/ItemGridItem.cs b/Assets/Scripts/SS3D/Systems/Inventory/UI/ItemGridItem.cs
index fd32db32f1..3aef1ee179 100644
--- a/Assets/Scripts/SS3D/Systems/Inventory/UI/ItemGridItem.cs
+++ b/Assets/Scripts/SS3D/Systems/Inventory/UI/ItemGridItem.cs
@@ -8,7 +8,7 @@ public override void OnDropAccepted()
         {
             base.OnDropAccepted();
             (InventoryDisplayElement as ItemGrid)?.RemoveGridItem(this);
-            gameObject.Destroy();
+            gameObject.Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/SS3D/Systems/Lobby/UI/PlayerUsernameListView.cs b/Assets/Scripts/SS3D/Systems/Lobby/UI/PlayerUsernameListView.cs
index ac8d8e07e1..4394ad5d9a 100644
--- a/Assets/Scripts/SS3D/Systems/Lobby/UI/PlayerUsernameListView.cs
+++ b/Assets/Scripts/SS3D/Systems/Lobby/UI/PlayerUsernameListView.cs
@@ -114,13 +114,13 @@ private void RemoveUsernameUI(string ckey)
             foreach (PlayerUsernameView playerUsernameUI in _playerUsernames.Where(playerUsernameUI => playerUsernameUI.Name.Equals(ckey)))
             {
                 removedUsername = playerUsernameUI;
-                playerUsernameUI.gameObject.Destroy();
+                playerUsernameUI.gameObject.Dispose(true);
             }
 
             if (removedUsername != null)
             {
                 _playerUsernames.Remove(removedUsername);
-                removedUsername.gameObject.Destroy();
+                removedUsername.gameObject.Dispose(true);
             }
         }
     }
diff --git a/Assets/Scripts/SS3D/Systems/Permissions/DisableIfNotAdmin.cs b/Assets/Scripts/SS3D/Systems/Permissions/DisableIfNotAdmin.cs
index 1ec3721dc5..7f0d2e37b9 100644
--- a/Assets/Scripts/SS3D/Systems/Permissions/DisableIfNotAdmin.cs
+++ b/Assets/Scripts/SS3D/Systems/Permissions/DisableIfNotAdmin.cs
@@ -53,7 +53,7 @@ private void DisableObjects()
 
             foreach (GameObject o in _objectsToDisable.Where(o => o != null))
             {
-                o.Destroy();
+                o.Dispose(true);
             }
         }
     }
diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/GhostManager.cs b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/GhostManager.cs
index cec65d4f91..803a700e5f 100644
--- a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/GhostManager.cs
+++ b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/GhostManager.cs
@@ -1,10 +1,8 @@
-using SS3D.Core.Behaviours;
-using SS3D.Systems.Tile;
-using System.Collections;
-using System.Collections.Generic;
+using Coimbra;
 using UnityEngine;
+using Actor = SS3D.Core.Behaviours.Actor;
 
-namespace SS3D.Systems.Tile.UI
+namespace SS3D.Systems.Tile.TileMapCreator
 {
     /// <summary>
     /// Class for creating and managing ghost objects used by the TileMapCreator.
@@ -45,7 +43,7 @@ public void DestroyGhost()
         {
             if (_ghostObject != null)
             {
-                Destroy(_ghostObject);
+                _ghostObject.Dispose(true);
                 _ghostObject = null;
             }
         }
diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/TileMapCreator.cs b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/TileMapCreator.cs
index 219dd80326..fe1cff6d30 100644
--- a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/TileMapCreator.cs
+++ b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/TileMapCreator.cs
@@ -1,3 +1,4 @@
+using Coimbra;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -11,6 +12,7 @@
 using FishNet.Connection;
 using SS3D.Logging;
 using SS3D.Core.Behaviours;
+using SS3D.Systems.Tile.TileMapCreator;
 
 namespace SS3D.Systems.Tile.UI
 {
@@ -264,7 +266,7 @@ private void ClearGrid()
         {
             for (int i = 0; i < _contentRoot.transform.childCount; i++)
             {
-                Destroy(_contentRoot.transform.GetChild(i).gameObject);
+                _contentRoot.transform.GetChild(i).gameObject.Dispose(true);
             }
         }
 
diff --git a/Packages/manifest.json b/Packages/manifest.json
index ffa81987ee..006f5accc7 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,16 +1,16 @@
 {
   "dependencies": {
-    "com.coimbrastudios.core": "10.8.1",
+    "com.coimbrastudios.core": "11.0.5",
     "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
     "com.johannesmp.unityscenereference": "1.1.1",
     "com.unity.2d.sprite": "1.0.0",
-    "com.unity.collab-proxy": "1.15.15",
-    "com.unity.ide.rider": "3.0.13",
-    "com.unity.ide.visualstudio": "2.0.14",
+    "com.unity.collab-proxy": "1.17.7",
+    "com.unity.ide.rider": "3.0.16",
+    "com.unity.ide.visualstudio": "2.0.16",
     "com.unity.ide.vscode": "1.2.5",
-    "com.unity.inputsystem": "1.3.0",
-    "com.unity.postprocessing": "3.2.1",
-    "com.unity.shadergraph": "12.1.6",
+    "com.unity.inputsystem": "1.4.4",
+    "com.unity.postprocessing": "3.2.2",
+    "com.unity.shadergraph": "12.1.8",
     "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.toolchain.linux-x86_64": "2.0.2",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index c643f9d52b..fb3b0a9fbe 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,17 +1,15 @@
 {
   "dependencies": {
     "com.coimbrastudios.core": {
-      "version": "10.8.1",
+      "version": "11.0.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.cysharp.unitask": "2.3.1",
         "com.unity.addressables": "1.18.19",
-        "com.unity.ide.rider": "3.0.14",
-        "com.unity.ide.vscode": "1.2.5",
-        "com.unity.ide.visualstudio": "2.0.15",
+        "com.unity.ide.rider": "3.0.15",
+        "com.unity.ide.visualstudio": "2.0.16",
         "com.unity.profiling.core": "1.0.2",
-        "com.unity.roslyn": "0.2.2-preview",
         "com.unity.ugui": "1.0.0"
       },
       "url": "https://package.openupm.com"
@@ -51,7 +49,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.collab-proxy": {
-      "version": "1.15.15",
+      "version": "1.17.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -67,8 +65,8 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.14",
-      "depth": 1,
+      "version": "3.0.16",
+      "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.ext.nunit": "1.0.6"
@@ -76,8 +74,8 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.15",
-      "depth": 1,
+      "version": "2.0.16",
+      "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.test-framework": "1.1.9"
@@ -92,7 +90,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.inputsystem": {
-      "version": "1.3.0",
+      "version": "1.4.4",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -100,8 +98,15 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.nuget.newtonsoft-json": {
+      "version": "3.0.2",
+      "depth": 2,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.postprocessing": {
-      "version": "3.2.1",
+      "version": "3.2.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -117,7 +122,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.render-pipelines.core": {
-      "version": "12.1.6",
+      "version": "12.1.8",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
@@ -126,15 +131,8 @@
         "com.unity.modules.jsonserialize": "1.0.0"
       }
     },
-    "com.unity.roslyn": {
-      "version": "0.2.2-preview",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.scriptablebuildpipeline": {
-      "version": "1.19.6",
+      "version": "1.20.1",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
@@ -148,20 +146,22 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.core": {
-      "version": "1.0.1",
+      "version": "1.6.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0"
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.nuget.newtonsoft-json": "3.0.2",
+        "com.unity.modules.androidjni": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.shadergraph": {
-      "version": "12.1.6",
+      "version": "12.1.8",
       "depth": 0,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "12.1.6",
+        "com.unity.render-pipelines.core": "12.1.8",
         "com.unity.searcher": "4.9.1"
       }
     },
diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset
index 2280a80db6..4d6aee701b 100644
--- a/ProjectSettings/PackageManagerSettings.asset
+++ b/ProjectSettings/PackageManagerSettings.asset
@@ -12,10 +12,11 @@ MonoBehaviour:
   m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EnablePreviewPackages: 1
+  m_EnablePreReleasePackages: 0
   m_EnablePackageDependencies: 0
   m_AdvancedSettingsExpanded: 1
   m_ScopedRegistriesSettingsExpanded: 1
+  m_SeeAllPackageVersions: 0
   oneTimeWarningShown: 1
   m_Registries:
   - m_Id: main
@@ -24,35 +25,28 @@ MonoBehaviour:
     m_Scopes: []
     m_IsDefault: 1
     m_Capabilities: 7
-  - m_Id: scoped:package.openupm.com
+    m_ConfigSource: 0
+  - m_Id: scoped:project:package.openupm.com
     m_Name: package.openupm.com
     m_Url: https://package.openupm.com
     m_Scopes:
     - com.johannesmp.unityscenereference
     m_IsDefault: 0
     m_Capabilities: 0
-  - m_Id: scoped:com.coimbrastudios.core
+    m_ConfigSource: 4
+  - m_Id: scoped:project:com.coimbrastudios.core
     m_Name: com.coimbrastudios.core
     m_Url: https://package.openupm.com
     m_Scopes:
     - com.coimbrastudios.core
     m_IsDefault: 0
     m_Capabilities: 0
-  m_UserSelectedRegistryName: 
+    m_ConfigSource: 4
+  m_UserSelectedRegistryName: package.openupm.com
   m_UserAddingNewScopedRegistry: 0
   m_RegistryInfoDraft:
-    m_ErrorMessage: 
-    m_Original:
-      m_Id: scoped:package.openupm.com
-      m_Name: package.openupm.com
-      m_Url: https://package.openupm.com
-      m_Scopes:
-      - com.johannesmp.unityscenereference
-      m_IsDefault: 0
-      m_Capabilities: 0
     m_Modified: 0
-    m_Name: package.openupm.com
-    m_Url: https://package.openupm.com
-    m_Scopes:
-    - com.johannesmp.unityscenereference
-    m_SelectedScopeIndex: 0
+    m_ErrorMessage: 
+    m_UserModificationsInstanceId: -826
+    m_OriginalInstanceId: -830
+  m_LoadAssets: 0
diff --git a/ProjectSettings/Packages/com.coimbrastudios.core/LintingSettings.asset b/ProjectSettings/Packages/com.coimbrastudios.core/LintingSettings.asset
new file mode 100644
index 0000000000..5fae592543
--- /dev/null
+++ b/ProjectSettings/Packages/com.coimbrastudios.core/LintingSettings.asset
@@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9ae81be699784026a1cf1631b92cecb9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _preload: 0
+  _type: 1
+  <DisableLocalUnityAnalyzers>k__BackingField: 0
+  <AssemblyDefinitionRules>k__BackingField:
+  - {fileID: 11400000, guid: 30f3d018aa91612458a73822b63c1733, type: 2}
+  - {fileID: 11400000, guid: fbf9a035505766a41b1f7fb8e54fbe15, type: 2}
+  - {fileID: 11400000, guid: c118adc722ff7994c8bfe76332da9b3f, type: 2}
+  - {fileID: 11400000, guid: bd97c2eb44693c44589fc7fbcde28a29, type: 2}
+  - {fileID: 11400000, guid: ef0791cf148fdd9448284359b6b312ab, type: 2}
+  - {fileID: 11400000, guid: 9c9fc9d6ef1bad04b976c792302e8ed0, type: 2}
+  - {fileID: 11400000, guid: 58460b9a11c55a749924b05acd6efc4b, type: 2}
+  - {fileID: 11400000, guid: 08c8f835d645d9340b7def3a31fead74, type: 2}
+  - {fileID: 11400000, guid: 724079212532c9840a307b6a7fe9ba88, type: 2}
+  - {fileID: 11400000, guid: edd3021720ab4a24ca46ffb39b2b7eb9, type: 2}
+  - {fileID: 11400000, guid: 3ba3cb4ef983c9a43b25adafc1757b84, type: 2}
+  - {fileID: 11400000, guid: 8785eb2eeddc1fd40b90de45916dc280, type: 2}
+  - {fileID: 11400000, guid: 29537581b2d432a44a3e12b2f8062bfd, type: 2}
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index 3384268ebd..eabd633779 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.0f1
-m_EditorVersionWithRevision: 2021.3.0f1 (6eacc8284459)
+m_EditorVersion: 2021.3.15f1
+m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834)