From 5b4f8dbe29f803a1c3dba8e319f01f152f24da3f Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Fri, 26 Mar 2021 14:17:28 +0100 Subject: [PATCH 1/8] Select Secret Code --- DesktopEdge/Views/Screens/MFAScreen.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DesktopEdge/Views/Screens/MFAScreen.xaml b/DesktopEdge/Views/Screens/MFAScreen.xaml index 21dfc3c4..26d15bcf 100644 --- a/DesktopEdge/Views/Screens/MFAScreen.xaml +++ b/DesktopEdge/Views/Screens/MFAScreen.xaml @@ -43,7 +43,7 @@ - + From 1944a74782f83df0fb6c7406c665a683abd22464 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Fri, 26 Mar 2021 13:41:52 +0000 Subject: [PATCH 2/8] [ci skip] committing updated version related files --- service/ziti-tunnel/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 7a1efdce..6d1e828a 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -20,9 +20,9 @@ package main const ( - Version = "1.9.0" - Revision = "f5b82e2651c3" - Branch = "main" + Version = "1.9.1" + Revision = "97e5c3a1a7c0" + Branch = "release-next" BuildUser = "" - BuildDate = "2021-03-26 03:03:46" + BuildDate = "2021-03-26 13:36:22" ) From 2356467e24f0296f024150354b8107325787830d Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Sun, 28 Mar 2021 23:11:10 +0100 Subject: [PATCH 3/8] Fix Removed Activation code --- DesktopEdge/MainWindow.xaml.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs index 50524fd2..c6b8556c 100644 --- a/DesktopEdge/MainWindow.xaml.cs +++ b/DesktopEdge/MainWindow.xaml.cs @@ -355,7 +355,7 @@ namespace ZitiDesktopEdge { } private void contextMenuItem_Click(object Sender, EventArgs e) { - this.Close(); + Application.Current.Shutdown(); } private void NotifyIcon_MouseClick(object sender, System.Windows.Forms.MouseEventArgs e) { @@ -431,13 +431,13 @@ namespace ZitiDesktopEdge { } private void TargetNotifyIcon_Click(object sender, EventArgs e) { -// this.Show(); -// System.Windows.Forms.MouseEventArgs mea = (System.Windows.Forms.MouseEventArgs)e; - /*if (mea.cli mea.RightButton) { - } else { - - }*/ -// this.Activate(); + this.Show(); + this.Activate(); + if (!Application.Current.MainWindow.IsVisible) Application.Current.MainWindow.Show(); + if (Application.Current.MainWindow.WindowState == WindowState.Minimized) Application.Current.MainWindow.WindowState = WindowState.Normal; + Application.Current.MainWindow.Activate(); + Application.Current.MainWindow.Topmost = true; + Application.Current.MainWindow.Focus(); } private void UpdateServiceView() { From 9297297be05b5544e1bcd6613ef3bb8b2bc88bce Mon Sep 17 00:00:00 2001 From: Jeremy Tellier <56126806+JeremyTellier@users.noreply.github.com> Date: Mon, 29 Mar 2021 16:55:18 +0000 Subject: [PATCH 4/8] Fix Issue Use hidden instead of collapsed when hiding the main window because when a session ends in RDP it destroys interfaces that are collapsed. --- DesktopEdge/App.xaml.cs | 6 +++++- DesktopEdge/MainWindow.xaml.cs | 26 +++++++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/DesktopEdge/App.xaml.cs b/DesktopEdge/App.xaml.cs index 8eb3c609..455c5af1 100644 --- a/DesktopEdge/App.xaml.cs +++ b/DesktopEdge/App.xaml.cs @@ -22,7 +22,11 @@ namespace ZitiDesktopEdge { private static readonly Logger logger = LogManager.GetCurrentClassLogger(); private static Mutex _mutex = null; - protected override void OnStartup(StartupEventArgs e) { + protected override void OnSessionEnding(SessionEndingCancelEventArgs e) { + base.OnSessionEnding(e); + } + + protected override void OnStartup(StartupEventArgs e) { const string appName = "Ziti Desktop Edge"; bool createdNew; diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs index c6b8556c..1af961d6 100644 --- a/DesktopEdge/MainWindow.xaml.cs +++ b/DesktopEdge/MainWindow.xaml.cs @@ -315,6 +315,7 @@ namespace ZitiDesktopEdge { App.Current.MainWindow.Deactivated += MainWindow_Deactivated; App.Current.MainWindow.Activated += MainWindow_Activated; App.Current.Exit += Current_Exit; + App.Current.SessionEnding += Current_SessionEnding; this.components = new System.ComponentModel.Container(); @@ -345,6 +346,16 @@ namespace ZitiDesktopEdge { IdentityMenu.OnMessage += IdentityMenu_OnMessage; } + private void Current_SessionEnding(object sender, SessionEndingCancelEventArgs e) { + if (notifyIcon != null) { + notifyIcon.Visible = false; + notifyIcon.Icon.Dispose(); + notifyIcon.Dispose(); + notifyIcon = null; + } + Application.Current.Shutdown(); + } + private void Current_Exit(object sender, ExitEventArgs e) { if (notifyIcon != null) { notifyIcon.Visible = false; @@ -392,18 +403,15 @@ namespace ZitiDesktopEdge { } private void MainWindow_Activated(object sender, EventArgs e) { - this.Visibility = Visibility.Visible; Placement(); + this.Show(); + this.Visibility = Visibility.Visible; + this.Opacity = 1; } private void MainWindow_Deactivated(object sender, EventArgs e) { if (this._isAttached) { -#if DEBUG - logger.Debug("debug is enabled - windows pinned"); - this.Visibility = Visibility.Collapsed; -#else - this.Visibility = Visibility.Collapsed; -#endif + this.Visibility = Visibility.Hidden; } } @@ -433,11 +441,7 @@ namespace ZitiDesktopEdge { private void TargetNotifyIcon_Click(object sender, EventArgs e) { this.Show(); this.Activate(); - if (!Application.Current.MainWindow.IsVisible) Application.Current.MainWindow.Show(); - if (Application.Current.MainWindow.WindowState == WindowState.Minimized) Application.Current.MainWindow.WindowState = WindowState.Normal; Application.Current.MainWindow.Activate(); - Application.Current.MainWindow.Topmost = true; - Application.Current.MainWindow.Focus(); } private void UpdateServiceView() { From 18b210b3f0d8366ee78f9bdfdc222ce98b5b688e Mon Sep 17 00:00:00 2001 From: Jeremy Tellier - ROG Date: Mon, 29 Mar 2021 18:01:49 +0100 Subject: [PATCH 5/8] Version Update --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index f8e233b2..9ab8337f 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.9.0 +1.9.1 From 2fc70e61c2ab1f41d369f299be57f14c20073658 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 29 Mar 2021 17:12:09 +0000 Subject: [PATCH 6/8] [ci skip] committing updated version related files --- DesktopEdge/Properties/AssemblyInfo.cs | 6 +++--- Installer/ZitiDesktopEdge.aip | 4 ++-- ZitiUpdateService/Properties/AssemblyInfo.cs | 6 +++--- service/ziti-tunnel/version.go | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index 9158af84..ab263a06 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -50,6 +50,6 @@ using System.Windows; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.9.0.0")] -[assembly: AssemblyVersion("1.9.0.0")] -[assembly: AssemblyFileVersion("1.9.0.0")] +// [assembly: AssemblyVersion("1.9.1.0")] +[assembly: AssemblyVersion("1.9.1.0")] +[assembly: AssemblyFileVersion("1.9.1.0")] diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index 78663843..ba557c17 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -23,10 +23,10 @@ - + - + diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs index c3d61028..7631e1f6 100644 --- a/ZitiUpdateService/Properties/AssemblyInfo.cs +++ b/ZitiUpdateService/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.9.0.0")] -[assembly: AssemblyVersion("1.9.0.0")] -[assembly: AssemblyFileVersion("1.9.0.0")] +// [assembly: AssemblyVersion("1.9.1.0")] +[assembly: AssemblyVersion("1.9.1.0")] +[assembly: AssemblyFileVersion("1.9.1.0")] diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 6d1e828a..4e458d74 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.9.1" - Revision = "97e5c3a1a7c0" + Revision = "18b210b3f0d8" Branch = "release-next" BuildUser = "" - BuildDate = "2021-03-26 13:36:22" + BuildDate = "2021-03-29 17:06:23" ) From 6a0f7159df4cef3c97065b6293c431cb7153953a Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 29 Mar 2021 13:57:53 -0400 Subject: [PATCH 7/8] remove include-labels from release-drafter - the thing that keeps blocking release drafter --- .github/release-drafter.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 06816a3b..e0ae2990 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -29,8 +29,6 @@ version-resolver: default: patch exclude-labels: - 'changelog-ignore' -include-labels: - - 'changelog-add' template: | ## Changes $CHANGES From ed66b9b7c26152f4cf62d0bab56425fbc4e543d9 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Mon, 29 Mar 2021 18:13:10 +0000 Subject: [PATCH 8/8] [ci skip] committing updated version related files --- service/ziti-tunnel/version.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 4e458d74..44c79492 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.9.1" - Revision = "18b210b3f0d8" - Branch = "release-next" + Revision = "06c846270f65" + Branch = "main" BuildUser = "" - BuildDate = "2021-03-29 17:06:23" + BuildDate = "2021-03-29 18:07:21" )