Merge pull request #643 from github-for-unity/releases/v0.30

Release 0.30.10 beta 1

Author: shana

common/SolutionInfo.cs

@@ -31,6 +31,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "0.30.3";
+        internal const string Version = "0.30.10";
     }
 }

octorun/src/bin/app-organizations.js

@@ -17,7 +17,7 @@ try {
             process.exit();
         }
         else {
-            let results = [];
+            results = [];
             for (var i = 0; i < result.length; i++) {
                 results.push(result[i].name);
                 results.push(result[i].login);

octorun/version

@@ -1 +1 @@
-8008bf3da68428f50368cf2fe3fe290df4acad54
+b91b7b60

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -61,12 +61,7 @@ public void Run(bool firstRun)
             isBusy = true;
 
             var octorunInstaller = new OctorunInstaller(Environment, TaskManager);
-            var setupTask = octorunInstaller
-                .SetupOctorunIfNeeded()
-                .Then((s, octorunPath) =>
-                    {
-                        Environment.OctorunScriptPath = octorunPath;
-                    });
+            var setupTask = octorunInstaller.SetupOctorunIfNeeded();
 
             var initializeGitTask = new FuncTask<NPath>(CancellationToken, () =>
                 {
@@ -78,12 +73,23 @@ public void Run(bool firstRun)
                     }
                     return NPath.Default;
                 });
+            var setOctorunEnvironmentTask = new ActionTask<NPath>(CancellationToken, (s, octorunPath) =>
+                {
+                    Environment.OctorunScriptPath = octorunPath;
+                });
+
+            setupTask.OnEnd += (t, path, _, __) =>
+                {
+                    t.GetEndOfChain().Then(setOctorunEnvironmentTask).Then(initializeGitTask);
+                };
 
             initializeGitTask.OnEnd += (t, path, _, __) =>
                 {
                     if (path.IsInitialized)
+                    {
+                        t.GetEndOfChain().Then(initEnvironmentTask, taskIsTopOfChain: true);
                         return;
-
+                    }
                     Logger.Trace("Using portable git");
 
                     var gitInstaller = new GitInstaller(Environment, ProcessManager, TaskManager);
@@ -99,7 +105,7 @@ public void Run(bool firstRun)
                     t.Then(task, taskIsTopOfChain: true);
                 };
 
-            setupTask.Then(initializeGitTask).Start();
+            setupTask.Start();
         }
 
         public ITask InitializeRepository()
@@ -201,11 +207,11 @@ protected void SetupMetrics(string unityVersion, bool firstRun)
         /// <param name="octorunScriptPath"></param>
         private void InitializeEnvironment(NPath gitExecutablePath)
         {
+            isBusy = false;
             SetupMetrics();
 
             if (!gitExecutablePath.IsInitialized)
             {
-                isBusy = false;
                 return;
             }
 

src/GitHub.Api/GitHub.Api.csproj

@@ -135,7 +135,6 @@
     <Compile Include="Git\GitStatusEntry.cs" />
     <Compile Include="Git\IGitObjectFactory.cs" />
     <Compile Include="Git\Tasks\GitRevertTask.cs" />
-    <Compile Include="IO\FileSystemHelpers.cs" />
     <Compile Include="Application\IApplicationManager.cs" />
     <Compile Include="Tasks\ActionTask.cs" />
     <Compile Include="Tasks\BaseOutputProcessor.cs" />
@@ -276,31 +275,14 @@
     <Content Include="PlatformResources\windows\git.zip">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <EmbeddedResource Include="PlatformResources\mac\gitconfig">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PlatformResources\windows\gitconfig">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\.gitattributes" />
-    <EmbeddedResource Include="Resources\.gitignore" />
-    <EmbeddedResource Include="Resources\octorun.zip" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Localization.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Localization.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
+    <EmbeddedResource Include="PlatformResources\mac\gitconfig" />
+    <EmbeddedResource Include="PlatformResources\windows\gitconfig" />
     <Content Include="PlatformResources\linux\git-lfs.zip">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="PlatformResources\linux\git-lfs.zip.md5" />
+    <Content Include="PlatformResources\linux\git-lfs.zip.md5">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="PlatformResources\mac\git-lfs.zip.md5">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -310,11 +292,24 @@
     <Content Include="PlatformResources\windows\git.zip.md5">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <EmbeddedResource Include="PlatformResources\linux\gitconfig">
+    <EmbeddedResource Include="PlatformResources\linux\gitconfig" />
+    <EmbeddedResource Include="Resources\.gitattributes" />
+    <EmbeddedResource Include="Resources\.gitignore" />
+    <Content Include="Resources\octorun.zip">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Resources\octorun.zip.md5">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <EmbeddedResource Include="Localization.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Localization.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

src/GitHub.Api/IO/FileSystemHelpers.cs

@@ -378,7 +378,7 @@ public override string ToString()
         public string ToString(SlashMode slashMode)
         {
             if (!_isInitialized)
-                return null;
+                return String.Empty;
 
             // Check if it's linux root /
             if (IsRoot && string.IsNullOrEmpty(_driveLetter))

src/GitHub.Api/IO/NiceIO.cs

@@ -44,7 +44,7 @@ public ITask<NPath> SetupGitIfNeeded()
             if (!environment.IsWindows)
             {
                 startTask = new FindExecTask("git", cancellationToken)
-                    .Configure(processManager);
+                    .Configure(processManager, false, true);
                 // we should doublecheck that system git is usable here
                 installationState = new GitInstallationState
                 {
@@ -174,7 +174,7 @@ private FuncTask<NPath> ExtractPortableGit(GitInstallationState state)
                     source.Move(target);
                     state.GitExists = installDetails.GitExecutablePath.FileExists();
                     state.GitIsValid = s;
-                    return path;
+                    return target;
                 });
                 task = unzipTask;
             }
@@ -197,15 +197,15 @@ private FuncTask<NPath> ExtractPortableGit(GitInstallationState state)
                     source.Move(target);
                     state.GitExists = target.FileExists();
                     state.GitIsValid = s;
-                    return path;
+                    return target;
                 });
                 task = task?.Then(unzipTask) ?? unzipTask;
             }
 
             return task.Finally(new FuncTask<NPath>(cancellationToken, (success) =>
             {
                 tempZipExtractPath.DeleteIfExists();
-                return installDetails.GitInstallationPath;
+                return installDetails.GitExecutablePath;
             }));
         }
 

src/GitHub.Api/Installer/GitInstaller.cs

@@ -46,7 +46,7 @@ public ITask<NPath> SetupOctorunIfNeeded()
                     var unzipTask = new UnzipTask(taskManager.Token, installDetails.ZipFile,
                             tempZipExtractPath, sharpZipLibHelper,
                             fileSystem)
-                        .Then((success, p) => MoveOctorun(p));
+                        .Then((success, extractPath) => MoveOctorun(extractPath.Combine("octorun")));
                     t.Then(unzipTask);
                 }
             };
@@ -101,10 +101,8 @@ public class OctorunInstallDetails
         {
             public const string DefaultZipMd5Url = "https://ghfvs-installer.github.com/unity/octorun/octorun.zip.md5";
             public const string DefaultZipUrl = "https://ghfvs-installer.github.com/unity/octorun/octorun.zip";
-            public const string ExtractedMD5 = "b7341015bc701a9f5bf83f51b1b596b7";
-            public const string ExecutableMD5 = "50570ed932559f294d1a1361801740b9";
 
-            public const string PackageVersion = "8008bf3da68428f50368cf2fe3fe290df4acad54";
+            public const string PackageVersion = "b91b7b60";
             private const string PackageName = "octorun";
             private const string zipFile = "octorun.zip";
 

src/GitHub.Api/Installer/OctorunInstaller.cs

@@ -4,7 +4,8 @@ namespace GitHub.Unity
 {
     public interface IProcessManager
     {
-        T Configure<T>(T processTask, NPath? executable = null, string arguments = null, NPath? workingDirectory = null, bool withInput = false)
+        T Configure<T>(T processTask, NPath? executable = null, string arguments = null, NPath? workingDirectory = null,
+        	bool withInput = false, bool dontSetupGit = false)
             where T : IProcess;
         IProcess Reconnect(IProcess processTask, int i);
         CancellationToken CancellationToken { get; }