Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/AppInstallerCLIE2ETests/TestData/localsource.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"Type": "font",
"Name": "AppInstallerTestFont/AppInstallerTestFont.ttf",
"Input": "%BUILD_SOURCESDIRECTORY%/src/AppInstallerCLIE2ETests/TestData/AppInstallerTestFont.ttf",
"HashToken": "<FONTHASH>"
"HashToken": "<FONTHASH>",
"SkipSignature": true
}
],
"DynamicInstallers": [
Expand Down
12 changes: 6 additions & 6 deletions src/WinGetSourceCreator/Helpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,7 @@ public static void Unpack(string package, string outDir)
string pathToSDK = SDKDetector.Instance.LatestSDKBinPath;
string makeappxExecutable = Path.Combine(pathToSDK, "makeappx.exe");
string args = $"unpack /nv /p \"{package}\" /d \"{outDir}\"";
Process p = new Process
{
StartInfo = new ProcessStartInfo(makeappxExecutable, args)
};
p.Start();
p.WaitForExit();
RunCommand(makeappxExecutable, args);
}

public static void PackWithMappingFile(string outputPackage, string mappingFile)
Expand Down Expand Up @@ -138,6 +133,11 @@ public static void RunCommand(string command, string args, string? workingDirect
}
p.Start();
p.WaitForExit();

if (p.ExitCode != 0)
{
throw new Exception($"Command failed with exit code {p.ExitCode}: {command} {args}");
}
Comment on lines +137 to +140

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could just include {command}.
In the pipelines this shouldn't be an issue, since Azure Pipelines automatically replaces any secret with ***, but still seems worth changing.

}

// If in the future we edit more elements, this should be a nice wrapper class.
Expand Down
Loading