From 7257b469eb1bc4f6e9f421481465056699a9423c Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 22 Mar 2018 11:37:22 -0700 Subject: [PATCH 1/4] Making code signing sychronous so it doesn't freeze docker --- .gitignore | 2 ++ src/Update/Program.cs | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index fb65cb075..e19da2bdf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ ## Eclipse ################# +vendor/nuget* +.vs/* *.pydevproject .project .metadata diff --git a/src/Update/Program.cs b/src/Update/Program.cs index 24c564075..c466d141a 100644 --- a/src/Update/Program.cs +++ b/src/Update/Program.cs @@ -344,6 +344,7 @@ public async Task Uninstall(string appName = null) public void Releasify(string package, string targetDir = null, string packagesDir = null, string bootstrapperExe = null, string backgroundGif = null, string signingOpts = null, string baseUrl = null, string setupIcon = null, bool generateMsi = true, string frameworkVersion = null, bool generateDeltas = true) { + this.Log().Info("This is a custom version of Squirrel's Update.exe for Plays.tv"); ensureConsole(); if (baseUrl != null) { @@ -404,16 +405,16 @@ public void Releasify(string package, string targetDir = null, string packagesDi new DirectoryInfo(pkgPath).GetAllFilesRecursively() .Where(x => Utility.FileIsLikelyPEImage(x.Name)) - .ForEachAsync(async x => { - if (isPEFileSigned(x.FullName)) { + .ForEach(x => { + if (isPEFileSigned(x.FullName)) + { this.Log().Info("{0} is already signed, skipping", x.FullName); return; } this.Log().Info("About to sign {0}", x.FullName); - await signPEFile(x.FullName, signingOpts); - }, 1) - .Wait(); + signPEFile(x.FullName, signingOpts).Wait(); + }); }); processed.Add(rp.ReleasePackageFile); From 032d07b58a1e22b2b69667ccb5f9f984795f41d8 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 22 Mar 2018 15:06:45 -0700 Subject: [PATCH 2/4] Removing extra log line --- src/Update/Program.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Update/Program.cs b/src/Update/Program.cs index c466d141a..280958fed 100644 --- a/src/Update/Program.cs +++ b/src/Update/Program.cs @@ -344,7 +344,6 @@ public async Task Uninstall(string appName = null) public void Releasify(string package, string targetDir = null, string packagesDir = null, string bootstrapperExe = null, string backgroundGif = null, string signingOpts = null, string baseUrl = null, string setupIcon = null, bool generateMsi = true, string frameworkVersion = null, bool generateDeltas = true) { - this.Log().Info("This is a custom version of Squirrel's Update.exe for Plays.tv"); ensureConsole(); if (baseUrl != null) { From 689d736376c36ea98706a24cbb7a8ef20aa36e91 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 22 Mar 2018 15:16:29 -0700 Subject: [PATCH 3/4] Undo edits to .gitignore --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e19da2bdf..659e8f8da 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,6 @@ ## Eclipse ################# -vendor/nuget* -.vs/* *.pydevproject .project .metadata @@ -183,3 +181,4 @@ tests/Test.xml ## CPP db crap *.db *.opendb +/.vs/Squirrel/v15 From e4fb452a23d9475285f907ae6884485319dfeecd Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 22 Mar 2018 15:18:29 -0700 Subject: [PATCH 4/4] Update .gitignore file --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 659e8f8da..fb65cb075 100644 --- a/.gitignore +++ b/.gitignore @@ -181,4 +181,3 @@ tests/Test.xml ## CPP db crap *.db *.opendb -/.vs/Squirrel/v15