diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f168d45..ce0d401 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,8 @@ jobs: unityVersion: - 2021.3.3f1 - 2021.3.45f1 - - 2022.3.50f1 - - 6000.0.23f1 + - 2022.3.53f1 + - 6000.0.29f1 targetPlatform: - StandaloneLinux64 - StandaloneWindows64 diff --git a/Packages/io.savolainen.unitygit/Core/Services/StatusService.cs b/Packages/io.savolainen.unitygit/Core/Services/StatusService.cs index 0bf3224..8192b97 100644 --- a/Packages/io.savolainen.unitygit/Core/Services/StatusService.cs +++ b/Packages/io.savolainen.unitygit/Core/Services/StatusService.cs @@ -88,7 +88,10 @@ private void RemoveInvalidRepositories(IList repositories) } foreach (var index in indexesToRemove) + { + repositories[index].Dispose(); repositories.RemoveAt(index); + } } } diff --git a/Packages/manifest.json b/Packages/manifest.json index d457d21..29459b1 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,12 +1,11 @@ { "dependencies": { "com.marijnzwemmer.unity-toolbar-extender": "1.4.2", - "com.unity.ide.rider": "3.0.31", + "com.unity.ide.rider": "3.0.34", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.test-framework": "1.1.33", "com.unity.testtools.codecoverage": "1.2.6", - "com.unity.textmeshpro": "3.0.7", "com.unity.ugui": "1.0.0", "io.savolainen.uicomponents": "1.0.0-beta.9", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 7ee7afd..19a5a75 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -15,7 +15,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.31", + "version": "3.0.34", "depth": 0, "source": "registry", "dependencies": { @@ -40,7 +40,7 @@ "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "1.0.3", + "version": "2.0.1", "depth": 1, "source": "registry", "dependencies": {}, @@ -67,15 +67,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.textmeshpro": { - "version": "3.0.7", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, @@ -247,17 +238,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json b/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json index 8e9fce6..3c697ec 100644 --- a/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json +++ b/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json @@ -1,6 +1,4 @@ { - "m_Name": "Settings", - "m_Path": "ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json", "m_Dictionary": { "m_DictionaryValues": [ { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 8386a05..ba6dfe7 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.45f1 -m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79) +m_EditorVersion: 2022.3.53f1 +m_EditorVersionWithRevision: 2022.3.53f1 (df4e529d20d3) diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29..0000000