Skip to content

fix(windows): clear the build warning and honor start_menu_folder #23

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

Closed
Firnschnee wants to merge 1 commit into from
Closed

fix(windows): clear the build warning and honor start_menu_folder #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 34 additions & 11 deletions plugins/app-it-windows/skills/app-it-windows/templates/desktop-install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,36 @@ Set-StrictMode -Version Latest
$ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
$Root = if ($env:APP_IT_PROJECT_ROOT) { $env:APP_IT_PROJECT_ROOT } else { (Resolve-Path (Join-Path $ScriptDir '..')).Path }

$defaultTarget = Join-Path $env:APPDATA 'Microsoft\Windows\Start Menu\Programs\app-it'
$target = if ($env:APP_IT_INSTALL_DIR) { $env:APP_IT_INSTALL_DIR } else { $defaultTarget }
$ConfigFile = Join-Path $ScriptDir 'app-it.config.json'

if (-not (Test-Path $target)) {
if ($target -eq $defaultTarget) {
New-Item -ItemType Directory -Force -Path $target | Out-Null
Write-Host "Created $target."
Write-Host 'Your apps now appear under "app-it" in the Start Menu. Right-click any one to pin it to Start or the taskbar.'
} else {
Write-Error "Install target $target does not exist."
exit 1
# Per-app Start Menu folder. app-it.config.example.json documents
# platform.windows.start_menu_folder as configurable (default "app-it"); read it
# here so the field actually takes effect (it was previously ignored). The folder
# is resolved per app in the loop below. APP_IT_INSTALL_DIR still overrides
# everything with a single explicit target for all apps, exactly as before.
$defaultFolder = 'app-it'
$folderForApp = @{}
if (Test-Path $ConfigFile) {
$cfg = Get-Content -Raw $ConfigFile | ConvertFrom-Json
foreach ($a in $cfg.apps) {
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
$folder = $defaultFolder
if ($a.PSObject.Properties.Name -contains 'platform' -and $a.platform -and
$a.platform.PSObject.Properties.Name -contains 'windows' -and $a.platform.windows -and
$a.platform.windows.PSObject.Properties.Name -contains 'start_menu_folder' -and
$a.platform.windows.start_menu_folder) {
$folder = [string]$a.platform.windows.start_menu_folder
}
if ($a.name) { $folderForApp[[string]$a.name] = $folder }
}
}

$programsBase = Join-Path $env:APPDATA 'Microsoft\Windows\Start Menu\Programs'
$overrideTarget = $env:APP_IT_INSTALL_DIR
if ($overrideTarget -and -not (Test-Path $overrideTarget)) {
Write-Error "Install target $overrideTarget does not exist."
exit 1
}

# Prefer PowerShell 7 (pwsh) if present, else Windows PowerShell.
$pwshExe = (Get-Command pwsh -ErrorAction SilentlyContinue).Source
if (-not $pwshExe) { $pwshExe = Join-Path $env:WINDIR 'System32\WindowsPowerShell\v1.0\powershell.exe' }
Expand All @@ -63,6 +79,13 @@ foreach ($appDir in Get-ChildItem -Path $desktop -Directory -ErrorAction Silentl
continue
}

$folder = if ($folderForApp.ContainsKey($appDir.Name)) { $folderForApp[$appDir.Name] } else { $defaultFolder }
$target = if ($overrideTarget) { $overrideTarget } else { Join-Path $programsBase $folder }
if (-not (Test-Path $target)) {
New-Item -ItemType Directory -Force -Path $target | Out-Null
Write-Host "Created $target."
}

$lnkPath = Join-Path $target "$($appDir.Name).lnk"
$sc = $wsh.CreateShortcut($lnkPath)
$sc.TargetPath = $pwshExe
Expand All @@ -89,4 +112,4 @@ if ($count -eq 0) {
}

Write-Host ''
Write-Host "Installed $count shortcut(s) under $target"
Write-Host "Installed $count shortcut(s). Right-click any one in the Start Menu to pin it to Start or the taskbar."
9 changes: 9 additions & 0 deletions plugins/app-it-windows/skills/app-it-windows/templates/wrapper-windows/wrapper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@
setups. The MANIFEST builds from a Mac; whether the result actually
looks right at each DPI is deferred to a Windows maintainer (ADR 0005). -->
<ApplicationManifest>app.manifest</ApplicationManifest>

<!-- WFAC010: the WinForms SDK analyzer (pulled in by UseWindowsForms, which
is here only for the tray NotifyIcon) wants DPI configured via
ApplicationHighDpiMode / Application.SetHighDpiMode. This is a WPF-first
host and declares PerMonitorV2 in app.manifest, the standard WPF way, so
the manifest is correct and SetHighDpiMode is never called. Silence the
analyzer rather than move DPI config into a WinForms API this app does
not use. Does not change DPI behavior. -->
<NoWarn>$(NoWarn);WFAC010</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading