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
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 9de45d69..f86ad5b5 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;
@@ -355,7 +366,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) {
@@ -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;
}
}
@@ -431,13 +439,9 @@ 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();
+ Application.Current.MainWindow.Activate();
}
private void UpdateServiceView() {
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/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 @@
-
+
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 7a1efdce..44c79492 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"
+ Version = "1.9.1"
+ Revision = "06c846270f65"
Branch = "main"
BuildUser = ""
- BuildDate = "2021-03-26 03:03:46"
+ BuildDate = "2021-03-29 18:07:21"
)
diff --git a/version b/version
index f8e233b2..9ab8337f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.9.0
+1.9.1