merge master with all the updates in

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

DesktopEdge/MainWindow.xaml

@@ -1,9 +1,9 @@
-<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"
@@ -218,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

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,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Ziti.Properties {
+namespace Ziti.Desktop.Edge.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace Ziti.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ziti.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;

DesktopEdge/Properties/Settings.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Ziti.Properties {
+namespace Ziti.Desktop.Edge.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

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/ZitiDekstopEdge.csproj

@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{FA4291EA-A97E-4854-959F-91EE7B330B37}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+<<<<<<< HEAD:DesktopEdge/ZitiDesktopEdge.csproj
+    <RootNamespace>Ziti</RootNamespace>
+    <AssemblyName>Ziti Desktop Edge</AssemblyName>
+=======
+    <RootNamespace>Ziti.Desktop.Edge</RootNamespace>
+    <AssemblyName>ZitiDesktopEdge</AssemblyName>
+>>>>>>> origin/master:DesktopEdge/ZitiDekstopEdge.csproj
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <SupportUrl>https://support.netfoundry.io</SupportUrl>
+    <TargetCulture>en-US</TargetCulture>
+    <ProductName>Ziti Desktop Edge</ProductName>
+    <PublisherName>NetFoundry</PublisherName>
+    <SuiteName>Ziti</SuiteName>
+    <AutorunEnabled>true</AutorunEnabled>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <CreateDesktopShortcut>true</CreateDesktopShortcut>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>x64</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>189AAD422A106DC81E8E79C7E0D2118CEB2E6321</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>
+    </ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Releases|AnyCPU'">
+    <OutputPath>bin\Releases\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>ziti.ico</ApplicationIcon>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Management.Automation.dll.10.0.10586.0\lib\net40\System.Management.Automation.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Management.Instrumentation" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.NetworkInformation, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.NetworkInformation.4.3.0\lib\net46\System.Net.NetworkInformation.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="ControllerScreen.xaml.cs">
+      <DependentUpon>ControllerScreen.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="IdentityDetails.xaml.cs">
+      <DependentUpon>IdentityDetails.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainMenu.xaml.cs">
+      <DependentUpon>MainMenu.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Models\UILog.cs" />
+    <Compile Include="Models\UIModel.cs" />
+    <Compile Include="ServiceInfo.xaml.cs">
+      <DependentUpon>ServiceInfo.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MenuEditItem.xaml.cs">
+      <DependentUpon>MenuEditItem.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ServiceClient\DataStructures.cs" />
+    <Compile Include="ServiceClient\ClientImpl.cs" />
+    <Compile Include="RegistrationScreen.xaml.cs">
+      <DependentUpon>RegistrationScreen.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="SubMenuItem.xaml.cs">
+      <DependentUpon>SubMenuItem.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MenuItem.xaml.cs">
+      <DependentUpon>MenuItem.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Models\ZitiIdentity.cs" />
+    <Compile Include="Models\ZitiService.cs" />
+    <Compile Include="Toggler.xaml.cs">
+      <DependentUpon>Toggler.xaml</DependentUpon>
+    </Compile>
+    <Page Include="ControllerScreen.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="IdentityDetails.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="IdentityItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainMenu.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="IdentityItem.xaml.cs">
+      <DependentUpon>IdentityItem.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Page Include="ServiceInfo.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="MenuEditItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="RegistrationScreen.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SubMenuItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="MenuItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Generic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Toggler.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="app.manifest" />
+    <None Include="ZitiDesktopEdge_TemporaryKey.pfx" />
+    <Resource Include="Assets\Fonts\open_sans.ttf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\Fonts\russo_one.ttf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <None Include="..\.editorconfig">
+      <Link>.editorconfig</Link>
+    </None>
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\icon.ico" />
+    <Resource Include="Assets\Images\icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\identity.png" />
+    <Resource Include="Assets\Images\jwt.png" />
+    <Resource Include="Assets\Images\loading.png" />
+    <Resource Include="Assets\Images\logo.png" />
+    <Resource Include="Assets\Images\next.png" />
+    <Resource Include="Assets\Images\off.png" />
+    <Resource Include="Assets\Images\offline.png" />
+    <Resource Include="Assets\Images\on.png" />
+    <Resource Include="Assets\Images\online.png" />
+    <Resource Include="Assets\Images\open.png" />
+    <Resource Include="Assets\Images\privacy.png" />
+    <Resource Include="Assets\Images\qr.png" />
+    <Resource Include="Assets\Images\select.png" />
+    <Resource Include="Assets\Images\support.png" />
+    <Resource Include="Assets\Images\up.png" />
+    <Resource Include="Assets\Images\z.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\about.png" />
+    <Resource Include="Assets\Images\advanced.png" />
+    <Resource Include="Assets\Images\appicon.png" />
+    <Resource Include="Assets\Images\back.png" />
+    <Resource Include="Assets\Images\background.png" />
+    <Resource Include="Assets\Images\bubble.png" />
+    <Resource Include="Assets\Images\card.png" />
+    <Resource Include="Assets\Images\close.png" />
+    <Resource Include="Assets\Images\closer.png" />
+    <Resource Include="Assets\Images\connect.png" />
+    <Resource Include="Assets\Images\connected.png" />
+    <Resource Include="Assets\Images\dashboard.png" />
+    <Resource Include="Assets\Images\down.png" />
+    <Resource Include="Assets\Images\feedback.png" />
+    <Resource Include="Assets\Images\globe.png" />
+    <Resource Include="Assets\Images\hamburger.png" />
+    <Resource Include="Assets\Images\header.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\nextArrow.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\lastArrow.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\logs.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\wrench.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\detach.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\ziti-green.ico" />
+    <Resource Include="Assets\Images\Ziti-Green.png" />
+    <Resource Include="Assets\Images\ziti-red.ico" />
+    <Resource Include="Assets\Images\Ziti-Red.png" />
+    <Resource Include="Assets\Images\ziti-white.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\Images\Ziti-White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.8 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="ziti.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Assets\Images\server.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Views\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

DesktopEdge/ZitiDesktopEdge.csproj

@@ -6,8 +6,13 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{FA4291EA-A97E-4854-959F-91EE7B330B37}</ProjectGuid>
     <OutputType>WinExe</OutputType>
+<<<<<<< HEAD:DesktopEdge/ZitiDesktopEdge.csproj
     <RootNamespace>Ziti</RootNamespace>
     <AssemblyName>Ziti Desktop Edge</AssemblyName>
+=======
+    <RootNamespace>Ziti.Desktop.Edge</RootNamespace>
+    <AssemblyName>ZitiDesktopEdge</AssemblyName>
+>>>>>>> origin/master:DesktopEdge/ZitiDekstopEdge.csproj
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -28,7 +33,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 +240,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}") = "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

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>