Skip to content

Add Timeserver Support for SourceCreator and support spaces in paths and file names #6113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Trenly wants to merge 3 commits into
base: master
Choose a base branch
from
+17 −6
Open

Add Timeserver Support for SourceCreator and support spaces in paths and file names #6113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd5db8e
Add TimestampServer for signing and quote paths
Mar 27, 2026
9f12313
Update Release Notes
Mar 27, 2026
f36c4f5
Spelling
Mar 27, 2026
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
1 change: 1 addition & 0 deletions .github/actions/spelling/expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ devhome
DFX
DHAVE
dic
digicert
diskfull
DISPLAYCATALOG
DMC
Expand Down
3 changes: 2 additions & 1 deletion doc/ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,5 @@ The PowerShell module now automatically uses `GH_TOKEN` or `GITHUB_TOKEN` enviro

## Bug Fixes

<!-- Nothing yet! -->
* `SignFile` in `WinGetSourceCreator` now supports an optional RFC 3161 timestamp server via the new `TimestampServer` property on the `Signature` model. When set, `signtool.exe` is called with `/tr <url> /td sha256`, embedding a countersignature timestamp so that signed packages remain valid after the signing certificate expires.
* File and directory paths passed to `signtool.exe` and `makeappx.exe` are now quoted, fixing failures when paths contain spaces.
14 changes: 9 additions & 5 deletions src/WinGetSourceCreator/Helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,16 @@ public static void SignFile(string fileToSign, Signature signature)

string pathToSDK = SDKDetector.Instance.LatestSDKBinPath;
string signtoolExecutable = Path.Combine(pathToSDK, "signtool.exe");
string command = $"sign /a /fd sha256 /f {signature.CertFile} ";
string command = $"sign /a /fd sha256 /f \"{signature.CertFile}\" ";
if (!string.IsNullOrEmpty(signature.Password))
{
command += $"/p {signature.Password} ";
}
command += fileToSign;
if (!string.IsNullOrEmpty(signature.TimestampServer))
{
command += $"/tr {signature.TimestampServer} /td sha256 ";
}
command += $"\"{fileToSign}\"";
RunCommand(signtoolExecutable, command);
}

Expand Down Expand Up @@ -81,7 +85,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}";
string args = $"unpack /nv /p \"{package}\" /d \"{outDir}\"";
Process p = new Process
{
StartInfo = new ProcessStartInfo(makeappxExecutable, args)
Expand All @@ -99,7 +103,7 @@ public static void PackWithMappingFile(string outputPackage, string mappingFile)

string pathToSDK = SDKDetector.Instance.LatestSDKBinPath;
string makeappxExecutable = Path.Combine(pathToSDK, "makeappx.exe");
string args = $"pack /o /nv /f {mappingFile} /p {outputPackage}";
string args = $"pack /o /nv /f \"{mappingFile}\" /p \"{outputPackage}\"";
RunCommand(makeappxExecutable, args);
}

Expand All @@ -117,7 +121,7 @@ public static void Pack(string outputPackage, string directoryToPack)

string pathToSDK = SDKDetector.Instance.LatestSDKBinPath;
string makeappxExecutable = Path.Combine(pathToSDK, "makeappx.exe");
string args = $"pack /o /d {directoryToPack} /p {outputPackage}";
string args = $"pack /o /d \"{directoryToPack}\" /p \"{outputPackage}\"";
RunCommand(makeappxExecutable, args);
}

Expand Down
5 changes: 5 additions & 0 deletions src/WinGetSourceCreator/Model/Signature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ public class Signature
// The publisher for the AppxPackage Identity Name property.
public string? Publisher { get; set; }

// RFC 3161 timestamp server URL (e.g. http://timestamp.digicert.com).
// When set, a countersignature timestamp is added so the signature remains
// valid after the signing certificate expires.
public string? TimestampServer { get; set; }

internal void Validate()
{
if (string.IsNullOrEmpty(this.CertFile))
Expand Down
Loading