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 98% rename from ZitiTunneler/App.xaml rename to DesktopEdge/App.xaml index fa730afb..876e1d58 100644 --- a/ZitiTunneler/App.xaml +++ b/DesktopEdge/App.xaml @@ -1,7 +1,7 @@ - diff --git a/ZitiTunneler/App.xaml.cs b/DesktopEdge/App.xaml.cs similarity index 90% rename from ZitiTunneler/App.xaml.cs rename to DesktopEdge/App.xaml.cs index 2418dc42..d79bc3d8 100644 --- a/ZitiTunneler/App.xaml.cs +++ b/DesktopEdge/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/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 79% rename from ZitiTunneler/ControllerScreen.xaml rename to DesktopEdge/ControllerScreen.xaml index 0f6633a5..4d9eed8b 100644 --- a/ZitiTunneler/ControllerScreen.xaml +++ b/DesktopEdge/ControllerScreen.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/ControllerScreen.xaml.cs b/DesktopEdge/ControllerScreen.xaml.cs similarity index 95% rename from ZitiTunneler/ControllerScreen.xaml.cs rename to DesktopEdge/ControllerScreen.xaml.cs index 1d922775..f3d584d1 100644 --- a/ZitiTunneler/ControllerScreen.xaml.cs +++ b/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 { /// /// Interaction logic for ControllerScreen.xaml /// diff --git a/ZitiTunneler/IdentityDetails.xaml b/DesktopEdge/IdentityDetails.xaml similarity index 97% rename from ZitiTunneler/IdentityDetails.xaml rename to DesktopEdge/IdentityDetails.xaml index e7d0251b..027e222c 100644 --- a/ZitiTunneler/IdentityDetails.xaml +++ b/DesktopEdge/IdentityDetails.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/IdentityDetails.xaml.cs b/DesktopEdge/IdentityDetails.xaml.cs similarity index 98% rename from ZitiTunneler/IdentityDetails.xaml.cs rename to DesktopEdge/IdentityDetails.xaml.cs index 3c0bd255..5aea08d9 100644 --- a/ZitiTunneler/IdentityDetails.xaml.cs +++ b/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 { /// /// Interaction logic for IdentityDetails.xaml /// diff --git a/ZitiTunneler/IdentityItem.xaml b/DesktopEdge/IdentityItem.xaml similarity index 96% rename from ZitiTunneler/IdentityItem.xaml rename to DesktopEdge/IdentityItem.xaml index 7d0eda60..3fc3f4aa 100644 --- a/ZitiTunneler/IdentityItem.xaml +++ b/DesktopEdge/IdentityItem.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/IdentityItem.xaml.cs b/DesktopEdge/IdentityItem.xaml.cs similarity index 97% rename from ZitiTunneler/IdentityItem.xaml.cs rename to DesktopEdge/IdentityItem.xaml.cs index e1bcb844..a601218b 100644 --- a/ZitiTunneler/IdentityItem.xaml.cs +++ b/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 { /// /// User Control to list Identities and give status /// diff --git a/ZitiTunneler/MainMenu.xaml b/DesktopEdge/MainMenu.xaml similarity index 95% rename from ZitiTunneler/MainMenu.xaml rename to DesktopEdge/MainMenu.xaml index 4c36e7f5..1c4c1677 100644 --- a/ZitiTunneler/MainMenu.xaml +++ b/DesktopEdge/MainMenu.xaml @@ -1,9 +1,9 @@ - @@ -71,7 +71,7 @@ - + diff --git a/ZitiTunneler/MainMenu.xaml.cs b/DesktopEdge/MainMenu.xaml.cs similarity index 99% rename from ZitiTunneler/MainMenu.xaml.cs rename to DesktopEdge/MainMenu.xaml.cs index 3b3c43a4..4852156f 100644 --- a/ZitiTunneler/MainMenu.xaml.cs +++ b/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 { /// /// Interaction logic for MainMenu.xaml diff --git a/ZitiTunneler/MainWindow.xaml b/DesktopEdge/MainWindow.xaml similarity index 98% rename from ZitiTunneler/MainWindow.xaml rename to DesktopEdge/MainWindow.xaml index a66c230b..d1c0d86a 100644 --- a/ZitiTunneler/MainWindow.xaml +++ b/DesktopEdge/MainWindow.xaml @@ -1,9 +1,9 @@ - -namespace ZitiTunneler.ServiceClient +namespace ZitiDesktopEdge.ServiceClient { class SvcResponse { diff --git a/ZitiTunneler/ServiceInfo.xaml b/DesktopEdge/ServiceInfo.xaml similarity index 92% rename from ZitiTunneler/ServiceInfo.xaml rename to DesktopEdge/ServiceInfo.xaml index 24fe242d..91e678bd 100644 --- a/ZitiTunneler/ServiceInfo.xaml +++ b/DesktopEdge/ServiceInfo.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/ServiceInfo.xaml.cs b/DesktopEdge/ServiceInfo.xaml.cs similarity index 97% rename from ZitiTunneler/ServiceInfo.xaml.cs rename to DesktopEdge/ServiceInfo.xaml.cs index 6653045e..dea597fb 100644 --- a/ZitiTunneler/ServiceInfo.xaml.cs +++ b/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 { /// /// Interaction logic for MenuItem.xaml /// diff --git a/ZitiTunneler/SubMenuItem.xaml b/DesktopEdge/SubMenuItem.xaml similarity index 96% rename from ZitiTunneler/SubMenuItem.xaml rename to DesktopEdge/SubMenuItem.xaml index 7147afe6..54028384 100644 --- a/ZitiTunneler/SubMenuItem.xaml +++ b/DesktopEdge/SubMenuItem.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/SubMenuItem.xaml.cs b/DesktopEdge/SubMenuItem.xaml.cs similarity index 96% rename from ZitiTunneler/SubMenuItem.xaml.cs rename to DesktopEdge/SubMenuItem.xaml.cs index c06bebd4..5c9de79e 100644 --- a/ZitiTunneler/SubMenuItem.xaml.cs +++ b/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 { /// /// Interaction logic for MenuItem.xaml /// diff --git a/ZitiTunneler/Themes/Generic.xaml b/DesktopEdge/Themes/Generic.xaml similarity index 77% rename from ZitiTunneler/Themes/Generic.xaml rename to DesktopEdge/Themes/Generic.xaml index 253d4f7d..cd5d962e 100644 --- a/ZitiTunneler/Themes/Generic.xaml +++ b/DesktopEdge/Themes/Generic.xaml @@ -1,6 +1,6 @@ + xmlns:local="clr-namespace:ZitiDesktopEdge"> diff --git a/ZitiTunneler/Toggler.resx b/DesktopEdge/Toggler.resx similarity index 100% rename from ZitiTunneler/Toggler.resx rename to DesktopEdge/Toggler.resx diff --git a/ZitiTunneler/Toggler.xaml b/DesktopEdge/Toggler.xaml similarity index 94% rename from ZitiTunneler/Toggler.xaml rename to DesktopEdge/Toggler.xaml index 06bc1188..f017c716 100644 --- a/ZitiTunneler/Toggler.xaml +++ b/DesktopEdge/Toggler.xaml @@ -1,9 +1,9 @@ - diff --git a/ZitiTunneler/Toggler.xaml.cs b/DesktopEdge/Toggler.xaml.cs similarity index 98% rename from ZitiTunneler/Toggler.xaml.cs rename to DesktopEdge/Toggler.xaml.cs index 4f9d416a..db532134 100644 --- a/ZitiTunneler/Toggler.xaml.cs +++ b/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 { /// /// Interaction logic for Toggler.xaml /// diff --git a/DesktopEdge/ZitiDekstopEdge.csproj b/DesktopEdge/ZitiDekstopEdge.csproj new file mode 100644 index 00000000..9e1ca425 --- /dev/null +++ b/DesktopEdge/ZitiDekstopEdge.csproj @@ -0,0 +1,353 @@ + + + + + Debug + AnyCPU + {FA4291EA-A97E-4854-959F-91EE7B330B37} + WinExe +<<<<<<< HEAD:DesktopEdge/ZitiDesktopEdge.csproj + Ziti + Ziti Desktop Edge +======= + Ziti.Desktop.Edge + ZitiDesktopEdge +>>>>>>> origin/master:DesktopEdge/ZitiDekstopEdge.csproj + v4.8 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + true + + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + https://support.netfoundry.io + en-US + Ziti Desktop Edge + NetFoundry + Ziti + true + 0 + 1.0.0.%2a + false + true + true + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + x64 + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + app.manifest + + + 189AAD422A106DC81E8E79C7E0D2118CEB2E6321 + + + + + + + true + + + true + + + LocalIntranet + + + bin\Releases\ + + + ziti.ico + + + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + + + + + + + + ..\packages\System.Management.Automation.dll.10.0.10586.0\lib\net40\System.Management.Automation.dll + + + + + ..\packages\System.Net.NetworkInformation.4.3.0\lib\net46\System.Net.NetworkInformation.dll + True + True + + + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + ControllerScreen.xaml + + + IdentityDetails.xaml + + + MainMenu.xaml + + + + + ServiceInfo.xaml + + + MenuEditItem.xaml + + + + + RegistrationScreen.xaml + + + SubMenuItem.xaml + + + MenuItem.xaml + + + + + Toggler.xaml + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + IdentityItem.xaml + + + MainWindow.xaml + Code + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + Always + + + Always + + + .editorconfig + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + + + + False + Microsoft .NET Framework 4.8 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + + + + + + + + + \ No newline at end of file diff --git a/ZitiTunneler/ZitiDesktopEdge.csproj b/DesktopEdge/ZitiDesktopEdge.csproj similarity index 97% rename from ZitiTunneler/ZitiDesktopEdge.csproj rename to DesktopEdge/ZitiDesktopEdge.csproj index d1b53374..9e1ca425 100644 --- a/ZitiTunneler/ZitiDesktopEdge.csproj +++ b/DesktopEdge/ZitiDesktopEdge.csproj @@ -6,8 +6,13 @@ AnyCPU {FA4291EA-A97E-4854-959F-91EE7B330B37} WinExe +<<<<<<< HEAD:DesktopEdge/ZitiDesktopEdge.csproj Ziti Ziti Desktop Edge +======= + Ziti.Desktop.Edge + ZitiDesktopEdge +>>>>>>> origin/master:DesktopEdge/ZitiDekstopEdge.csproj v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -28,7 +33,7 @@ true https://support.netfoundry.io en-US - Ziti Tunneler + Ziti Desktop Edge NetFoundry Ziti true @@ -235,7 +240,7 @@ Resources.Designer.cs - + Always diff --git a/ZitiTunneler/app.manifest b/DesktopEdge/app.manifest similarity index 100% rename from ZitiTunneler/app.manifest rename to DesktopEdge/app.manifest diff --git a/ZitiTunneler/packages.config b/DesktopEdge/packages.config similarity index 100% rename from ZitiTunneler/packages.config rename to DesktopEdge/packages.config diff --git a/ZitiTunneler/ziti.ico b/DesktopEdge/ziti.ico similarity index 100% rename from ZitiTunneler/ziti.ico rename to DesktopEdge/ziti.ico 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. diff --git a/ZitiUWPSolution.sln b/ZitiDesktopEdge.sln similarity index 98% rename from ZitiUWPSolution.sln rename to ZitiDesktopEdge.sln index 73f38580..75d0fe9a 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}") = "ZitiDesktopEdge", "ZitiTunneler\ZitiDesktopEdge.csproj", "{FA4291EA-A97E-4854-959F-91EE7B330B37}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiDesktopEdge", "DesktopEdge\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/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