From ebcbad61325057543037ee54ae8cb7d317a1a2ac Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 8 Jul 2020 13:40:27 -0400 Subject: [PATCH 1/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3d4d257e..1ec5b193 100644 --- a/README.md +++ b/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. From 7cf7305ffe8835af124c78332c343089fc25a3b2 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 8 Jul 2020 14:08:15 -0400 Subject: [PATCH 2/5] add the wintun installer sln/project --- ZitiWintunInstaller.sln | 31 +++++++++++++ ZitiWintunInstaller/.gitignore | 1 + ZitiWintunInstaller/Product.wxs | 33 ++++++++++++++ .../ZitiWintunInstaller.wixproj | 45 +++++++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 ZitiWintunInstaller.sln create mode 100644 ZitiWintunInstaller/.gitignore create mode 100644 ZitiWintunInstaller/Product.wxs create mode 100644 ZitiWintunInstaller/ZitiWintunInstaller.wixproj diff --git a/ZitiWintunInstaller.sln b/ZitiWintunInstaller.sln new file mode 100644 index 00000000..08823b4c --- /dev/null +++ b/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 diff --git a/ZitiWintunInstaller/.gitignore b/ZitiWintunInstaller/.gitignore new file mode 100644 index 00000000..6bade68c --- /dev/null +++ b/ZitiWintunInstaller/.gitignore @@ -0,0 +1 @@ +wintun*msm diff --git a/ZitiWintunInstaller/Product.wxs b/ZitiWintunInstaller/Product.wxs new file mode 100644 index 00000000..d79aca6d --- /dev/null +++ b/ZitiWintunInstaller/Product.wxs @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ZitiWintunInstaller/ZitiWintunInstaller.wixproj b/ZitiWintunInstaller/ZitiWintunInstaller.wixproj new file mode 100644 index 00000000..25e9d37e --- /dev/null +++ b/ZitiWintunInstaller/ZitiWintunInstaller.wixproj @@ -0,0 +1,45 @@ + + + + Debug + x86 + 3.10 + 1a5d850f-2e38-4524-8745-29a96fa62683 + 2.0 + OpenZitiWintunInstaller + Package + NFWintunInstaller + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + + + + + + 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" + + + \ No newline at end of file From 3478993b90268161cf4b083549c5796204279b64 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 8 Jul 2020 14:21:23 -0400 Subject: [PATCH 3/5] Rename ZitiTunneler --> ZitiDesktopEdge --- ZitiUWPSolution.sln => ZitiDesktopEdge.sln | 2 +- ZitiTunneler/App.xaml | 4 ++-- ZitiTunneler/App.xaml.cs | 2 +- ZitiTunneler/ControllerScreen.xaml | 4 ++-- ZitiTunneler/ControllerScreen.xaml.cs | 2 +- ZitiTunneler/IdentityDetails.xaml | 4 ++-- ZitiTunneler/IdentityDetails.xaml.cs | 4 ++-- ZitiTunneler/IdentityItem.xaml | 4 ++-- ZitiTunneler/IdentityItem.xaml.cs | 4 ++-- ZitiTunneler/MainMenu.xaml | 4 ++-- ZitiTunneler/MainMenu.xaml.cs | 4 ++-- ZitiTunneler/MainWindow.xaml | 6 +++--- ZitiTunneler/MainWindow.xaml.cs | 6 +++--- ZitiTunneler/MenuEditItem.xaml | 4 ++-- ZitiTunneler/MenuEditItem.xaml.cs | 2 +- ZitiTunneler/MenuItem.xaml | 4 ++-- ZitiTunneler/MenuItem.xaml.cs | 2 +- ZitiTunneler/Models/UILog.cs | 2 +- ZitiTunneler/Models/UIModel.cs | 2 +- ZitiTunneler/Models/ZitiIdentity.cs | 2 +- ZitiTunneler/Models/ZitiService.cs | 2 +- ZitiTunneler/Properties/AssemblyInfo.cs | 6 +++--- ZitiTunneler/Properties/Resources.Designer.cs | 20 +++++++++---------- ZitiTunneler/Properties/Settings.Designer.cs | 12 +++++------ ZitiTunneler/RegistrationScreen.xaml | 4 ++-- ZitiTunneler/RegistrationScreen.xaml.cs | 2 +- ZitiTunneler/ServiceClient/ClientImpl.cs | 2 +- ZitiTunneler/ServiceClient/DataStructures.cs | 2 +- ZitiTunneler/ServiceInfo.xaml | 4 ++-- ZitiTunneler/ServiceInfo.xaml.cs | 2 +- ZitiTunneler/SubMenuItem.xaml | 4 ++-- ZitiTunneler/SubMenuItem.xaml.cs | 2 +- ZitiTunneler/Themes/Generic.xaml | 2 +- ZitiTunneler/Toggler.xaml | 4 ++-- ZitiTunneler/Toggler.xaml.cs | 2 +- ...Tunneler.csproj => ZitiDekstopEdge.csproj} | 4 ++-- 36 files changed, 71 insertions(+), 71 deletions(-) rename ZitiUWPSolution.sln => ZitiDesktopEdge.sln (96%) rename ZitiTunneler/{ZitiTunneler.csproj => ZitiDekstopEdge.csproj} (99%) diff --git a/ZitiUWPSolution.sln b/ZitiDesktopEdge.sln similarity index 96% rename from ZitiUWPSolution.sln rename to ZitiDesktopEdge.sln index dbf08b50..51b5ef0a 100644 --- a/ZitiUWPSolution.sln +++ b/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}") = "ZitiDekstopEdge", "ZitiTunneler\ZitiDekstopEdge.csproj", "{FA4291EA-A97E-4854-959F-91EE7B330B37}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiUpdateService", "ZitiUpdateService\ZitiUpdateService.csproj", "{9AB81609-F5DD-40A6-87B5-F3279D48514D}" EndProject diff --git a/ZitiTunneler/App.xaml b/ZitiTunneler/App.xaml index fa730afb..876e1d58 100644 --- a/ZitiTunneler/App.xaml +++ b/ZitiTunneler/App.xaml @@ -1,7 +1,7 @@ - diff --git a/ZitiTunneler/App.xaml.cs b/ZitiTunneler/App.xaml.cs index 2418dc42..d79bc3d8 100644 --- a/ZitiTunneler/App.xaml.cs +++ b/ZitiTunneler/App.xaml.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for App.xaml /// diff --git a/ZitiTunneler/ControllerScreen.xaml b/ZitiTunneler/ControllerScreen.xaml index 0f6633a5..4d9eed8b 100644 --- a/ZitiTunneler/ControllerScreen.xaml +++ b/ZitiTunneler/ControllerScreen.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/ControllerScreen.xaml.cs b/ZitiTunneler/ControllerScreen.xaml.cs index 1d922775..f3d584d1 100644 --- a/ZitiTunneler/ControllerScreen.xaml.cs +++ b/ZitiTunneler/ControllerScreen.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for ControllerScreen.xaml /// diff --git a/ZitiTunneler/IdentityDetails.xaml b/ZitiTunneler/IdentityDetails.xaml index e7d0251b..027e222c 100644 --- a/ZitiTunneler/IdentityDetails.xaml +++ b/ZitiTunneler/IdentityDetails.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/IdentityDetails.xaml.cs b/ZitiTunneler/IdentityDetails.xaml.cs index 3c0bd255..5aea08d9 100644 --- a/ZitiTunneler/IdentityDetails.xaml.cs +++ b/ZitiTunneler/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 { /// /// Interaction logic for IdentityDetails.xaml /// diff --git a/ZitiTunneler/IdentityItem.xaml b/ZitiTunneler/IdentityItem.xaml index 7d0eda60..3fc3f4aa 100644 --- a/ZitiTunneler/IdentityItem.xaml +++ b/ZitiTunneler/IdentityItem.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/IdentityItem.xaml.cs b/ZitiTunneler/IdentityItem.xaml.cs index e1bcb844..a601218b 100644 --- a/ZitiTunneler/IdentityItem.xaml.cs +++ b/ZitiTunneler/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 { /// /// User Control to list Identities and give status /// diff --git a/ZitiTunneler/MainMenu.xaml b/ZitiTunneler/MainMenu.xaml index 4c36e7f5..e3c3779e 100644 --- a/ZitiTunneler/MainMenu.xaml +++ b/ZitiTunneler/MainMenu.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/MainMenu.xaml.cs b/ZitiTunneler/MainMenu.xaml.cs index 3b3c43a4..4852156f 100644 --- a/ZitiTunneler/MainMenu.xaml.cs +++ b/ZitiTunneler/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 { /// /// Interaction logic for MainMenu.xaml diff --git a/ZitiTunneler/MainWindow.xaml b/ZitiTunneler/MainWindow.xaml index af7deb70..9ab38231 100644 --- a/ZitiTunneler/MainWindow.xaml +++ b/ZitiTunneler/MainWindow.xaml @@ -1,13 +1,13 @@ - /// Interaction logic for MainWindow.xaml diff --git a/ZitiTunneler/MenuEditItem.xaml b/ZitiTunneler/MenuEditItem.xaml index be1332b8..10c04ec3 100644 --- a/ZitiTunneler/MenuEditItem.xaml +++ b/ZitiTunneler/MenuEditItem.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/MenuEditItem.xaml.cs b/ZitiTunneler/MenuEditItem.xaml.cs index 7e55b604..14aa8075 100644 --- a/ZitiTunneler/MenuEditItem.xaml.cs +++ b/ZitiTunneler/MenuEditItem.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for MenuItem.xaml /// diff --git a/ZitiTunneler/MenuItem.xaml b/ZitiTunneler/MenuItem.xaml index 51d0296e..7cb19dfe 100644 --- a/ZitiTunneler/MenuItem.xaml +++ b/ZitiTunneler/MenuItem.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/MenuItem.xaml.cs b/ZitiTunneler/MenuItem.xaml.cs index 156ac5e5..dd4da3c3 100644 --- a/ZitiTunneler/MenuItem.xaml.cs +++ b/ZitiTunneler/MenuItem.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for MenuItem.xaml /// diff --git a/ZitiTunneler/Models/UILog.cs b/ZitiTunneler/Models/UILog.cs index fc157a6d..af73adbb 100644 --- a/ZitiTunneler/Models/UILog.cs +++ b/ZitiTunneler/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"); diff --git a/ZitiTunneler/Models/UIModel.cs b/ZitiTunneler/Models/UIModel.cs index e8b5b46a..641877aa 100644 --- a/ZitiTunneler/Models/UIModel.cs +++ b/ZitiTunneler/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 { diff --git a/ZitiTunneler/Models/ZitiIdentity.cs b/ZitiTunneler/Models/ZitiIdentity.cs index 4278bd99..9af38425 100644 --- a/ZitiTunneler/Models/ZitiIdentity.cs +++ b/ZitiTunneler/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 Services { get; set; } public string Name { get; set; } diff --git a/ZitiTunneler/Models/ZitiService.cs b/ZitiTunneler/Models/ZitiService.cs index fa513ce1..f1f22583 100644 --- a/ZitiTunneler/Models/ZitiService.cs +++ b/ZitiTunneler/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; } diff --git a/ZitiTunneler/Properties/AssemblyInfo.cs b/ZitiTunneler/Properties/AssemblyInfo.cs index d3db0749..9155285a 100644 --- a/ZitiTunneler/Properties/AssemblyInfo.cs +++ b/ZitiTunneler/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("")] diff --git a/ZitiTunneler/Properties/Resources.Designer.cs b/ZitiTunneler/Properties/Resources.Designer.cs index 60ce376f..e73a18ff 100644 --- a/ZitiTunneler/Properties/Resources.Designer.cs +++ b/ZitiTunneler/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace ZitiTunneler.Properties { +namespace Ziti.Desktop.Edge.Properties { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -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() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -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; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. diff --git a/ZitiTunneler/Properties/Settings.Designer.cs b/ZitiTunneler/Properties/Settings.Designer.cs index 4a310077..bd88d524 100644 --- a/ZitiTunneler/Properties/Settings.Designer.cs +++ b/ZitiTunneler/Properties/Settings.Designer.cs @@ -8,15 +8,15 @@ // //------------------------------------------------------------------------------ -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; diff --git a/ZitiTunneler/RegistrationScreen.xaml b/ZitiTunneler/RegistrationScreen.xaml index d9d562d9..16bd3287 100644 --- a/ZitiTunneler/RegistrationScreen.xaml +++ b/ZitiTunneler/RegistrationScreen.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/RegistrationScreen.xaml.cs b/ZitiTunneler/RegistrationScreen.xaml.cs index 19b250d1..3bc20ca6 100644 --- a/ZitiTunneler/RegistrationScreen.xaml.cs +++ b/ZitiTunneler/RegistrationScreen.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for RegistrationScreen.xaml /// diff --git a/ZitiTunneler/ServiceClient/ClientImpl.cs b/ZitiTunneler/ServiceClient/ClientImpl.cs index d4ce7a6b..517900f3 100644 --- a/ZitiTunneler/ServiceClient/ClientImpl.cs +++ b/ZitiTunneler/ServiceClient/ClientImpl.cs @@ -22,7 +22,7 @@ using System.Windows.Documents; /// one or more messages returned. /// /// -namespace ZitiTunneler.ServiceClient +namespace ZitiDesktopEdge.ServiceClient { internal class Client { diff --git a/ZitiTunneler/ServiceClient/DataStructures.cs b/ZitiTunneler/ServiceClient/DataStructures.cs index 61e4b1cd..6d904b60 100644 --- a/ZitiTunneler/ServiceClient/DataStructures.cs +++ b/ZitiTunneler/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. /// -namespace ZitiTunneler.ServiceClient +namespace ZitiDesktopEdge.ServiceClient { class SvcResponse { diff --git a/ZitiTunneler/ServiceInfo.xaml b/ZitiTunneler/ServiceInfo.xaml index 24fe242d..91e678bd 100644 --- a/ZitiTunneler/ServiceInfo.xaml +++ b/ZitiTunneler/ServiceInfo.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/ServiceInfo.xaml.cs b/ZitiTunneler/ServiceInfo.xaml.cs index 6653045e..dea597fb 100644 --- a/ZitiTunneler/ServiceInfo.xaml.cs +++ b/ZitiTunneler/ServiceInfo.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for MenuItem.xaml /// diff --git a/ZitiTunneler/SubMenuItem.xaml b/ZitiTunneler/SubMenuItem.xaml index 7147afe6..54028384 100644 --- a/ZitiTunneler/SubMenuItem.xaml +++ b/ZitiTunneler/SubMenuItem.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/SubMenuItem.xaml.cs b/ZitiTunneler/SubMenuItem.xaml.cs index c06bebd4..5c9de79e 100644 --- a/ZitiTunneler/SubMenuItem.xaml.cs +++ b/ZitiTunneler/SubMenuItem.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for MenuItem.xaml /// diff --git a/ZitiTunneler/Themes/Generic.xaml b/ZitiTunneler/Themes/Generic.xaml index 253d4f7d..cd5d962e 100644 --- a/ZitiTunneler/Themes/Generic.xaml +++ b/ZitiTunneler/Themes/Generic.xaml @@ -1,6 +1,6 @@ + xmlns:local="clr-namespace:ZitiDesktopEdge"> diff --git a/ZitiTunneler/Toggler.xaml b/ZitiTunneler/Toggler.xaml index 06bc1188..f017c716 100644 --- a/ZitiTunneler/Toggler.xaml +++ b/ZitiTunneler/Toggler.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/Toggler.xaml.cs b/ZitiTunneler/Toggler.xaml.cs index 4f9d416a..db532134 100644 --- a/ZitiTunneler/Toggler.xaml.cs +++ b/ZitiTunneler/Toggler.xaml.cs @@ -14,7 +14,7 @@ using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Media.Animation; -namespace ZitiTunneler { +namespace ZitiDesktopEdge { /// /// Interaction logic for Toggler.xaml /// diff --git a/ZitiTunneler/ZitiTunneler.csproj b/ZitiTunneler/ZitiDekstopEdge.csproj similarity index 99% rename from ZitiTunneler/ZitiTunneler.csproj rename to ZitiTunneler/ZitiDekstopEdge.csproj index 9c600c19..7d83eb20 100644 --- a/ZitiTunneler/ZitiTunneler.csproj +++ b/ZitiTunneler/ZitiDekstopEdge.csproj @@ -6,8 +6,8 @@ AnyCPU {FA4291EA-A97E-4854-959F-91EE7B330B37} WinExe - ZitiTunneler - ZitiTunneler + Ziti.Desktop.Edge + ZitiDesktopEdge v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} From 7837cef3e3c46e996297d723efc00500eaa31942 Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Wed, 8 Jul 2020 14:27:22 -0400 Subject: [PATCH 4/5] more renames --- {ZitiTunneler => DesktopEdge}/App.config | 0 {ZitiTunneler => DesktopEdge}/App.xaml | 0 {ZitiTunneler => DesktopEdge}/App.xaml.cs | 0 .../Assets/Fonts/open_sans.ttf | Bin .../Assets/Fonts/russo_one.ttf | Bin .../Assets/Images/Ziti-Green.png | Bin .../Assets/Images/Ziti-Red.png | Bin .../Assets/Images/Ziti-White.png | Bin .../Assets/Images/about.png | Bin .../Assets/Images/advanced.png | Bin .../Assets/Images/appicon.png | Bin .../Assets/Images/back.png | Bin .../Assets/Images/background.png | Bin .../Assets/Images/bubble.png | Bin .../Assets/Images/card.png | Bin .../Assets/Images/close.png | Bin .../Assets/Images/closer.png | Bin .../Assets/Images/connect.png | Bin .../Assets/Images/connected.png | Bin .../Assets/Images/dashboard.png | Bin .../Assets/Images/detach.png | Bin .../Assets/Images/down.png | Bin .../Assets/Images/feedback.png | Bin .../Assets/Images/globe.png | Bin .../Assets/Images/hamburger.png | Bin .../Assets/Images/header.png | Bin .../Assets/Images/icon.ico | Bin .../Assets/Images/icon.png | Bin .../Assets/Images/identity.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/jwt.png | Bin .../Assets/Images/lastArrow.png | Bin .../Assets/Images/loading.png | Bin .../Assets/Images/logo.png | Bin .../Assets/Images/logs.png | Bin .../Assets/Images/next.png | Bin .../Assets/Images/nextArrow.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/off.png | Bin .../Assets/Images/offline.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/on.png | Bin .../Assets/Images/online.png | Bin .../Assets/Images/open.png | Bin .../Assets/Images/privacy.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/qr.png | Bin .../Assets/Images/select.png | Bin .../Assets/Images/server.png | Bin .../Assets/Images/support.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/up.png | Bin .../Assets/Images/wrench.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/x.png | Bin {ZitiTunneler => DesktopEdge}/Assets/Images/z.png | Bin .../Assets/Images/ziti-green.ico | Bin .../Assets/Images/ziti-red.ico | Bin .../Assets/Images/ziti-white.ico | Bin {ZitiTunneler => DesktopEdge}/ControllerScreen.xaml | 0 .../ControllerScreen.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/IdentityDetails.xaml | 0 .../IdentityDetails.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/IdentityItem.xaml | 0 {ZitiTunneler => DesktopEdge}/IdentityItem.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/MainMenu.xaml | 2 +- {ZitiTunneler => DesktopEdge}/MainMenu.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/MainWindow.xaml | 2 +- {ZitiTunneler => DesktopEdge}/MainWindow.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/MenuEditItem.xaml | 0 {ZitiTunneler => DesktopEdge}/MenuEditItem.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/MenuItem.xaml | 0 {ZitiTunneler => DesktopEdge}/MenuItem.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/Models/UILog.cs | 0 {ZitiTunneler => DesktopEdge}/Models/UIModel.cs | 0 .../Models/ZitiIdentity.cs | 0 {ZitiTunneler => DesktopEdge}/Models/ZitiService.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 0 .../Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 0 .../Properties/Settings.settings | 0 .../RegistrationScreen.xaml | 0 .../RegistrationScreen.xaml.cs | 0 .../ServiceClient/ClientImpl.cs | 0 .../ServiceClient/DataStructures.cs | 0 {ZitiTunneler => DesktopEdge}/ServiceInfo.xaml | 0 {ZitiTunneler => DesktopEdge}/ServiceInfo.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/SubMenuItem.xaml | 0 {ZitiTunneler => DesktopEdge}/SubMenuItem.xaml.cs | 0 {ZitiTunneler => DesktopEdge}/Themes/Generic.xaml | 0 {ZitiTunneler => DesktopEdge}/Toggler.resx | 0 {ZitiTunneler => DesktopEdge}/Toggler.xaml | 0 {ZitiTunneler => DesktopEdge}/Toggler.xaml.cs | 0 .../ZitiDekstopEdge.csproj | 0 {ZitiTunneler => DesktopEdge}/app.manifest | 0 {ZitiTunneler => DesktopEdge}/packages.config | 0 {ZitiTunneler => DesktopEdge}/ziti.ico | Bin ZitiDesktopEdge.sln | 2 +- 93 files changed, 3 insertions(+), 3 deletions(-) rename {ZitiTunneler => DesktopEdge}/App.config (100%) rename {ZitiTunneler => DesktopEdge}/App.xaml (100%) rename {ZitiTunneler => DesktopEdge}/App.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Fonts/open_sans.ttf (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Fonts/russo_one.ttf (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/Ziti-Green.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/Ziti-Red.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/Ziti-White.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/about.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/advanced.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/appicon.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/back.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/background.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/bubble.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/card.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/close.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/closer.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/connect.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/connected.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/dashboard.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/detach.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/down.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/feedback.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/globe.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/hamburger.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/header.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/icon.ico (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/icon.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/identity.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/jwt.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/lastArrow.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/loading.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/logo.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/logs.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/next.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/nextArrow.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/off.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/offline.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/on.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/online.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/open.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/privacy.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/qr.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/select.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/server.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/support.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/up.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/wrench.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/x.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/z.png (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/ziti-green.ico (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/ziti-red.ico (100%) rename {ZitiTunneler => DesktopEdge}/Assets/Images/ziti-white.ico (100%) rename {ZitiTunneler => DesktopEdge}/ControllerScreen.xaml (100%) rename {ZitiTunneler => DesktopEdge}/ControllerScreen.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/IdentityDetails.xaml (100%) rename {ZitiTunneler => DesktopEdge}/IdentityDetails.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/IdentityItem.xaml (100%) rename {ZitiTunneler => DesktopEdge}/IdentityItem.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/MainMenu.xaml (96%) rename {ZitiTunneler => DesktopEdge}/MainMenu.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/MainWindow.xaml (99%) rename {ZitiTunneler => DesktopEdge}/MainWindow.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/MenuEditItem.xaml (100%) rename {ZitiTunneler => DesktopEdge}/MenuEditItem.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/MenuItem.xaml (100%) rename {ZitiTunneler => DesktopEdge}/MenuItem.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/Models/UILog.cs (100%) rename {ZitiTunneler => DesktopEdge}/Models/UIModel.cs (100%) rename {ZitiTunneler => DesktopEdge}/Models/ZitiIdentity.cs (100%) rename {ZitiTunneler => DesktopEdge}/Models/ZitiService.cs (100%) rename {ZitiTunneler => DesktopEdge}/Properties/AssemblyInfo.cs (100%) rename {ZitiTunneler => DesktopEdge}/Properties/Resources.Designer.cs (100%) rename {ZitiTunneler => DesktopEdge}/Properties/Resources.resx (100%) rename {ZitiTunneler => DesktopEdge}/Properties/Settings.Designer.cs (100%) rename {ZitiTunneler => DesktopEdge}/Properties/Settings.settings (100%) rename {ZitiTunneler => DesktopEdge}/RegistrationScreen.xaml (100%) rename {ZitiTunneler => DesktopEdge}/RegistrationScreen.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/ServiceClient/ClientImpl.cs (100%) rename {ZitiTunneler => DesktopEdge}/ServiceClient/DataStructures.cs (100%) rename {ZitiTunneler => DesktopEdge}/ServiceInfo.xaml (100%) rename {ZitiTunneler => DesktopEdge}/ServiceInfo.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/SubMenuItem.xaml (100%) rename {ZitiTunneler => DesktopEdge}/SubMenuItem.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/Themes/Generic.xaml (100%) rename {ZitiTunneler => DesktopEdge}/Toggler.resx (100%) rename {ZitiTunneler => DesktopEdge}/Toggler.xaml (100%) rename {ZitiTunneler => DesktopEdge}/Toggler.xaml.cs (100%) rename {ZitiTunneler => DesktopEdge}/ZitiDekstopEdge.csproj (100%) rename {ZitiTunneler => DesktopEdge}/app.manifest (100%) rename {ZitiTunneler => DesktopEdge}/packages.config (100%) rename {ZitiTunneler => DesktopEdge}/ziti.ico (100%) diff --git a/ZitiTunneler/App.config b/DesktopEdge/App.config similarity index 100% rename from ZitiTunneler/App.config rename to DesktopEdge/App.config diff --git a/ZitiTunneler/App.xaml b/DesktopEdge/App.xaml similarity index 100% rename from ZitiTunneler/App.xaml rename to DesktopEdge/App.xaml diff --git a/ZitiTunneler/App.xaml.cs b/DesktopEdge/App.xaml.cs similarity index 100% rename from ZitiTunneler/App.xaml.cs rename to DesktopEdge/App.xaml.cs diff --git a/ZitiTunneler/Assets/Fonts/open_sans.ttf b/DesktopEdge/Assets/Fonts/open_sans.ttf similarity index 100% rename from ZitiTunneler/Assets/Fonts/open_sans.ttf rename to DesktopEdge/Assets/Fonts/open_sans.ttf diff --git a/ZitiTunneler/Assets/Fonts/russo_one.ttf b/DesktopEdge/Assets/Fonts/russo_one.ttf similarity index 100% rename from ZitiTunneler/Assets/Fonts/russo_one.ttf rename to DesktopEdge/Assets/Fonts/russo_one.ttf diff --git a/ZitiTunneler/Assets/Images/Ziti-Green.png b/DesktopEdge/Assets/Images/Ziti-Green.png similarity index 100% rename from ZitiTunneler/Assets/Images/Ziti-Green.png rename to DesktopEdge/Assets/Images/Ziti-Green.png diff --git a/ZitiTunneler/Assets/Images/Ziti-Red.png b/DesktopEdge/Assets/Images/Ziti-Red.png similarity index 100% rename from ZitiTunneler/Assets/Images/Ziti-Red.png rename to DesktopEdge/Assets/Images/Ziti-Red.png diff --git a/ZitiTunneler/Assets/Images/Ziti-White.png b/DesktopEdge/Assets/Images/Ziti-White.png similarity index 100% rename from ZitiTunneler/Assets/Images/Ziti-White.png rename to DesktopEdge/Assets/Images/Ziti-White.png diff --git a/ZitiTunneler/Assets/Images/about.png b/DesktopEdge/Assets/Images/about.png similarity index 100% rename from ZitiTunneler/Assets/Images/about.png rename to DesktopEdge/Assets/Images/about.png diff --git a/ZitiTunneler/Assets/Images/advanced.png b/DesktopEdge/Assets/Images/advanced.png similarity index 100% rename from ZitiTunneler/Assets/Images/advanced.png rename to DesktopEdge/Assets/Images/advanced.png diff --git a/ZitiTunneler/Assets/Images/appicon.png b/DesktopEdge/Assets/Images/appicon.png similarity index 100% rename from ZitiTunneler/Assets/Images/appicon.png rename to DesktopEdge/Assets/Images/appicon.png diff --git a/ZitiTunneler/Assets/Images/back.png b/DesktopEdge/Assets/Images/back.png similarity index 100% rename from ZitiTunneler/Assets/Images/back.png rename to DesktopEdge/Assets/Images/back.png diff --git a/ZitiTunneler/Assets/Images/background.png b/DesktopEdge/Assets/Images/background.png similarity index 100% rename from ZitiTunneler/Assets/Images/background.png rename to DesktopEdge/Assets/Images/background.png diff --git a/ZitiTunneler/Assets/Images/bubble.png b/DesktopEdge/Assets/Images/bubble.png similarity index 100% rename from ZitiTunneler/Assets/Images/bubble.png rename to DesktopEdge/Assets/Images/bubble.png diff --git a/ZitiTunneler/Assets/Images/card.png b/DesktopEdge/Assets/Images/card.png similarity index 100% rename from ZitiTunneler/Assets/Images/card.png rename to DesktopEdge/Assets/Images/card.png diff --git a/ZitiTunneler/Assets/Images/close.png b/DesktopEdge/Assets/Images/close.png similarity index 100% rename from ZitiTunneler/Assets/Images/close.png rename to DesktopEdge/Assets/Images/close.png diff --git a/ZitiTunneler/Assets/Images/closer.png b/DesktopEdge/Assets/Images/closer.png similarity index 100% rename from ZitiTunneler/Assets/Images/closer.png rename to DesktopEdge/Assets/Images/closer.png diff --git a/ZitiTunneler/Assets/Images/connect.png b/DesktopEdge/Assets/Images/connect.png similarity index 100% rename from ZitiTunneler/Assets/Images/connect.png rename to DesktopEdge/Assets/Images/connect.png diff --git a/ZitiTunneler/Assets/Images/connected.png b/DesktopEdge/Assets/Images/connected.png similarity index 100% rename from ZitiTunneler/Assets/Images/connected.png rename to DesktopEdge/Assets/Images/connected.png diff --git a/ZitiTunneler/Assets/Images/dashboard.png b/DesktopEdge/Assets/Images/dashboard.png similarity index 100% rename from ZitiTunneler/Assets/Images/dashboard.png rename to DesktopEdge/Assets/Images/dashboard.png diff --git a/ZitiTunneler/Assets/Images/detach.png b/DesktopEdge/Assets/Images/detach.png similarity index 100% rename from ZitiTunneler/Assets/Images/detach.png rename to DesktopEdge/Assets/Images/detach.png diff --git a/ZitiTunneler/Assets/Images/down.png b/DesktopEdge/Assets/Images/down.png similarity index 100% rename from ZitiTunneler/Assets/Images/down.png rename to DesktopEdge/Assets/Images/down.png diff --git a/ZitiTunneler/Assets/Images/feedback.png b/DesktopEdge/Assets/Images/feedback.png similarity index 100% rename from ZitiTunneler/Assets/Images/feedback.png rename to DesktopEdge/Assets/Images/feedback.png diff --git a/ZitiTunneler/Assets/Images/globe.png b/DesktopEdge/Assets/Images/globe.png similarity index 100% rename from ZitiTunneler/Assets/Images/globe.png rename to DesktopEdge/Assets/Images/globe.png diff --git a/ZitiTunneler/Assets/Images/hamburger.png b/DesktopEdge/Assets/Images/hamburger.png similarity index 100% rename from ZitiTunneler/Assets/Images/hamburger.png rename to DesktopEdge/Assets/Images/hamburger.png diff --git a/ZitiTunneler/Assets/Images/header.png b/DesktopEdge/Assets/Images/header.png similarity index 100% rename from ZitiTunneler/Assets/Images/header.png rename to DesktopEdge/Assets/Images/header.png diff --git a/ZitiTunneler/Assets/Images/icon.ico b/DesktopEdge/Assets/Images/icon.ico similarity index 100% rename from ZitiTunneler/Assets/Images/icon.ico rename to DesktopEdge/Assets/Images/icon.ico diff --git a/ZitiTunneler/Assets/Images/icon.png b/DesktopEdge/Assets/Images/icon.png similarity index 100% rename from ZitiTunneler/Assets/Images/icon.png rename to DesktopEdge/Assets/Images/icon.png diff --git a/ZitiTunneler/Assets/Images/identity.png b/DesktopEdge/Assets/Images/identity.png similarity index 100% rename from ZitiTunneler/Assets/Images/identity.png rename to DesktopEdge/Assets/Images/identity.png diff --git a/ZitiTunneler/Assets/Images/jwt.png b/DesktopEdge/Assets/Images/jwt.png similarity index 100% rename from ZitiTunneler/Assets/Images/jwt.png rename to DesktopEdge/Assets/Images/jwt.png diff --git a/ZitiTunneler/Assets/Images/lastArrow.png b/DesktopEdge/Assets/Images/lastArrow.png similarity index 100% rename from ZitiTunneler/Assets/Images/lastArrow.png rename to DesktopEdge/Assets/Images/lastArrow.png diff --git a/ZitiTunneler/Assets/Images/loading.png b/DesktopEdge/Assets/Images/loading.png similarity index 100% rename from ZitiTunneler/Assets/Images/loading.png rename to DesktopEdge/Assets/Images/loading.png diff --git a/ZitiTunneler/Assets/Images/logo.png b/DesktopEdge/Assets/Images/logo.png similarity index 100% rename from ZitiTunneler/Assets/Images/logo.png rename to DesktopEdge/Assets/Images/logo.png diff --git a/ZitiTunneler/Assets/Images/logs.png b/DesktopEdge/Assets/Images/logs.png similarity index 100% rename from ZitiTunneler/Assets/Images/logs.png rename to DesktopEdge/Assets/Images/logs.png diff --git a/ZitiTunneler/Assets/Images/next.png b/DesktopEdge/Assets/Images/next.png similarity index 100% rename from ZitiTunneler/Assets/Images/next.png rename to DesktopEdge/Assets/Images/next.png diff --git a/ZitiTunneler/Assets/Images/nextArrow.png b/DesktopEdge/Assets/Images/nextArrow.png similarity index 100% rename from ZitiTunneler/Assets/Images/nextArrow.png rename to DesktopEdge/Assets/Images/nextArrow.png diff --git a/ZitiTunneler/Assets/Images/off.png b/DesktopEdge/Assets/Images/off.png similarity index 100% rename from ZitiTunneler/Assets/Images/off.png rename to DesktopEdge/Assets/Images/off.png diff --git a/ZitiTunneler/Assets/Images/offline.png b/DesktopEdge/Assets/Images/offline.png similarity index 100% rename from ZitiTunneler/Assets/Images/offline.png rename to DesktopEdge/Assets/Images/offline.png diff --git a/ZitiTunneler/Assets/Images/on.png b/DesktopEdge/Assets/Images/on.png similarity index 100% rename from ZitiTunneler/Assets/Images/on.png rename to DesktopEdge/Assets/Images/on.png diff --git a/ZitiTunneler/Assets/Images/online.png b/DesktopEdge/Assets/Images/online.png similarity index 100% rename from ZitiTunneler/Assets/Images/online.png rename to DesktopEdge/Assets/Images/online.png diff --git a/ZitiTunneler/Assets/Images/open.png b/DesktopEdge/Assets/Images/open.png similarity index 100% rename from ZitiTunneler/Assets/Images/open.png rename to DesktopEdge/Assets/Images/open.png diff --git a/ZitiTunneler/Assets/Images/privacy.png b/DesktopEdge/Assets/Images/privacy.png similarity index 100% rename from ZitiTunneler/Assets/Images/privacy.png rename to DesktopEdge/Assets/Images/privacy.png diff --git a/ZitiTunneler/Assets/Images/qr.png b/DesktopEdge/Assets/Images/qr.png similarity index 100% rename from ZitiTunneler/Assets/Images/qr.png rename to DesktopEdge/Assets/Images/qr.png diff --git a/ZitiTunneler/Assets/Images/select.png b/DesktopEdge/Assets/Images/select.png similarity index 100% rename from ZitiTunneler/Assets/Images/select.png rename to DesktopEdge/Assets/Images/select.png diff --git a/ZitiTunneler/Assets/Images/server.png b/DesktopEdge/Assets/Images/server.png similarity index 100% rename from ZitiTunneler/Assets/Images/server.png rename to DesktopEdge/Assets/Images/server.png diff --git a/ZitiTunneler/Assets/Images/support.png b/DesktopEdge/Assets/Images/support.png similarity index 100% rename from ZitiTunneler/Assets/Images/support.png rename to DesktopEdge/Assets/Images/support.png diff --git a/ZitiTunneler/Assets/Images/up.png b/DesktopEdge/Assets/Images/up.png similarity index 100% rename from ZitiTunneler/Assets/Images/up.png rename to DesktopEdge/Assets/Images/up.png diff --git a/ZitiTunneler/Assets/Images/wrench.png b/DesktopEdge/Assets/Images/wrench.png similarity index 100% rename from ZitiTunneler/Assets/Images/wrench.png rename to DesktopEdge/Assets/Images/wrench.png diff --git a/ZitiTunneler/Assets/Images/x.png b/DesktopEdge/Assets/Images/x.png similarity index 100% rename from ZitiTunneler/Assets/Images/x.png rename to DesktopEdge/Assets/Images/x.png diff --git a/ZitiTunneler/Assets/Images/z.png b/DesktopEdge/Assets/Images/z.png similarity index 100% rename from ZitiTunneler/Assets/Images/z.png rename to DesktopEdge/Assets/Images/z.png diff --git a/ZitiTunneler/Assets/Images/ziti-green.ico b/DesktopEdge/Assets/Images/ziti-green.ico similarity index 100% rename from ZitiTunneler/Assets/Images/ziti-green.ico rename to DesktopEdge/Assets/Images/ziti-green.ico diff --git a/ZitiTunneler/Assets/Images/ziti-red.ico b/DesktopEdge/Assets/Images/ziti-red.ico similarity index 100% rename from ZitiTunneler/Assets/Images/ziti-red.ico rename to DesktopEdge/Assets/Images/ziti-red.ico diff --git a/ZitiTunneler/Assets/Images/ziti-white.ico b/DesktopEdge/Assets/Images/ziti-white.ico similarity index 100% rename from ZitiTunneler/Assets/Images/ziti-white.ico rename to DesktopEdge/Assets/Images/ziti-white.ico diff --git a/ZitiTunneler/ControllerScreen.xaml b/DesktopEdge/ControllerScreen.xaml similarity index 100% rename from ZitiTunneler/ControllerScreen.xaml rename to DesktopEdge/ControllerScreen.xaml diff --git a/ZitiTunneler/ControllerScreen.xaml.cs b/DesktopEdge/ControllerScreen.xaml.cs similarity index 100% rename from ZitiTunneler/ControllerScreen.xaml.cs rename to DesktopEdge/ControllerScreen.xaml.cs diff --git a/ZitiTunneler/IdentityDetails.xaml b/DesktopEdge/IdentityDetails.xaml similarity index 100% rename from ZitiTunneler/IdentityDetails.xaml rename to DesktopEdge/IdentityDetails.xaml diff --git a/ZitiTunneler/IdentityDetails.xaml.cs b/DesktopEdge/IdentityDetails.xaml.cs similarity index 100% rename from ZitiTunneler/IdentityDetails.xaml.cs rename to DesktopEdge/IdentityDetails.xaml.cs diff --git a/ZitiTunneler/IdentityItem.xaml b/DesktopEdge/IdentityItem.xaml similarity index 100% rename from ZitiTunneler/IdentityItem.xaml rename to DesktopEdge/IdentityItem.xaml diff --git a/ZitiTunneler/IdentityItem.xaml.cs b/DesktopEdge/IdentityItem.xaml.cs similarity index 100% rename from ZitiTunneler/IdentityItem.xaml.cs rename to DesktopEdge/IdentityItem.xaml.cs diff --git a/ZitiTunneler/MainMenu.xaml b/DesktopEdge/MainMenu.xaml similarity index 96% rename from ZitiTunneler/MainMenu.xaml rename to DesktopEdge/MainMenu.xaml index e3c3779e..1c4c1677 100644 --- a/ZitiTunneler/MainMenu.xaml +++ b/DesktopEdge/MainMenu.xaml @@ -71,7 +71,7 @@ - + diff --git a/ZitiTunneler/MainMenu.xaml.cs b/DesktopEdge/MainMenu.xaml.cs similarity index 100% rename from ZitiTunneler/MainMenu.xaml.cs rename to DesktopEdge/MainMenu.xaml.cs diff --git a/ZitiTunneler/MainWindow.xaml b/DesktopEdge/MainWindow.xaml similarity index 99% rename from ZitiTunneler/MainWindow.xaml rename to DesktopEdge/MainWindow.xaml index 9ab38231..9120a866 100644 --- a/ZitiTunneler/MainWindow.xaml +++ b/DesktopEdge/MainWindow.xaml @@ -218,7 +218,7 @@