diff --git a/Packages/io.savolainen.unitygit-tests/Core/GitProcessTests.cs b/Packages/io.savolainen.unitygit-tests/Core/GitProcessTests.cs index 3d81822..9136cd8 100644 --- a/Packages/io.savolainen.unitygit-tests/Core/GitProcessTests.cs +++ b/Packages/io.savolainen.unitygit-tests/Core/GitProcessTests.cs @@ -80,7 +80,7 @@ public IEnumerator It_Times_Out_After_Given_Milliseconds() process.StartInfo.WorkingDirectory = Directory.GetCurrentDirectory(); var gitProcess = new GitProcess(process); - gitProcess.SetTimeout(1); + gitProcess.SetTimeout(10); var task = gitProcess.Run(); diff --git a/Packages/io.savolainen.unitygit/Core/Services/CommitService.cs b/Packages/io.savolainen.unitygit/Core/Services/CommitService.cs index 7f63725..165b8c9 100644 --- a/Packages/io.savolainen.unitygit/Core/Services/CommitService.cs +++ b/Packages/io.savolainen.unitygit/Core/Services/CommitService.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using LibGit2Sharp; using UIComponents; -using UnityEngine; namespace UnityGit.Core.Services { diff --git a/Packages/io.savolainen.unitygit/Core/Services/GitCommandService.cs b/Packages/io.savolainen.unitygit/Core/Services/GitCommandService.cs index a9a4089..9066eb6 100644 --- a/Packages/io.savolainen.unitygit/Core/Services/GitCommandService.cs +++ b/Packages/io.savolainen.unitygit/Core/Services/GitCommandService.cs @@ -11,8 +11,6 @@ namespace UnityGit.Core.Services public interface IGitCommandService { Task Run(GitCommandInfo info); - - bool IsRunning { get; } } [Dependency(typeof(IProgressService), provide: typeof(ProgressService))] diff --git a/Packages/manifest.json b/Packages/manifest.json index 96e978f..eb7683c 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,15 +1,15 @@ { "dependencies": { "com.marijnzwemmer.unity-toolbar-extender": "1.4.2", - "com.unity.collab-proxy": "2.0.7", - "com.unity.ide.rider": "3.0.25", - "com.unity.ide.visualstudio": "2.0.21", + "com.unity.collab-proxy": "2.1.0", + "com.unity.ide.rider": "3.0.26", + "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.4", "com.unity.textmeshpro": "3.0.6", "com.unity.ugui": "1.0.0", - "io.savolainen.uicomponents": "1.0.0-beta.6", + "io.savolainen.uicomponents": "1.0.0-beta.8", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 16163cb..16fff3d 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -8,7 +8,7 @@ "url": "https://package.openupm.com" }, "com.unity.collab-proxy": { - "version": "2.0.7", + "version": "2.1.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -22,7 +22,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.25", + "version": "3.0.26", "depth": 0, "source": "registry", "dependencies": { @@ -31,7 +31,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.21", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -99,7 +99,7 @@ "dependencies": {} }, "io.savolainen.uicomponents": { - "version": "1.0.0-beta.6", + "version": "1.0.0-beta.8", "depth": 0, "source": "registry", "dependencies": {}, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index db3863a..9706d86 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.29f1 -m_EditorVersionWithRevision: 2021.3.29f1 (204d6dc9ae1c) +m_EditorVersion: 2021.3.31f1 +m_EditorVersionWithRevision: 2021.3.31f1 (3409e2af086f)