Skip to content

Commit 5559685

Browse files
adamgellclaude
andcommitted
fix(branding+sidecar): IntuneCommander wordmark, MSI publisher, bundled-sidecar discovery
- signin.rs: the sign-in hero wordmark still read "cmProjectX" (built as two-tone "cm"+"ProjectX", which is why the earlier rename missed it) -> now "Intune"+"Commander". Last user-facing codename leftover; window/nav titles were already renamed. - installer.mpdev.json: MSI publisher "gellorg" -> "Adam Gell" to match the signing cert; the install dialog was showing the wrong org. - sidecar.rs: also look for the sidecar at `sidecar/Api.exe` next to the client, not only `Api.exe`. The release bundle stages the sidecar in a `sidecar/` subfolder, so on a clean install the client could not find it — it either failed to start one or borrowed a stray leftover (the "separate sidecar" a tester saw). Now it spawns its OWN bundled sidecar hidden (CREATE_NO_WINDOW). - workflow: the portable-zip launcher no longer starts the sidecar itself (that opened a visible console); the client auto-spawns it hidden. Verified: cargo check passes with the sidecar change; workflow YAML parses. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
1 parent 3e19042 commit 5559685

4 files changed

Lines changed: 16 additions & 7 deletions

File tree

.github/workflows/cmprojectx-codesign.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,10 @@ jobs:
266266
# For the portable zip (no installer to set the env var), bake the Syncfusion key into the
267267
# launcher if one was provided at build time, so PPTX export is licensed there too.
268268
$setLine = if ($env:SYNCFUSION_LICENSE_KEY) { @("set `"SYNCFUSION_LICENSE_KEY=$($env:SYNCFUSION_LICENSE_KEY)`"") } else { @() }
269+
# The client auto-spawns the bundled sidecar (sidecar\Api.exe) HIDDEN, so the launcher
270+
# only starts the client — no separate sidecar console window. The `set` line bakes the
271+
# Syncfusion key for the portable zip (no installer to set the machine env var).
269272
$launcher = @('@echo off') + $setLine + @(
270-
'REM Start the sidecar, wait for :5099, then the client.',
271-
'start "IntuneCommander sidecar" /min "%~dp0sidecar\Api.exe"',
272-
'timeout /t 3 /nobreak >nul',
273273
'start "" "%~dp0IntuneCommander.exe"'
274274
)
275275
Set-Content (Join-Path $bundle "Start-IntuneCommander.cmd") $launcher -Encoding ascii

app/src/sidecar.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,15 @@ fn sidecar_command() -> Option<(String, Vec<String>, Option<PathBuf>)> {
8383
return Some((bundled.to_string_lossy().into_owned(), vec![], Some(exe_dir)));
8484
}
8585

86+
// (1b) Shipping (release bundle layout): the self-contained sidecar lives in a
87+
// `sidecar/` subfolder next to the client exe (see the release stage step). The
88+
// sidecar's working dir must be that folder so it resolves its own DLLs/psmodules.
89+
let sub = exe_dir.join("sidecar").join("Api.exe");
90+
if sub.exists() {
91+
let work = sub.parent().map(Path::to_path_buf);
92+
return Some((sub.to_string_lossy().into_owned(), vec![], work));
93+
}
94+
8695
// (2) Dev: the framework-dependent build output, run via `dotnet`.
8796
let dll = find_api_dll(&exe_dir)?;
8897
let work = dll.parent().map(Path::to_path_buf);

app/src/signin.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -561,13 +561,13 @@ fn hero_panel() -> Element {
561561
))
562562
.spacing(5.0);
563563

564-
// Two-tone wordmark: "cm" teal-bright, "ProjectX" near-white, Bahnschrift.
564+
// Two-tone wordmark: "Intune" teal-bright, "Commander" near-white, Bahnschrift.
565565
let wordmark = hstack((
566-
body_strong("cm")
566+
body_strong("Intune")
567567
.font_size(30.0)
568568
.font_family(theme::FONT_DISPLAY)
569569
.foreground(theme::BRAND_BRIGHT),
570-
body_strong("ProjectX")
570+
body_strong("Commander")
571571
.font_size(30.0)
572572
.font_family(theme::FONT_DISPLAY)
573573
.foreground(theme::TEXT),

packaging/installer.mpdev.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"outputDirectory": "publish\\installer",
55
"outputFileName": "IntuneCommander-$.version-x64",
66
"packageName": "IntuneCommander",
7-
"publisher": "gellorg",
7+
"publisher": "Adam Gell",
88
"version": "0.0.0.0",
99
"platform": "x64",
1010
"installDir": "%ProgramFiles%\\IntuneCommander",

0 commit comments

Comments
 (0)