Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing warning

Browse Source
This commit is contained in:
Kevin Bost
2024-12-09 00:08:42 -08:00
committed by Caelan
parent 0a0ba01c90
commit d6ab644171
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vpk/Velopack.Packaging.Windows/Commands/WindowsPackCommandRunner.cs
View File

@@ -176,7 +176,7 @@ public class WindowsPackCommandRunner : PackageBuilder<WindowsPackOptions>
return String.Join(",", validated); return String.Join(",", validated);
} }
protected override async Task CreateSetupPackage(Action<int> progress, string releasePkg, string packDir, string targetSetupExe) protected override Task CreateSetupPackage(Action<int> progress, string releasePkg, string packDir, string targetSetupExe)
{ {
var bundledZip = new ZipPackage(releasePkg); var bundledZip = new ZipPackage(releasePkg);
IoUtil.Retry(() => File.Copy(HelperFile.SetupPath, targetSetupExe, true)); IoUtil.Retry(() => File.Copy(HelperFile.SetupPath, targetSetupExe, true));
@@ -198,6 +198,8 @@ public class WindowsPackCommandRunner : PackageBuilder<WindowsPackOptions>
SignFilesImpl(Options, CoreUtil.CreateProgressDelegate(progress, 50, 100), targetSetupExe); SignFilesImpl(Options, CoreUtil.CreateProgressDelegate(progress, 50, 100), targetSetupExe);
Log.Debug($"Setup bundle created '{Path.GetFileName(targetSetupExe)}'."); Log.Debug($"Setup bundle created '{Path.GetFileName(targetSetupExe)}'.");
progress(100); progress(100);
return Task.CompletedTask;
} }
protected override async Task CreatePortablePackage(Action<int> progress, string packDir, string outputPath) protected override async Task CreatePortablePackage(Action<int> progress, string packDir, string outputPath)
@@ -272,7 +274,7 @@ public class WindowsPackCommandRunner : PackageBuilder<WindowsPackOptions>
Log.Info($"Use Azure Trusted Signing service for code signing. Metadata file path: {trustedSignMetadataPath}"); Log.Info($"Use Azure Trusted Signing service for code signing. Metadata file path: {trustedSignMetadataPath}");
string dlibPath = GetDlibPath(CancellationToken.None); string dlibPath = GetDlibPath(CancellationToken.None);
signParams = $"/fd SHA256 /tr \"http://timestamp.acs.microsoft.com\" /v /debug /td SHA256 /dlib \"{dlibPath}\" /dmdf \"{trustedSignMetadataPath}\""; signParams = $"/fd SHA256 /tr http://timestamp.acs.microsoft.com /v /debug /td SHA256 /dlib {HelperFile.AzureDlibFileName} /dmdf \"{trustedSignMetadataPath}\"";
helper.Sign(filePaths, signParams, signParallel, progress, false); helper.Sign(filePaths, signParams, signParallel, progress, false);
} else if (!string.IsNullOrEmpty(signParams)) { } else if (!string.IsNullOrEmpty(signParams)) {
helper.Sign(filePaths, signParams, signParallel, progress, false); helper.Sign(filePaths, signParams, signParallel, progress, false);