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 build warnings

Browse Source
This commit is contained in:
Kevin Bost
2024-12-03 21:43:24 -08:00
committed by Caelan
parent 60d11b8998
commit 0a0ba01c90
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,14 +18,16 @@ public class WindowsPackCommandRunner : PackageBuilder<WindowsPackOptions>
{ {
} }
protected override async Task CodeSign(Action<int> progress, string packDir) protected override Task CodeSign(Action<int> progress, string packDir)
{ {
var filesToSign = new DirectoryInfo(packDir).GetAllFilesRecursively() var filesToSign = new DirectoryInfo(packDir).GetAllFilesRecursively()
.Where(x => Options.SignSkipDll ? PathUtil.PathPartEndsWith(x.Name, ".exe") : PathUtil.FileIsLikelyPEImage(x.Name)) .Where(x => Options.SignSkipDll ? PathUtil.PathPartEndsWith(x.Name, ".exe") : PathUtil.FileIsLikelyPEImage(x.Name))
.Select(x => x.FullName) .Select(x => x.FullName)
.ToArray(); .ToArray();
await SignFilesImpl(Options, progress, filesToSign); SignFilesImpl(Options, progress, filesToSign);
return Task.CompletedTask;
} }
protected override Task<string> PreprocessPackDir(Action<int> progress, string packDir) protected override Task<string> PreprocessPackDir(Action<int> progress, string packDir)
@@ -193,7 +195,7 @@ public class WindowsPackCommandRunner : PackageBuilder<WindowsPackOptions>
SetupBundle.CreatePackageBundle(targetSetupExe, releasePkg); SetupBundle.CreatePackageBundle(targetSetupExe, releasePkg);
progress(50); progress(50);
Log.Debug("Signing Setup bundle"); Log.Debug("Signing Setup bundle");
await 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);
} }
@@ -246,7 +248,7 @@ public class WindowsPackCommandRunner : PackageBuilder<WindowsPackOptions>
} }
} }
private async Task SignFilesImpl(WindowsSigningOptions options, Action<int> progress, params string[] filePaths) private void SignFilesImpl(WindowsSigningOptions options, Action<int> progress, params string[] filePaths)
{ {
var signParams = options.SignParameters; var signParams = options.SignParameters;
var signTemplate = options.SignTemplate; var signTemplate = options.SignTemplate;
@@ -269,7 +271,7 @@ public class WindowsPackCommandRunner : PackageBuilder<WindowsPackOptions>
if (!string.IsNullOrEmpty(trustedSignMetadataPath)) { if (!string.IsNullOrEmpty(trustedSignMetadataPath)) {
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 = await 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 \"{dlibPath}\" /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)) {
@@ -278,7 +280,7 @@ public class WindowsPackCommandRunner : PackageBuilder<WindowsPackOptions>
} }
[SupportedOSPlatform("windows")] [SupportedOSPlatform("windows")]
private async Task<string> GetDlibPath(CancellationToken cancellationToken) private string GetDlibPath(CancellationToken cancellationToken)
{ {
// DLib library is required for Azure Trusted Signing. It must be in the same directory as SignTool.exe. // DLib library is required for Azure Trusted Signing. It must be in the same directory as SignTool.exe.
// https://learn.microsoft.com/azure/trusted-signing/how-to-signing-integrations#download-and-install-the-trusted-signing-dlib-package // https://learn.microsoft.com/azure/trusted-signing/how-to-signing-integrations#download-and-install-the-trusted-signing-dlib-package

4
test/Velopack.Packaging.Tests/TrustedSigningTests.cs
View File

@@ -1,4 +1,4 @@
using Azure.Core; using Azure.Core;
using Azure.Identity; using Azure.Identity;
using Velopack.Packaging.Windows; using Velopack.Packaging.Windows;
using Velopack.Util; using Velopack.Util;
@@ -45,7 +45,7 @@ public class TrustedSigningTests
Skip.IfNot(await IsAuthenticatedForCodeSigningAsync(), "Sign in with az login first"); Skip.IfNot(await IsAuthenticatedForCodeSigningAsync(), "Sign in with az login first");
} }
using var logger = _output.BuildLoggerFor<TrustedSigningTests>(); using var logger = _output.BuildLoggerFor<TrustedSigningTests>(LogLevel.Debug);
using var _ = TempUtil.GetTempDirectory(out var releaseDir); using var _ = TempUtil.GetTempDirectory(out var releaseDir);
string metadataFile = Path.Combine(releaseDir, "metadata.json"); string metadataFile = Path.Combine(releaseDir, "metadata.json");