Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit d57b14c

Browse files
shanashana
authored
Merge pull request #643 from github-for-unity/releases/v0.30
Release 0.30.10 beta 1
2 parents dcd667e + 1ec2bcc commit d57b14c

File tree

33 files changed

+139
-211
lines changed

33 files changed

+139
-211
lines changed

‎common/SolutionInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
namespace System
3232
{
3333
internal static class AssemblyVersionInformation {
34-
internal const string Version = "0.30.3";
34+
internal const string Version = "0.30.10";
3535
}
3636
}

‎octorun/src/bin/app-organizations.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ try {
1717
process.exit();
1818
}
1919
else {
20-
let results = [];
20+
results = [];
2121
for (var i = 0; i < result.length; i++) {
2222
results.push(result[i].name);
2323
results.push(result[i].login);

‎octorun/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8008bf3da68428f50368cf2fe3fe290df4acad54
1+
b91b7b60

‎src/GitHub.Api/Application/ApplicationManagerBase.cs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,7 @@ public void Run(bool firstRun)
6161
isBusy = true;
6262

6363
var octorunInstaller = new OctorunInstaller(Environment, TaskManager);
64-
var setupTask = octorunInstaller
65-
.SetupOctorunIfNeeded()
66-
.Then((s, octorunPath) =>
67-
{
68-
Environment.OctorunScriptPath = octorunPath;
69-
});
64+
var setupTask = octorunInstaller.SetupOctorunIfNeeded();
7065

7166
var initializeGitTask = new FuncTask<NPath>(CancellationToken, () =>
7267
{
@@ -78,12 +73,23 @@ public void Run(bool firstRun)
7873
}
7974
return NPath.Default;
8075
});
76+
var setOctorunEnvironmentTask = new ActionTask<NPath>(CancellationToken, (s, octorunPath) =>
77+
{
78+
Environment.OctorunScriptPath = octorunPath;
79+
});
80+
81+
setupTask.OnEnd += (t, path, _, __) =>
82+
{
83+
t.GetEndOfChain().Then(setOctorunEnvironmentTask).Then(initializeGitTask);
84+
};
8185

8286
initializeGitTask.OnEnd += (t, path, _, __) =>
8387
{
8488
if (path.IsInitialized)
89+
{
90+
t.GetEndOfChain().Then(initEnvironmentTask, taskIsTopOfChain: true);
8591
return;
86-
92+
}
8793
Logger.Trace("Using portable git");
8894

8995
var gitInstaller = new GitInstaller(Environment, ProcessManager, TaskManager);
@@ -99,7 +105,7 @@ public void Run(bool firstRun)
99105
t.Then(task, taskIsTopOfChain: true);
100106
};
101107

102-
setupTask.Then(initializeGitTask).Start();
108+
setupTask.Start();
103109
}
104110

105111
public ITask InitializeRepository()
@@ -201,11 +207,11 @@ protected void SetupMetrics(string unityVersion, bool firstRun)
201207
/// <param name="octorunScriptPath"></param>
202208
private void InitializeEnvironment(NPath gitExecutablePath)
203209
{
210+
isBusy = false;
204211
SetupMetrics();
205212

206213
if (!gitExecutablePath.IsInitialized)
207214
{
208-
isBusy = false;
209215
return;
210216
}
211217

‎src/GitHub.Api/GitHub.Api.csproj

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@
135135
<Compile Include="Git\GitStatusEntry.cs" />
136136
<Compile Include="Git\IGitObjectFactory.cs" />
137137
<Compile Include="Git\Tasks\GitRevertTask.cs" />
138-
<Compile Include="IO\FileSystemHelpers.cs" />
139138
<Compile Include="Application\IApplicationManager.cs" />
140139
<Compile Include="Tasks\ActionTask.cs" />
141140
<Compile Include="Tasks\BaseOutputProcessor.cs" />
@@ -276,31 +275,14 @@
276275
<Content Include="PlatformResources\windows\git.zip">
277276
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
278277
</Content>
279-
<EmbeddedResource Include="PlatformResources\mac\gitconfig">
280-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
281-
</EmbeddedResource>
282-
<EmbeddedResource Include="PlatformResources\windows\gitconfig">
283-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
284-
</EmbeddedResource>
285-
</ItemGroup>
286-
<ItemGroup>
287-
<EmbeddedResource Include="Resources\.gitattributes" />
288-
<EmbeddedResource Include="Resources\.gitignore" />
289-
<EmbeddedResource Include="Resources\octorun.zip" />
290-
</ItemGroup>
291-
<ItemGroup>
292-
<EmbeddedResource Include="Localization.resx">
293-
<Generator>PublicResXFileCodeGenerator</Generator>
294-
<LastGenOutput>Localization.Designer.cs</LastGenOutput>
295-
<SubType>Designer</SubType>
296-
</EmbeddedResource>
297-
</ItemGroup>
298-
<ItemGroup>
299-
<None Include="packages.config" />
278+
<EmbeddedResource Include="PlatformResources\mac\gitconfig" />
279+
<EmbeddedResource Include="PlatformResources\windows\gitconfig" />
300280
<Content Include="PlatformResources\linux\git-lfs.zip">
301281
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
302282
</Content>
303-
<Content Include="PlatformResources\linux\git-lfs.zip.md5" />
283+
<Content Include="PlatformResources\linux\git-lfs.zip.md5">
284+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
285+
</Content>
304286
<Content Include="PlatformResources\mac\git-lfs.zip.md5">
305287
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
306288
</Content>
@@ -310,11 +292,24 @@
310292
<Content Include="PlatformResources\windows\git.zip.md5">
311293
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
312294
</Content>
313-
<EmbeddedResource Include="PlatformResources\linux\gitconfig">
295+
<EmbeddedResource Include="PlatformResources\linux\gitconfig" />
296+
<EmbeddedResource Include="Resources\.gitattributes" />
297+
<EmbeddedResource Include="Resources\.gitignore" />
298+
<Content Include="Resources\octorun.zip">
299+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
300+
</Content>
301+
<Content Include="Resources\octorun.zip.md5">
314302
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
303+
</Content>
304+
</ItemGroup>
305+
<ItemGroup>
306+
<None Include="packages.config" />
307+
<EmbeddedResource Include="Localization.resx">
308+
<Generator>PublicResXFileCodeGenerator</Generator>
309+
<LastGenOutput>Localization.Designer.cs</LastGenOutput>
310+
<SubType>Designer</SubType>
315311
</EmbeddedResource>
316312
</ItemGroup>
317-
<ItemGroup />
318313
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
319314
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
320315
Other similar extension points exist, see Microsoft.Common.targets.

‎src/GitHub.Api/IO/FileSystemHelpers.cs

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/GitHub.Api/IO/NiceIO.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ public override string ToString()
378378
public string ToString(SlashMode slashMode)
379379
{
380380
if (!_isInitialized)
381-
return null;
381+
return String.Empty;
382382

383383
// Check if it's linux root /
384384
if (IsRoot && string.IsNullOrEmpty(_driveLetter))

‎src/GitHub.Api/Installer/GitInstaller.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public ITask<NPath> SetupGitIfNeeded()
4444
if (!environment.IsWindows)
4545
{
4646
startTask = new FindExecTask("git", cancellationToken)
47-
.Configure(processManager);
47+
.Configure(processManager, false, true);
4848
// we should doublecheck that system git is usable here
4949
installationState = new GitInstallationState
5050
{
@@ -174,7 +174,7 @@ private FuncTask<NPath> ExtractPortableGit(GitInstallationState state)
174174
source.Move(target);
175175
state.GitExists = installDetails.GitExecutablePath.FileExists();
176176
state.GitIsValid = s;
177-
return path;
177+
return target;
178178
});
179179
task = unzipTask;
180180
}
@@ -197,15 +197,15 @@ private FuncTask<NPath> ExtractPortableGit(GitInstallationState state)
197197
source.Move(target);
198198
state.GitExists = target.FileExists();
199199
state.GitIsValid = s;
200-
return path;
200+
return target;
201201
});
202202
task = task?.Then(unzipTask) ?? unzipTask;
203203
}
204204

205205
return task.Finally(new FuncTask<NPath>(cancellationToken, (success) =>
206206
{
207207
tempZipExtractPath.DeleteIfExists();
208-
return installDetails.GitInstallationPath;
208+
return installDetails.GitExecutablePath;
209209
}));
210210
}
211211

‎src/GitHub.Api/Installer/OctorunInstaller.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public ITask<NPath> SetupOctorunIfNeeded()
4646
var unzipTask = new UnzipTask(taskManager.Token, installDetails.ZipFile,
4747
tempZipExtractPath, sharpZipLibHelper,
4848
fileSystem)
49-
.Then((success, p) => MoveOctorun(p));
49+
.Then((success, extractPath) => MoveOctorun(extractPath.Combine("octorun")));
5050
t.Then(unzipTask);
5151
}
5252
};
@@ -101,10 +101,8 @@ public class OctorunInstallDetails
101101
{
102102
public const string DefaultZipMd5Url = "https://ghfvs-installer.github.com/unity/octorun/octorun.zip.md5";
103103
public const string DefaultZipUrl = "https://ghfvs-installer.github.com/unity/octorun/octorun.zip";
104-
public const string ExtractedMD5 = "b7341015bc701a9f5bf83f51b1b596b7";
105-
public const string ExecutableMD5 = "50570ed932559f294d1a1361801740b9";
106104

107-
public const string PackageVersion = "8008bf3da68428f50368cf2fe3fe290df4acad54";
105+
public const string PackageVersion = "b91b7b60";
108106
private const string PackageName = "octorun";
109107
private const string zipFile = "octorun.zip";
110108

‎src/GitHub.Api/OutputProcessors/IProcessManager.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ namespace GitHub.Unity
44
{
55
public interface IProcessManager
66
{
7-
T Configure<T>(T processTask, NPath? executable = null, string arguments = null, NPath? workingDirectory = null, bool withInput = false)
7+
T Configure<T>(T processTask, NPath? executable = null, string arguments = null, NPath? workingDirectory = null,
8+
bool withInput = false, bool dontSetupGit = false)
89
where T : IProcess;
910
IProcess Reconnect(IProcess processTask, int i);
1011
CancellationToken CancellationToken { get; }

0 commit comments

Comments
 (0)