merge master

DesktopEdge/App.xaml

@@ -1,7 +1,7 @@
-<Application x:Class="ZitiTunneler.App"
+<Application x:Class="ZitiDesktopEdge.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              ShutdownMode="OnExplicitShutdown"
              StartupUri="MainWindow.xaml">
     <Application.Resources>

DesktopEdge/App.xaml.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
 	/// <summary>
 	/// Interaction logic for App.xaml
 	/// </summary>

DesktopEdge/ControllerScreen.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.ControllerScreen"
+<UserControl x:Class="ZitiDesktopEdge.ControllerScreen"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>

DesktopEdge/ControllerScreen.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
 	/// <summary>
 	/// Interaction logic for ControllerScreen.xaml
 	/// </summary>

DesktopEdge/IdentityDetails.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.IdentityDetails"
+<UserControl x:Class="ZitiDesktopEdge.IdentityDetails"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              x:Name="IdentityArea"
              d:DesignHeight="500" d:DesignWidth="350">

DesktopEdge/IdentityDetails.xaml.cs

@@ -12,9 +12,9 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using ZitiTunneler.Models;
+using ZitiDesktopEdge.Models;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
 	/// <summary>
 	/// Interaction logic for IdentityDetails.xaml
 	/// </summary> 

DesktopEdge/IdentityItem.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.IdentityItem"
+<UserControl x:Class="ZitiDesktopEdge.IdentityItem"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="60" d:DesignWidth="375" Height="60">
     <Canvas MouseEnter="Canvas_MouseEnter" MouseLeave="Canvas_MouseLeave">

DesktopEdge/IdentityItem.xaml.cs

@@ -12,9 +12,9 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using ZitiTunneler.Models;
+using ZitiDesktopEdge.Models;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
 	/// <summary>
 	/// User Control to list Identities and give status
 	/// </summary>

DesktopEdge/MainMenu.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.MainMenu"
+<UserControl x:Class="ZitiDesktopEdge.MainMenu"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              x:Name="MainMenuArea"
              d:DesignHeight="400" d:DesignWidth="350" Margin="1,1,1,1">
@@ -71,7 +71,7 @@
                 <StackPanel Name="AboutItemsButton" Orientation="Vertical" HorizontalAlignment="Stretch" Visibility="Collapsed">
                     <Label Name="ServiceVersion" HorizontalAlignment="Center" FontSize="10" Foreground="#638190" Margin="0,-20,0,0" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans"></Label>
                 </StackPanel>
-                <Label Name="MainItemsButton" Margin="0,30,0,0" Foreground="#F4044D" FontWeight="SemiBold" Content="Quit Ziti Tunneler" Cursor="Hand" MouseDown="CloseApp" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" HorizontalAlignment="Center"></Label>
+                <Label Name="MainItemsButton" Margin="0,30,0,0" Foreground="#F4044D" FontWeight="SemiBold" Content="Quit Ziti Desktop Edge" Cursor="Hand" MouseDown="CloseApp" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" HorizontalAlignment="Center"></Label>
             </StackPanel>
         </Grid>
     </Grid>

DesktopEdge/MainMenu.xaml.cs

@@ -5,9 +5,9 @@ using System.Diagnostics;
 using System;
 using System.Threading;
 using System.Management.Automation;
-using ZitiTunneler.Models;
+using ZitiDesktopEdge.Models;
 
-namespace ZitiTunneler
+namespace ZitiDesktopEdge
 {	
     /// <summary>
     /// Interaction logic for MainMenu.xaml
@@ -130,10 +130,10 @@ namespace ZitiTunneler
 			Process.Start(new ProcessStartInfo("https://netfoundry.io/terms") { UseShellExecute = true });
 		}
 		private void ShowFeedback(object sender, MouseButtonEventArgs e) {
-			Process.Start(new ProcessStartInfo("mailto:support@netfoundry.io") { UseShellExecute = true });
+			Process.Start(new ProcessStartInfo("mailto:ziti-support@netfoundry.io") { UseShellExecute = true });
 		}
 		private void ShowSupport(object sender, MouseButtonEventArgs e) {
-			Process.Start(new ProcessStartInfo("https://support.netfoundry.io") { UseShellExecute = true });
+			Process.Start(new ProcessStartInfo("https://openziti.discourse.group/") { UseShellExecute = true });
 		}
 
 		private void DetachWindow(object sender, MouseButtonEventArgs e) {

DesktopEdge/MainWindow.xaml

@@ -1,19 +1,22 @@
-<Window x:Class="ZitiTunneler.MainWindow"
+<Window x:Class="ZitiDesktopEdge.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:ZitiTunneler"
+        xmlns:local="clr-namespace:ZitiDesktopEdge"
         mc:Ignorable="d"
         ShowInTaskbar="False"
         x:Name="MainUI"
-        Title="ZitiTunneler" Height="520" 
+        Title="Ziti Desktop Edge" Height="520" 
         Width="350" ResizeMode="NoResize" 
         ClipToBounds="False"
         Icon="Assets/Images/icon.png" AllowsTransparency="True" 
         Closing="Window_Closing"
         WindowStyle="None" Loaded="MainWindow1_Loaded" Deactivated="MainUI_Deactivated" Activated="MainUI_Activated" Background="#000F0F23">
     <Window.Resources>
+        <Style TargetType="Image">
+            <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />
+        </Style>
         <SolidColorBrush x:Key="ProgressBar.Progress" Color="#FF06B025"/>
         <SolidColorBrush x:Key="ProgressBar.Background" Color="#FFE6E6E6"/>
         <SolidColorBrush x:Key="ProgressBar.Border" Color="#FFBCBCBC"/>
@@ -215,7 +218,7 @@
                 </Grid.RowDefinitions>
                 <Label Foreground="White" Content="Service Not Started" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans"/>
                 <Label Foreground="LightGray" Content="Start the Ziti Tunnel Service to get started" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans"/>
-                <Label Name="QuitButton" Grid.Row="3" Foreground="#F4044D" FontWeight="SemiBold" Content="Quit Ziti Tunneler" Cursor="Hand" MouseDown="CloseApp" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" HorizontalAlignment="Center"></Label>
+                <Label Name="QuitButton" Grid.Row="3" Foreground="#F4044D" FontWeight="SemiBold" Content="Quit Ziti Desktop Edge" Cursor="Hand" MouseDown="CloseApp" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" HorizontalAlignment="Center"></Label>
             </Grid>
         </Grid>
         <Grid x:Name="LoadingScreen" Visibility="Collapsed" Width="350">

DesktopEdge/MainWindow.xaml.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Input;
 using System.IO;
-using ZitiTunneler.Models;
+using ZitiDesktopEdge.Models;
 using System.IO.Compression;
 
-using ZitiTunneler.ServiceClient;
+using ZitiDesktopEdge.ServiceClient;
 using System.ServiceProcess;
 using System.Linq;
 using System.Runtime.Remoting.Messaging;
@@ -18,7 +18,7 @@ using System.Threading.Tasks;
 using System.Threading;
 using System.Text;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
 
 	/// <summary>
 	/// Interaction logic for MainWindow.xaml
@@ -64,6 +64,8 @@ namespace ZitiTunneler {
 
 			App.Current.MainWindow.WindowState = WindowState.Normal;
 			App.Current.MainWindow.Closing += MainWindow_Closing;
+			App.Current.MainWindow.Deactivated += MainWindow_Deactivated;
+			App.Current.MainWindow.Activated += MainWindow_Activated;
 			notifyIcon = new System.Windows.Forms.NotifyIcon();
 			notifyIcon.Visible = true;
 			notifyIcon.Click += TargetNotifyIcon_Click;
@@ -76,6 +78,14 @@ namespace ZitiTunneler {
 			InitializeComponent();
 		}
 
+		private void MainWindow_Activated(object sender, EventArgs e) {
+			this.Visibility = Visibility.Visible;
+		}
+
+		private void MainWindow_Deactivated(object sender, EventArgs e) {
+			this.Visibility = Visibility.Collapsed;
+		}
+
 		private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e) {
 			notifyIcon.Visible = false;
 			notifyIcon.Icon.Dispose();
@@ -343,8 +353,10 @@ namespace ZitiTunneler {
 				IdList.Height += 60;
 			}
 			var desktopWorkingArea = System.Windows.SystemParameters.WorkArea;
-			this.Left = desktopWorkingArea.Right-this.Width-_right;
-			this.Top = desktopWorkingArea.Bottom-this.Height-_bottom;
+			if (this._isAttached) {
+				this.Left = desktopWorkingArea.Right - this.Width - _right;
+				this.Top = desktopWorkingArea.Bottom - this.Height - _bottom;
+			}
 		}
 
 		private void OpenIdentity(ZitiIdentity identity) {

DesktopEdge/MenuEditItem.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.MenuEditItem"
+<UserControl x:Class="ZitiDesktopEdge.MenuEditItem"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="50" HorizontalAlignment="Stretch" d:DesignWidth="350" Cursor="Hand">
     <Grid>

DesktopEdge/MenuEditItem.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
     /// <summary>
     /// Interaction logic for MenuItem.xaml
     /// </summary>

DesktopEdge/MenuItem.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.MenuItem"
+<UserControl x:Class="ZitiDesktopEdge.MenuItem"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="50" HorizontalAlignment="Stretch" d:DesignWidth="375" Cursor="Hand">
     <UserControl.Triggers>

DesktopEdge/MenuItem.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
     /// <summary>
     /// Interaction logic for MenuItem.xaml
     /// </summary>

DesktopEdge/Models/UILog.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace ZitiTunneler.Models {
+namespace ZitiDesktopEdge.Models {
 	public class UILog {
 
 		private static string _logDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "NetFoundry" ,"Logs", "Log.log");

DesktopEdge/Models/UIModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ZitiTunneler.Models
+namespace ZitiDesktopEdge.Models
 {
     static class UIModel
     {

DesktopEdge/Models/ZitiIdentity.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ZitiTunneler.Models {
+namespace ZitiDesktopEdge.Models {
 	public class ZitiIdentity {
 		public List<ZitiService> Services { get; set; }
 		public string Name { get; set; }

DesktopEdge/Models/ZitiService.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ZitiTunneler.Models {
+namespace ZitiDesktopEdge.Models {
     public class ZitiService {
 		public string Name { get; set; }
 		public string Url { get; set; }

DesktopEdge/Properties/AssemblyInfo.cs

@@ -7,12 +7,12 @@ using System.Windows;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("ZitiTunneler")]
+[assembly: AssemblyTitle("Ziti Desktop Edge")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ZitiTunneler")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyProduct("Ziti Desktop Edge")]
+[assembly: AssemblyCopyright("Copyright NetFoundry ©  2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

DesktopEdge/Properties/Resources.Designer.cs

@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace ZitiTunneler.Properties {
+namespace Ziti.Desktop.Edge.Properties {
     using System;
-
-
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,19 +19,19 @@ namespace ZitiTunneler.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
-
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
@@ -39,13 +39,13 @@ namespace ZitiTunneler.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ZitiTunneler.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ziti.Desktop.Edge.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.

DesktopEdge/Properties/Settings.Designer.cs

@@ -8,15 +8,15 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace ZitiTunneler.Properties {
-
-
+namespace Ziti.Desktop.Edge.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
+        
         public static Settings Default {
             get {
                 return defaultInstance;

DesktopEdge/RegistrationScreen.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.RegistrationScreen"
+<UserControl x:Class="ZitiDesktopEdge.RegistrationScreen"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>

DesktopEdge/RegistrationScreen.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
 	/// <summary>
 	/// Interaction logic for RegistrationScreen.xaml
 	/// </summary>

DesktopEdge/ServiceClient/ClientImpl.cs

@@ -22,7 +22,7 @@ using System.Windows.Documents;
 /// one or more messages returned.
 /// 
 /// </summary>
-namespace ZitiTunneler.ServiceClient
+namespace ZitiDesktopEdge.ServiceClient
 {
     internal class Client
     {

DesktopEdge/ServiceClient/DataStructures.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 /// These classes represent the data structures that are passed back and forth
 /// between the service and the client.
 /// </summary>
-namespace ZitiTunneler.ServiceClient
+namespace ZitiDesktopEdge.ServiceClient
 {
     class SvcResponse
     {

DesktopEdge/ServiceInfo.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.ServiceInfo"
+<UserControl x:Class="ZitiDesktopEdge.ServiceInfo"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="36" HorizontalAlignment="Stretch" d:DesignWidth="350" Cursor="Hand">
     <Grid>

DesktopEdge/ServiceInfo.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
     /// <summary>
     /// Interaction logic for MenuItem.xaml
     /// </summary>

DesktopEdge/SubMenuItem.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.SubMenuItem"
+<UserControl x:Class="ZitiDesktopEdge.SubMenuItem"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="50" HorizontalAlignment="Stretch" d:DesignWidth="375" Cursor="Hand">
     <UserControl.Triggers>

DesktopEdge/SubMenuItem.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
     /// <summary>
     /// Interaction logic for MenuItem.xaml
     /// </summary>

DesktopEdge/Themes/Generic.xaml

@@ -1,6 +1,6 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:ZitiTunneler">
+    xmlns:local="clr-namespace:ZitiDesktopEdge">
 
 </ResourceDictionary>

DesktopEdge/Toggler.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.Toggler"
+<UserControl x:Class="ZitiDesktopEdge.Toggler"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="20" d:DesignWidth="35" Width="35" Height="20" Padding="0,0,0,0" Loaded="OnLoad">
     <StackPanel Orientation="Vertical" Margin="0,0,0,0">

DesktopEdge/Toggler.xaml.cs

@@ -14,7 +14,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Windows.Media.Animation;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
     /// <summary>
     /// Interaction logic for Toggler.xaml
     /// </summary>

DesktopEdge/ZitiDesktopEdge.csproj

@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{FA4291EA-A97E-4854-959F-91EE7B330B37}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>ZitiTunneler</RootNamespace>
-    <AssemblyName>ZitiTunneler</AssemblyName>
+    <RootNamespace>Ziti.Desktop.Edge</RootNamespace>
+    <AssemblyName>ZitiDesktopEdge</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -28,7 +28,7 @@
     <MapFileExtensions>true</MapFileExtensions>
     <SupportUrl>https://support.netfoundry.io</SupportUrl>
     <TargetCulture>en-US</TargetCulture>
-    <ProductName>Ziti Tunneler</ProductName>
+    <ProductName>Ziti Desktop Edge</ProductName>
     <PublisherName>NetFoundry</PublisherName>
     <SuiteName>Ziti</SuiteName>
     <AutorunEnabled>true</AutorunEnabled>
@@ -235,7 +235,7 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="app.manifest" />
-    <None Include="ZitiTunneler_TemporaryKey.pfx" />
+    <None Include="ZitiDesktopEdge_TemporaryKey.pfx" />
     <Resource Include="Assets\Fonts\open_sans.ttf">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>

README.md

@@ -1,8 +1,8 @@
-# Ziti Tunnel for Windows
+# Ziti Desktop Edge for Windows
 
 (the uwp project which used to be here has moved to [uwp-vpnplugin-archive](.uwp-vpnplugin-archive) and is likely abandoned)
 
-The Ziti Tunnel for Windows is an application that is necessary to integrate applications which cannot embed a Ziti SDK
+The Ziti Desktop Edge for Windows is an application that is necessary to integrate applications which cannot embed a Ziti SDK
 directly into the application. This is colloquially known as a "brown field" Ziti-enabled application because the app
 itself has no understanding that it has been Ziti-enabled.
 

ZitiDesktopEdge.sln

@@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiTunneler", "ZitiTunneler\ZitiTunneler.csproj", "{FA4291EA-A97E-4854-959F-91EE7B330B37}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiDesktopEdge", "DesktopEdge\ZitiDesktopEdge.csproj", "{FA4291EA-A97E-4854-959F-91EE7B330B37}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiUpdateService", "ZitiUpdateService\ZitiUpdateService.csproj", "{9AB81609-F5DD-40A6-87B5-F3279D48514D}"
 EndProject

ZitiUpdateService/UpdateService.cs

@@ -41,8 +41,7 @@ namespace ZitiUpdateService {
 			InitializeComponent();
 		}
 
-		public void Debug()
-		{
+		public void Debug() {
 			OnStart(null);
 		}
 
@@ -70,15 +69,13 @@ namespace ZitiUpdateService {
 
 			var serviceTimerInterval = ConfigurationManager.AppSettings.Get("ServiceTimer");
 			var serviceInt = TimeSpan.Zero;
-			if (!TimeSpan.TryParse(serviceTimerInterval, out serviceInt))
-			{
+			if (!TimeSpan.TryParse(serviceTimerInterval, out serviceInt)) {
 				serviceInt = new TimeSpan(0, 1, 0);
 			}
 
 			var updateTimerInterval = ConfigurationManager.AppSettings.Get("UpdateTimer");
 			var upInt = TimeSpan.Zero;
-			if (!TimeSpan.TryParse(updateTimerInterval, out upInt))
-			{
+			if (!TimeSpan.TryParse(updateTimerInterval, out upInt)) {
 				upInt = new TimeSpan(0, 1, 0);
 			}
 
@@ -103,8 +100,7 @@ namespace ZitiUpdateService {
 		private void CheckUpdate(object sender, ElapsedEventArgs e) {
 			if (inUpdateCheck) return;
 			inUpdateCheck = true; //simple semaphone
-			try
-			{
+			try {
 				var request = WebRequest.Create(_versionUrl) as HttpWebRequest;
 				var response = request.GetResponse();
 				Stream receiveStream = response.GetResponseStream();
@@ -114,14 +110,11 @@ namespace ZitiUpdateService {
 				xmlDoc.LoadXml(result);
 				XmlNode node = xmlDoc.SelectSingleNode("metadata/versioning/" + _versionType);
 				string version = node.InnerText;
-				Log("Version Checked: " + version + " on " + _version + " from " + _versionType);
-				if (version != _version)
-				{
+				if (version != _version) {
 					Log("Version Checked: " + version + " on " + _version + " from " + _versionType);
 					UpdateServiceFiles(version);
 				}
-			} catch
-            {
+			} catch {
 
             }
 			inUpdateCheck = false;
@@ -130,25 +123,19 @@ namespace ZitiUpdateService {
 		private void CheckService(object sender, ElapsedEventArgs e) {
 			if (inServiceCheck || inUpdateCheck) return;
 			inServiceCheck = true; //simple semaphone
-			try
-			{
+			try {
 				controller = ServiceController.GetServices().FirstOrDefault(s => s.ServiceName == "ziti");
 				if (controller == null) return; //means it's not installed or the user doesn't have privs
 
-				if (controller.Status == ServiceControllerStatus.Stopped || controller.Status == ServiceControllerStatus.StopPending)
-				{
-					if (_isJustStopped)
-					{
+				if (controller.Status == ServiceControllerStatus.Stopped || controller.Status == ServiceControllerStatus.StopPending) {
+					if (_isJustStopped) {
 						_isJustStopped = false;
 						Log("Ziti Service has been stopped, update Network");
 						//should not be necessary in v0.0.10+ RunScript();
 						StartZiti();
 					}
-				}
-				else
-				{
-					if (controller.Status == ServiceControllerStatus.Running)
-					{
+				} else {
+					if (controller.Status == ServiceControllerStatus.Running) {
 						_isJustStopped = true;
 					}
 				}
@@ -170,8 +157,7 @@ namespace ZitiUpdateService {
 			string version = node.InnerText;
 			Log("Got Version: " + version+" from "+_versionType);
 
-			if (_version.Trim() == currentVersion.Trim())
-			{
+			if (_version.Trim() == currentVersion.Trim()) {
 				_version = currentVersion;
 				Log("Version local is the same as the version remote: " + version);
 				return;
@@ -237,7 +223,7 @@ namespace ZitiUpdateService {
 
 		private void StartZiti() {
 			controller = ServiceController.GetServices().FirstOrDefault(s => s.ServiceName == "ziti");
-			if (controller.Status != ServiceControllerStatus.Running) {
+			if (controller != null && controller.Status != ServiceControllerStatus.Running) {
 				try {
 					Log("Starting Service");
 					controller.Start();

ZitiWintunInstaller.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29318.209
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D66B1C6A-ADFE-437E-B037-C4C849A6CA97}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ZitiWintunInstaller", "ZitiWintunInstaller\ZitiWintunInstaller.wixproj", "{1A5D850F-2E38-4524-8745-29A96FA62683}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1A5D850F-2E38-4524-8745-29A96FA62683}.Debug|x86.ActiveCfg = Debug|x86
+		{1A5D850F-2E38-4524-8745-29A96FA62683}.Debug|x86.Build.0 = Debug|x86
+		{1A5D850F-2E38-4524-8745-29A96FA62683}.Release|x86.ActiveCfg = Release|x86
+		{1A5D850F-2E38-4524-8745-29A96FA62683}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3E499EAC-C1BA-41A0-8076-D660F8ACC977}
+	EndGlobalSection
+EndGlobal

ZitiWintunInstaller/.gitignore

@@ -0,0 +1 @@
+wintun*msm

ZitiWintunInstaller/Product.wxs

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Product Id="*" Name="OpenZitiWintunInstaller" Language="1033" Version="1.0.0.0" Manufacturer="Ziti" UpgradeCode="1abdbe15-0f36-4633-ba6f-8a32d8cf4838">
+		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64"/>
+
+		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+		<MediaTemplate />
+        
+        <DirectoryRef Id="INSTALLFOLDER">
+            <Merge Id="WintunMergeModule" Language="0" DiskId="1" SourceFile="wintun-amd64-0.8.1.msm" />
+        </DirectoryRef>
+        <Feature Id="WintunFeature" Title="Wintun" Level="1">
+            <MergeRef Id="WintunMergeModule" />
+        </Feature>
+	</Product>
+
+	<Fragment>
+		<Directory Id="TARGETDIR" Name="SourceDir">
+			<Directory Id="ProgramFilesFolder">
+				<Directory Id="INSTALLFOLDER" Name="OpenZitiWintunInstaller" />
+			</Directory>
+		</Directory>
+	</Fragment>
+
+	<Fragment>
+		<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+			<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
+			<!-- <Component Id="ProductComponent"> -->
+				<!-- TODO: Insert files, registry keys, and other resources here. -->
+			<!-- </Component> -->
+		</ComponentGroup>
+	</Fragment>
+</Wix>

ZitiWintunInstaller/ZitiWintunInstaller.wixproj

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>1a5d850f-2e38-4524-8745-29a96fa62683</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>OpenZitiWintunInstaller</OutputName>
+    <OutputType>Package</OutputType>
+    <Name>NFWintunInstaller</Name>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <PropertyGroup>
+    <PreBuildEvent>echo Inside Pre-build event about to download wintun 
+echo       from: https://www.wintun.net/builds/wintun-amd64-0.8.1.msm
+echo       into $(MSBuildProjectFullPath)\wintun-amd64-0.8.1.msm
+
+call powershell "Invoke-WebRequest https://www.wintun.net/builds/wintun-amd64-0.8.1.msm -OutFile $(ProjectDir)wintun-amd64-0.8.1.msm"</PreBuildEvent>
+  </PropertyGroup>
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>

release-notes.md

@@ -0,0 +1,12 @@
+# Release 0.0.15
+
+* What's New
+
+* Bug fixes
+  * [#51](https://github.com/openziti/desktop-edge-win/issues/51) - cziti log would never roll over. 
+            now the cziti log rolls daily with a maximum of seven (7) log files
+
+# All versions prior to 0.0.15
+
+Changelog tracking began with 0.0.15 - all previous changes were not tracked. If interested please
+review the commit history.