Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e0a0421ce5 | |||
| 1ea724cd1f | |||
| a2bd338839 | |||
| b17d832842 | |||
| fe42f2f908 | |||
| 93a9c327e0 | |||
| 9e6abeef74 | |||
| 9525ee358e | |||
| f3bca1e8ff |
@@ -1,7 +1,7 @@
|
|||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>0.1.4</Version>
|
<Version>0.1.3</Version>
|
||||||
<Authors>Justin Paul</Authors>
|
<Authors>Justin Paul</Authors>
|
||||||
<Company>Justin Paul</Company>
|
<Company>Justin Paul</Company>
|
||||||
<Product>Webhook Server</Product>
|
<Product>Webhook Server</Product>
|
||||||
|
|||||||
@@ -53,58 +53,15 @@ if ($LASTEXITCODE -ne 0) { throw 'service publish failed' }
|
|||||||
-c $Configuration -r win-x64 --self-contained false -o $publishGui | Out-Host
|
-c $Configuration -r win-x64 --self-contained false -o $publishGui | Out-Host
|
||||||
if ($LASTEXITCODE -ne 0) { throw 'GUI publish failed' }
|
if ($LASTEXITCODE -ne 0) { throw 'GUI publish failed' }
|
||||||
|
|
||||||
# 2. Pre-flight: confirm every source path the .iss references exists, and
|
# 2. Compile installer.
|
||||||
# surface the longest path so MAX_PATH issues are obvious in the log.
|
|
||||||
function Show-SourcePath($label, $path, [switch]$Recursive) {
|
|
||||||
if (-not (Test-Path $path)) { Write-Warning "MISSING $label : $path"; return }
|
|
||||||
$items = if ($Recursive) {
|
|
||||||
Get-ChildItem $path -Recurse -File -ErrorAction SilentlyContinue
|
|
||||||
} else {
|
|
||||||
Get-ChildItem $path -File -ErrorAction SilentlyContinue
|
|
||||||
}
|
|
||||||
$count = ($items | Measure-Object).Count
|
|
||||||
$longest = ($items | Measure-Object -Maximum -Property { $_.FullName.Length }).Maximum
|
|
||||||
Write-Host (" {0,-30} files={1,-5} longestPath={2,-5} root={3}" -f $label, $count, $longest, $path)
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Host ""
|
|
||||||
Write-Host "--- pre-flight: source paths the .iss will read ---" -ForegroundColor Cyan
|
|
||||||
Show-SourcePath 'publish\service' $publishSvc -Recursive
|
|
||||||
Show-SourcePath 'publish\gui' $publishGui -Recursive
|
|
||||||
Show-SourcePath 'scripts' (Join-Path $repoRoot 'scripts')
|
|
||||||
Show-SourcePath 'scripts\examples' (Join-Path $repoRoot 'scripts\examples') -Recursive
|
|
||||||
Show-SourcePath 'docs' (Join-Path $repoRoot 'docs') -Recursive
|
|
||||||
Show-SourcePath 'resources' (Join-Path $repoRoot 'resources')
|
|
||||||
Show-SourcePath 'README.md (file)' (Join-Path $repoRoot 'README.md')
|
|
||||||
|
|
||||||
$lpe = (Get-ItemProperty 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' `
|
|
||||||
-Name LongPathsEnabled -ErrorAction SilentlyContinue).LongPathsEnabled
|
|
||||||
Write-Host " LongPathsEnabled (HKLM): $lpe"
|
|
||||||
Write-Host ""
|
|
||||||
|
|
||||||
# 3. Compile installer.
|
|
||||||
$iscc = Find-InnoCompiler
|
$iscc = Find-InnoCompiler
|
||||||
$iss = Join-Path $repoRoot 'installer\webhook-server.iss'
|
$iss = Join-Path $repoRoot 'installer\webhook-server.iss'
|
||||||
$dist = Join-Path $repoRoot 'dist'
|
$dist = Join-Path $repoRoot 'dist'
|
||||||
New-Item -ItemType Directory -Path $dist -Force | Out-Null
|
New-Item -ItemType Directory -Path $dist -Force | Out-Null
|
||||||
|
|
||||||
Write-Host "Compiling installer with $iscc"
|
Write-Host "Compiling installer with $iscc"
|
||||||
# Run ISCC from the .iss directory with just the bare filename. When invoked
|
& $iscc "/DAppVersion=$version" $iss
|
||||||
# with a deeply-nested absolute path on the act-runner host (under
|
if ($LASTEXITCODE -ne 0) { throw 'Inno Setup compile failed' }
|
||||||
# %SystemRoot%\System32\config\systemprofile\...), ISCC sometimes prints a
|
|
||||||
# generic "The system cannot find the path specified." before it touches any
|
|
||||||
# source files. cd-ing first sidesteps it.
|
|
||||||
$issDir = Split-Path $iss -Parent
|
|
||||||
$issName = Split-Path $iss -Leaf
|
|
||||||
Push-Location $issDir
|
|
||||||
try {
|
|
||||||
Write-Host " cwd=$issDir"
|
|
||||||
& $iscc "/DAppVersion=$version" $issName
|
|
||||||
$exit = $LASTEXITCODE
|
|
||||||
} finally {
|
|
||||||
Pop-Location
|
|
||||||
}
|
|
||||||
if ($exit -ne 0) { throw "Inno Setup compile failed (exit $exit)" }
|
|
||||||
|
|
||||||
$out = Get-Item (Join-Path $dist "WebhookServer-Setup-$version.exe")
|
$out = Get-Item (Join-Path $dist "WebhookServer-Setup-$version.exe")
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
|
|||||||
@@ -82,14 +82,8 @@ public sealed partial class ConfigCheckpointsViewModel : ObservableObject
|
|||||||
{
|
{
|
||||||
if (Selected is null) return;
|
if (Selected is null) return;
|
||||||
|
|
||||||
// Capture before the refresh; the ObservableCollection.Clear() in
|
|
||||||
// RefreshAsync nulls Selected (the original instance is gone from the
|
|
||||||
// collection so the SelectedItem binding clears).
|
|
||||||
var fileName = Selected.FileName;
|
|
||||||
var savedAt = Selected.SavedAt;
|
|
||||||
|
|
||||||
var ok = MessageBox.Show(
|
var ok = MessageBox.Show(
|
||||||
$"Roll the configuration back to the checkpoint from {savedAt.ToLocalTime():yyyy-MM-dd HH:mm:ss}?\n\nThe current configuration is automatically saved as a new checkpoint first, so you can roll forward again.",
|
$"Roll the configuration back to the checkpoint from {Selected.SavedAt.ToLocalTime():yyyy-MM-dd HH:mm:ss}?\n\nThe current configuration is automatically saved as a new checkpoint first, so you can roll forward again.",
|
||||||
"Confirm rollback",
|
"Confirm rollback",
|
||||||
MessageBoxButton.OKCancel,
|
MessageBoxButton.OKCancel,
|
||||||
MessageBoxImage.Warning);
|
MessageBoxImage.Warning);
|
||||||
@@ -97,10 +91,10 @@ public sealed partial class ConfigCheckpointsViewModel : ObservableObject
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await _client.RestoreBackupAsync(fileName).ConfigureAwait(false);
|
await _client.RestoreBackupAsync(Selected.FileName).ConfigureAwait(false);
|
||||||
await RefreshAsync().ConfigureAwait(false);
|
await RefreshAsync().ConfigureAwait(false);
|
||||||
Application.Current.Dispatcher.Invoke(() =>
|
Application.Current.Dispatcher.Invoke(() =>
|
||||||
StatusMessage = $"Rolled back to {fileName}.");
|
StatusMessage = $"Rolled back to {Selected!.FileName}.");
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user