Skip to content
Merged
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
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ jobs:
'## Requirements'
''
'- **Windows 10/11 (x64)**'
'- **Windows App SDK 2.4** runtime'
'- **.NET 10 Desktop Runtime** — https://dotnet.microsoft.com/download/dotnet/10.0'
''
'## Notes'
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ All notable changes to Reentry are documented here. The format follows

## [Unreleased]

- Launch on Windows 11 25H2: use the installed WASDK 2.4 runtime instead of the self-contained CoreMessagingXP payload (0xC0000602). Give the tray icon a generated glyph so ForceCreate has an IconSource.

## [0.1.0-alpha1] - 2026-08-20

First scaffold — a Windows startup / session-restore monitor.
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ pwsh ./publish.ps1 -SelfContained # bundles the .NET runtime (portable, larger)

→ `publish/Reentry.exe`

The Windows App SDK runtime is bundled (`WindowsAppSDKSelfContained=true`); the
app is unpackaged (`WindowsPackageType=None`).
The app is unpackaged (`WindowsPackageType=None`) and uses the installed Windows App SDK 2.4 runtime (`WindowsAppSDKSelfContained=false`). The self-contained 2.4 CoreMessagingXP payload fail-fasts on Windows 11 25H2.

---

Expand Down
2 changes: 1 addition & 1 deletion publish.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Publishes Reentry as a framework-dependent Windows app into .\publish\.
# Requires the .NET 10 Desktop Runtime on the target machine.
# The Windows App SDK runtime is bundled (WindowsAppSDKSelfContained=true).
# Requires the Windows App SDK 2.4 runtime (WindowsAppSDKSelfContained=false; the self-contained 2.4 CoreMessagingXP payload fail-fasts on Windows 11 25H2).
#
# Usage: pwsh ./publish.ps1 (framework-dependent .NET, small)
# pwsh ./publish.ps1 -SelfContained (bundles the .NET runtime, large but portable)
Expand Down
8 changes: 5 additions & 3 deletions src/Reentry.App/Reentry.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
<UseWinUI>true</UseWinUI>
<WinUISDKReferences>false</WinUISDKReferences>
<WindowsPackageType>None</WindowsPackageType>
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
<!-- Self-contained WASDK 2.4.0 ships CoreMessagingXP 10.0.27200.1048, which
fail-fasts (0xC0000602) on Windows 11 25H2 (26200) at the first Window().
Use the installed Microsoft.WindowsAppRuntime.2 2.4.0 framework package. -->
<WindowsAppSDKSelfContained>false</WindowsAppSDKSelfContained>
<WindowsAppSdkBootstrapInitialize>true</WindowsAppSdkBootstrapInitialize>
<EnableMsixTooling>false</EnableMsixTooling>
<ApplicationManifest>app.manifest</ApplicationManifest>
Expand All @@ -38,7 +41,6 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageReference Include="CommunityToolkit.WinUI" Version="7.1.2" />
<PackageReference Include="H.NotifyIcon.WinUI" Version="2.4.1" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.0" />
</ItemGroup>
Expand All @@ -50,4 +52,4 @@
<Content Include="..\..\README.md" Link="README.md" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

</Project>
</Project>
30 changes: 19 additions & 11 deletions src/Reentry.App/Services/TrayIconHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,26 @@ public TrayIconHost(Action showHud, Action showSettings, Action exit)

public void Show()
{
var menu = new MenuFlyout();
menu.Items.Add(Item("Show progress", _showHud));
menu.Items.Add(Item("Settings", _showSettings));
menu.Items.Add(new MenuFlyoutSeparator());
menu.Items.Add(Item("Exit", _exit));
try
{
var menu = new MenuFlyout();
menu.Items.Add(Item("Show progress", _showHud));
menu.Items.Add(Item("Settings", _showSettings));
menu.Items.Add(new MenuFlyoutSeparator());
menu.Items.Add(Item("Exit", _exit));

_icon = new TaskbarIcon
_icon = new TaskbarIcon
{
ToolTipText = "Reentry",
ContextFlyout = menu,
IconSource = new GeneratedIconSource { Text = "R" },
};
_icon.ForceCreate();
}
catch (Exception ex)
{
ToolTipText = "Reentry",
ContextFlyout = menu,
};
_icon.ForceCreate();
System.Diagnostics.Debug.WriteLine(ex);
}
}

private static MenuFlyoutItem Item(string text, Action action)
Expand All @@ -41,4 +49,4 @@ private static MenuFlyoutItem Item(string text, Action action)
}

public void Dispose() => _icon?.Dispose();
}
}
Loading