From 04e4bcb90d05a31c29878257982d2bd047ebfd7e Mon Sep 17 00:00:00 2001 From: Kevin Bost Date: Fri, 8 Nov 2024 23:12:36 -0800 Subject: [PATCH] Fixing CR feedback --- .../Commands/WindowsPackCommandRunner.cs | 9 +-------- test/Velopack.Packaging.Tests/TrustedSigningTests.cs | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/vpk/Velopack.Packaging.Windows/Commands/WindowsPackCommandRunner.cs b/src/vpk/Velopack.Packaging.Windows/Commands/WindowsPackCommandRunner.cs index 14a6549b..5993c6c1 100644 --- a/src/vpk/Velopack.Packaging.Windows/Commands/WindowsPackCommandRunner.cs +++ b/src/vpk/Velopack.Packaging.Windows/Commands/WindowsPackCommandRunner.cs @@ -293,14 +293,7 @@ public class WindowsPackCommandRunner : PackageBuilder nupkgStream.Position = 0; - string parentDir = NugetUtil.BinDirectory + Path.AltDirectorySeparatorChar; - if (Environment.Is64BitOperatingSystem) { - parentDir += "x64"; - } else { - parentDir += "x86"; - } - parentDir += Path.AltDirectorySeparatorChar; - + string parentDir = NugetUtil.BinDirectory + Path.AltDirectorySeparatorChar + "x64" + Path.AltDirectorySeparatorChar; ZipArchive zipPackage = new(nupkgStream); var entries = zipPackage.Entries.Where(x => x.FullName.StartsWith(parentDir, StringComparison.OrdinalIgnoreCase)); diff --git a/test/Velopack.Packaging.Tests/TrustedSigningTests.cs b/test/Velopack.Packaging.Tests/TrustedSigningTests.cs index 0d7b82b0..6d12bae7 100644 --- a/test/Velopack.Packaging.Tests/TrustedSigningTests.cs +++ b/test/Velopack.Packaging.Tests/TrustedSigningTests.cs @@ -41,7 +41,7 @@ public class TrustedSigningTests public async void CanSignWithTrustedSigning() { Skip.If(!VelopackRuntimeInfo.IsWindows); - Skip.If(await IsAuthenticatedForCodeSigningAsync()); + Skip.If(!await IsAuthenticatedForCodeSigningAsync()); using var logger = _output.BuildLoggerFor(); using var _ = TempUtil.GetTempDirectory(out var releaseDir);