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 CR feedback

Browse Source
This commit is contained in:
Kevin Bost
2024-11-08 23:12:36 -08:00
committed by Caelan
parent 3c61874cef
commit 04e4bcb90d
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,14 +293,7 @@ public class WindowsPackCommandRunner : PackageBuilder<WindowsPackOptions>
nupkgStream.Position = 0; nupkgStream.Position = 0;
string parentDir = NugetUtil.BinDirectory + Path.AltDirectorySeparatorChar; string parentDir = NugetUtil.BinDirectory + Path.AltDirectorySeparatorChar + "x64" + Path.AltDirectorySeparatorChar;
if (Environment.Is64BitOperatingSystem) {
parentDir += "x64";
} else {
parentDir += "x86";
}
parentDir += Path.AltDirectorySeparatorChar;
ZipArchive zipPackage = new(nupkgStream); ZipArchive zipPackage = new(nupkgStream);
var entries = zipPackage.Entries.Where(x => x.FullName.StartsWith(parentDir, StringComparison.OrdinalIgnoreCase)); var entries = zipPackage.Entries.Where(x => x.FullName.StartsWith(parentDir, StringComparison.OrdinalIgnoreCase));

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

@@ -41,7 +41,7 @@ public class TrustedSigningTests
public async void CanSignWithTrustedSigning() public async void CanSignWithTrustedSigning()
{ {
Skip.If(!VelopackRuntimeInfo.IsWindows); Skip.If(!VelopackRuntimeInfo.IsWindows);
Skip.If(await IsAuthenticatedForCodeSigningAsync()); Skip.If(!await IsAuthenticatedForCodeSigningAsync());
using var logger = _output.BuildLoggerFor<TrustedSigningTests>(); using var logger = _output.BuildLoggerFor<TrustedSigningTests>();
using var _ = TempUtil.GetTempDirectory(out var releaseDir); using var _ = TempUtil.GetTempDirectory(out var releaseDir);