Skip to content

Commit 8da650c

Browse files
committed
Fix CI path; Need more investigation for app close.
1 parent 17bf88f commit 8da650c

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

.github/workflows/canary.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,6 @@ jobs:
107107
$date = Get-Date -Format yyyyMMdd
108108
Add-Content -Path $Env:GITHUB_ENV -Value "DATE=$date"
109109
shell: pwsh
110-
111-
- name: Zip Package
112-
run: |
113-
Compress-Archive `
114-
-Path "Packages/*${{ matrix.platform }}*" `
115-
-DestinationPath "OpenNet.Canary_${{ env.DATE }}_${{ matrix.platform }}.zip"
116-
shell: pwsh
117110

118111
- name: 7z Package
119112
run: |
@@ -123,13 +116,12 @@ jobs:
123116
124117
7z a -t7z -mx=9 `
125118
"OpenNet.Canary_${{ env.DATE }}_${{ matrix.platform }}.7z" `
126-
"Packages\*${{ matrix.platform }}*"
119+
"AppPackages\*${{ matrix.platform }}*"
127120
shell: pwsh
128121

129122
- name: Upload Canary Artifact
130123
uses: actions/upload-artifact@v6
131124
with:
132125
name: OpenNet.Canary_${{ env.DATE }}_${{ matrix.platform }}
133126
path: |
134-
OpenNet.Canary_${{ env.DATE }}_${{ matrix.platform }}.zip
135127
OpenNet.Canary_${{ env.DATE }}_${{ matrix.platform }}.7z

OpenNet/UI/Shell/NotifyIconContextMenu.xaml.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ namespace winrt::OpenNet::UI::Shell::implementation
6868
// Allow the window to close (bypasses the hide-to-tray Closing handler)
6969
winrt::OpenNet::implementation::App::s_isExiting = true;
7070

71+
// For test now
72+
auto window = winrt::OpenNet::implementation::App::window;
73+
if (window)
74+
{
75+
window.Close();
76+
}
77+
7178
// Exit the application - now the Closing handler will not cancel the close,
7279
// the window closes properly, App::~App() runs, and all services shut down.
7380
Microsoft::UI::Xaml::Application::Current().Exit();

0 commit comments

Comments
 (0)