diff --git a/ZitiInstaller/Images/LargeTile.scale-100.png b/ZitiInstaller/Images/LargeTile.scale-100.png new file mode 100644 index 00000000..3bb18908 Binary files /dev/null and b/ZitiInstaller/Images/LargeTile.scale-100.png differ diff --git a/ZitiInstaller/Images/LargeTile.scale-125.png b/ZitiInstaller/Images/LargeTile.scale-125.png new file mode 100644 index 00000000..1548fd09 Binary files /dev/null and b/ZitiInstaller/Images/LargeTile.scale-125.png differ diff --git a/ZitiInstaller/Images/LargeTile.scale-150.png b/ZitiInstaller/Images/LargeTile.scale-150.png new file mode 100644 index 00000000..16fa1f86 Binary files /dev/null and b/ZitiInstaller/Images/LargeTile.scale-150.png differ diff --git a/ZitiInstaller/Images/LargeTile.scale-200.png b/ZitiInstaller/Images/LargeTile.scale-200.png new file mode 100644 index 00000000..bf4e442d Binary files /dev/null and b/ZitiInstaller/Images/LargeTile.scale-200.png differ diff --git a/ZitiInstaller/Images/LargeTile.scale-400.png b/ZitiInstaller/Images/LargeTile.scale-400.png new file mode 100644 index 00000000..96021a8b Binary files /dev/null and b/ZitiInstaller/Images/LargeTile.scale-400.png differ diff --git a/ZitiTunnelerSetup/Images/LockScreenLogo.scale-200.png b/ZitiInstaller/Images/LockScreenLogo.scale-200.png similarity index 100% rename from ZitiTunnelerSetup/Images/LockScreenLogo.scale-200.png rename to ZitiInstaller/Images/LockScreenLogo.scale-200.png diff --git a/ZitiInstaller/Images/SmallTile.scale-100.png b/ZitiInstaller/Images/SmallTile.scale-100.png new file mode 100644 index 00000000..4b58032e Binary files /dev/null and b/ZitiInstaller/Images/SmallTile.scale-100.png differ diff --git a/ZitiInstaller/Images/SmallTile.scale-125.png b/ZitiInstaller/Images/SmallTile.scale-125.png new file mode 100644 index 00000000..d4a95922 Binary files /dev/null and b/ZitiInstaller/Images/SmallTile.scale-125.png differ diff --git a/ZitiInstaller/Images/SmallTile.scale-150.png b/ZitiInstaller/Images/SmallTile.scale-150.png new file mode 100644 index 00000000..0d3d10d4 Binary files /dev/null and b/ZitiInstaller/Images/SmallTile.scale-150.png differ diff --git a/ZitiInstaller/Images/SmallTile.scale-200.png b/ZitiInstaller/Images/SmallTile.scale-200.png new file mode 100644 index 00000000..1851b120 Binary files /dev/null and b/ZitiInstaller/Images/SmallTile.scale-200.png differ diff --git a/ZitiInstaller/Images/SmallTile.scale-400.png b/ZitiInstaller/Images/SmallTile.scale-400.png new file mode 100644 index 00000000..72bcecb4 Binary files /dev/null and b/ZitiInstaller/Images/SmallTile.scale-400.png differ diff --git a/ZitiInstaller/Images/SplashScreen.scale-100.png b/ZitiInstaller/Images/SplashScreen.scale-100.png new file mode 100644 index 00000000..632487c9 Binary files /dev/null and b/ZitiInstaller/Images/SplashScreen.scale-100.png differ diff --git a/ZitiInstaller/Images/SplashScreen.scale-125.png b/ZitiInstaller/Images/SplashScreen.scale-125.png new file mode 100644 index 00000000..fc43d803 Binary files /dev/null and b/ZitiInstaller/Images/SplashScreen.scale-125.png differ diff --git a/ZitiInstaller/Images/SplashScreen.scale-150.png b/ZitiInstaller/Images/SplashScreen.scale-150.png new file mode 100644 index 00000000..62878fab Binary files /dev/null and b/ZitiInstaller/Images/SplashScreen.scale-150.png differ diff --git a/ZitiInstaller/Images/SplashScreen.scale-200.png b/ZitiInstaller/Images/SplashScreen.scale-200.png new file mode 100644 index 00000000..ab90b35e Binary files /dev/null and b/ZitiInstaller/Images/SplashScreen.scale-200.png differ diff --git a/ZitiInstaller/Images/SplashScreen.scale-400.png b/ZitiInstaller/Images/SplashScreen.scale-400.png new file mode 100644 index 00000000..d12e9f9e Binary files /dev/null and b/ZitiInstaller/Images/SplashScreen.scale-400.png differ diff --git a/ZitiInstaller/Images/Square150x150Logo.scale-100.png b/ZitiInstaller/Images/Square150x150Logo.scale-100.png new file mode 100644 index 00000000..b748527a Binary files /dev/null and b/ZitiInstaller/Images/Square150x150Logo.scale-100.png differ diff --git a/ZitiInstaller/Images/Square150x150Logo.scale-125.png b/ZitiInstaller/Images/Square150x150Logo.scale-125.png new file mode 100644 index 00000000..8c426aa3 Binary files /dev/null and b/ZitiInstaller/Images/Square150x150Logo.scale-125.png differ diff --git a/ZitiInstaller/Images/Square150x150Logo.scale-150.png b/ZitiInstaller/Images/Square150x150Logo.scale-150.png new file mode 100644 index 00000000..2cbec5a3 Binary files /dev/null and b/ZitiInstaller/Images/Square150x150Logo.scale-150.png differ diff --git a/ZitiInstaller/Images/Square150x150Logo.scale-200.png b/ZitiInstaller/Images/Square150x150Logo.scale-200.png new file mode 100644 index 00000000..053afb4e Binary files /dev/null and b/ZitiInstaller/Images/Square150x150Logo.scale-200.png differ diff --git a/ZitiInstaller/Images/Square150x150Logo.scale-400.png b/ZitiInstaller/Images/Square150x150Logo.scale-400.png new file mode 100644 index 00000000..c044500d Binary files /dev/null and b/ZitiInstaller/Images/Square150x150Logo.scale-400.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png b/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png new file mode 100644 index 00000000..919a844c Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png b/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png new file mode 100644 index 00000000..367c341c Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png b/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png new file mode 100644 index 00000000..a7822841 Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png b/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png new file mode 100644 index 00000000..b510f707 Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png b/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png new file mode 100644 index 00000000..9a4e35f4 Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/ZitiInstaller/Images/Square44x44Logo.altform-unplated_targetsize-16.png new file mode 100644 index 00000000..84e33fb4 Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.altform-unplated_targetsize-16.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/ZitiInstaller/Images/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 00000000..410d39c4 Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/ZitiInstaller/Images/Square44x44Logo.altform-unplated_targetsize-32.png new file mode 100644 index 00000000..3f866c9a Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.altform-unplated_targetsize-32.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/ZitiInstaller/Images/Square44x44Logo.altform-unplated_targetsize-48.png new file mode 100644 index 00000000..c6e2738a Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.altform-unplated_targetsize-48.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.scale-100.png b/ZitiInstaller/Images/Square44x44Logo.scale-100.png new file mode 100644 index 00000000..032442d8 Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.scale-100.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.scale-125.png b/ZitiInstaller/Images/Square44x44Logo.scale-125.png new file mode 100644 index 00000000..d9d21c7c Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.scale-125.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.scale-150.png b/ZitiInstaller/Images/Square44x44Logo.scale-150.png new file mode 100644 index 00000000..14aedd0e Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.scale-150.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.scale-200.png b/ZitiInstaller/Images/Square44x44Logo.scale-200.png new file mode 100644 index 00000000..2397fc31 Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.scale-200.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.scale-400.png b/ZitiInstaller/Images/Square44x44Logo.scale-400.png new file mode 100644 index 00000000..ac0a1da6 Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.scale-400.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.targetsize-16.png b/ZitiInstaller/Images/Square44x44Logo.targetsize-16.png new file mode 100644 index 00000000..88307b53 Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.targetsize-16.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.targetsize-24.png b/ZitiInstaller/Images/Square44x44Logo.targetsize-24.png new file mode 100644 index 00000000..133ad1fa Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.targetsize-24.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/ZitiInstaller/Images/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 00000000..fe9784d1 Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.targetsize-256.png b/ZitiInstaller/Images/Square44x44Logo.targetsize-256.png new file mode 100644 index 00000000..39a8d6d5 Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.targetsize-256.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.targetsize-32.png b/ZitiInstaller/Images/Square44x44Logo.targetsize-32.png new file mode 100644 index 00000000..68c0d067 Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.targetsize-32.png differ diff --git a/ZitiInstaller/Images/Square44x44Logo.targetsize-48.png b/ZitiInstaller/Images/Square44x44Logo.targetsize-48.png new file mode 100644 index 00000000..8cfd8238 Binary files /dev/null and b/ZitiInstaller/Images/Square44x44Logo.targetsize-48.png differ diff --git a/ZitiTunnelerSetup/Images/StoreLogo.backup.png b/ZitiInstaller/Images/StoreLogo.backup.png similarity index 100% rename from ZitiTunnelerSetup/Images/StoreLogo.backup.png rename to ZitiInstaller/Images/StoreLogo.backup.png diff --git a/ZitiInstaller/Images/StoreLogo.scale-100.png b/ZitiInstaller/Images/StoreLogo.scale-100.png new file mode 100644 index 00000000..49a680b3 Binary files /dev/null and b/ZitiInstaller/Images/StoreLogo.scale-100.png differ diff --git a/ZitiInstaller/Images/StoreLogo.scale-125.png b/ZitiInstaller/Images/StoreLogo.scale-125.png new file mode 100644 index 00000000..64e78a93 Binary files /dev/null and b/ZitiInstaller/Images/StoreLogo.scale-125.png differ diff --git a/ZitiInstaller/Images/StoreLogo.scale-150.png b/ZitiInstaller/Images/StoreLogo.scale-150.png new file mode 100644 index 00000000..71ecb358 Binary files /dev/null and b/ZitiInstaller/Images/StoreLogo.scale-150.png differ diff --git a/ZitiInstaller/Images/StoreLogo.scale-200.png b/ZitiInstaller/Images/StoreLogo.scale-200.png new file mode 100644 index 00000000..18554866 Binary files /dev/null and b/ZitiInstaller/Images/StoreLogo.scale-200.png differ diff --git a/ZitiInstaller/Images/StoreLogo.scale-400.png b/ZitiInstaller/Images/StoreLogo.scale-400.png new file mode 100644 index 00000000..8cbd543c Binary files /dev/null and b/ZitiInstaller/Images/StoreLogo.scale-400.png differ diff --git a/ZitiInstaller/Images/Wide310x150Logo.scale-100.png b/ZitiInstaller/Images/Wide310x150Logo.scale-100.png new file mode 100644 index 00000000..d4d44ba7 Binary files /dev/null and b/ZitiInstaller/Images/Wide310x150Logo.scale-100.png differ diff --git a/ZitiInstaller/Images/Wide310x150Logo.scale-125.png b/ZitiInstaller/Images/Wide310x150Logo.scale-125.png new file mode 100644 index 00000000..761555f7 Binary files /dev/null and b/ZitiInstaller/Images/Wide310x150Logo.scale-125.png differ diff --git a/ZitiInstaller/Images/Wide310x150Logo.scale-150.png b/ZitiInstaller/Images/Wide310x150Logo.scale-150.png new file mode 100644 index 00000000..4bd37bee Binary files /dev/null and b/ZitiInstaller/Images/Wide310x150Logo.scale-150.png differ diff --git a/ZitiInstaller/Images/Wide310x150Logo.scale-200.png b/ZitiInstaller/Images/Wide310x150Logo.scale-200.png new file mode 100644 index 00000000..632487c9 Binary files /dev/null and b/ZitiInstaller/Images/Wide310x150Logo.scale-200.png differ diff --git a/ZitiInstaller/Images/Wide310x150Logo.scale-400.png b/ZitiInstaller/Images/Wide310x150Logo.scale-400.png new file mode 100644 index 00000000..ab90b35e Binary files /dev/null and b/ZitiInstaller/Images/Wide310x150Logo.scale-400.png differ diff --git a/ZitiInstaller/Package.appxmanifest b/ZitiInstaller/Package.appxmanifest new file mode 100644 index 00000000..274a1d53 --- /dev/null +++ b/ZitiInstaller/Package.appxmanifest @@ -0,0 +1,59 @@ + + + + + + + + Ziti Tunnel + NetFoundry, Inc + Images\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ZitiTunnelerSetup/ZitiTunnelerSetup.wapproj b/ZitiInstaller/ZitiInstaller.wapproj similarity index 60% rename from ZitiTunnelerSetup/ZitiTunnelerSetup.wapproj rename to ZitiInstaller/ZitiInstaller.wapproj index 4b661f41..ff8c8d26 100644 --- a/ZitiTunnelerSetup/ZitiTunnelerSetup.wapproj +++ b/ZitiInstaller/ZitiInstaller.wapproj @@ -20,6 +20,22 @@ Release x64 + + Debug + ARM + + + Release + ARM + + + Debug + ARM64 + + + Release + ARM64 + Debug AnyCPU @@ -34,32 +50,61 @@ - 7b36fb31-5662-4f87-a376-bce564533d58 - 10.0.17763.0 - 10.0.15063.0 + 520e523a-1e9b-4983-aba9-0eb3b27b6420 + 10.0.18362.0 + 10.0.17763.0 en-US - ZitiTunnelerSetup_TemporaryKey.pfx + True ..\ZitiTunneler\ZitiTunneler.csproj - 189AAD422A106DC81E8E79C7E0D2118CEB2E6321 + CE5A5576F865C9F01B29E3B813E1522B2D62993D + False + SHA256 + True + True + neutral + 0 + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always Designer - - - - - - - @@ -69,12 +114,18 @@ + + + + + + @@ -100,6 +151,8 @@ + + diff --git a/ZitiTunneler/Assets/Images/server.png b/ZitiTunneler/Assets/Images/server.png new file mode 100644 index 00000000..abd54bd4 Binary files /dev/null and b/ZitiTunneler/Assets/Images/server.png differ diff --git a/ZitiTunneler/IdentityDetails.xaml b/ZitiTunneler/IdentityDetails.xaml index 532e9448..1f6f37a3 100644 --- a/ZitiTunneler/IdentityDetails.xaml +++ b/ZitiTunneler/IdentityDetails.xaml @@ -29,7 +29,9 @@ - + diff --git a/ZitiTunneler/IdentityItem.xaml b/ZitiTunneler/IdentityItem.xaml index f07ec75a..2ac768eb 100644 --- a/ZitiTunneler/IdentityItem.xaml +++ b/ZitiTunneler/IdentityItem.xaml @@ -26,8 +26,12 @@ - - + + diff --git a/ZitiTunneler/MainMenu.xaml b/ZitiTunneler/MainMenu.xaml index 7d551f98..73fa16c2 100644 --- a/ZitiTunneler/MainMenu.xaml +++ b/ZitiTunneler/MainMenu.xaml @@ -60,6 +60,7 @@ + @@ -81,7 +82,6 @@ - diff --git a/ZitiTunneler/MainMenu.xaml.cs b/ZitiTunneler/MainMenu.xaml.cs index 29a2ba5b..d4b04480 100644 --- a/ZitiTunneler/MainMenu.xaml.cs +++ b/ZitiTunneler/MainMenu.xaml.cs @@ -2,6 +2,9 @@ using System.Windows.Controls; using System.Windows.Input; using System.Diagnostics; +using System; +using System.Threading; +using System.Management.Automation; namespace ZitiTunneler { @@ -62,7 +65,6 @@ namespace ZitiTunneler AdvancedItems.Visibility = Visibility.Collapsed; LicensesItems.Visibility = Visibility.Collapsed; LogsItems.Visibility = Visibility.Collapsed; - ConfigSaveButton.Visibility = Visibility.Collapsed; ConfigItems.Visibility = Visibility.Collapsed; if (menuState=="About") { @@ -87,7 +89,6 @@ namespace ZitiTunneler } else if (menuState=="Config") { MenuTitle.Content = "Tunnel Configuration"; ConfigItems.Visibility = Visibility.Visible; - ConfigSaveButton.Visibility = Visibility.Visible; BackArrow.Visibility = Visibility.Visible; ConfigIp.Value = Application.Current.Properties["ip"]?.ToString(); @@ -123,6 +124,23 @@ namespace ZitiTunneler private void ShowSupport(object sender, MouseButtonEventArgs e) { Process.Start(new ProcessStartInfo("https://support.netfoundry.io") { UseShellExecute = true }); } + + private void RunScript(string scriptText) { + using (PowerShell PowerShellInstance = PowerShell.Create()) { + PowerShellInstance.AddScript(scriptText); + IAsyncResult result = PowerShellInstance.BeginInvoke(); + while (result.IsCompleted==false) { + Console.WriteLine("Waiting for pipeline to finish..."); + Thread.Sleep(1000); + } + System.Windows.MessageBox.Show("Network Reset"); + } + } + + private void ResetNetwork(object sender, MouseButtonEventArgs e) { + RunScript("get-netipinterface|ForEach-Object { Set-DnsClientServerAddress-InterfaceIndex $_.ifIndex-ResetServerAddresses}"); + } + private void DetachWindow(object sender, MouseButtonEventArgs e) { Application.Current.MainWindow.ShowInTaskbar = true; DetachButton.Visibility = Visibility.Collapsed; @@ -141,9 +159,5 @@ namespace ZitiTunneler OnAttachmentChange(true); } } - - private void SaveConfig(object sender, RoutedEventArgs e) { - // Jeremy - this can just be removed - saving the config is not important to this client - } } } diff --git a/ZitiTunneler/MainWindow.xaml b/ZitiTunneler/MainWindow.xaml index 7a992a2c..6ee3622e 100644 --- a/ZitiTunneler/MainWindow.xaml +++ b/ZitiTunneler/MainWindow.xaml @@ -158,10 +158,38 @@ + diff --git a/ZitiTunneler/Themes/Generic.xaml b/ZitiTunneler/Themes/Generic.xaml index 7fa9002c..253d4f7d 100644 --- a/ZitiTunneler/Themes/Generic.xaml +++ b/ZitiTunneler/Themes/Generic.xaml @@ -3,6 +3,4 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:ZitiTunneler"> - - diff --git a/ZitiTunneler/ZitiTunneler.csproj b/ZitiTunneler/ZitiTunneler.csproj index 1e5a3b2a..cae95ba7 100644 --- a/ZitiTunneler/ZitiTunneler.csproj +++ b/ZitiTunneler/ZitiTunneler.csproj @@ -15,6 +15,29 @@ true true + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + https://support.netfoundry.io + en-US + Ziti Tunneler + NetFoundry + Ziti + true + 0 + 1.0.0.%2a + false + true + true + true AnyCPU @@ -38,6 +61,22 @@ app.manifest + + 189AAD422A106DC81E8E79C7E0D2118CEB2E6321 + + + + + + + false + + + true + + + LocalIntranet + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -45,6 +84,19 @@ + + + + + ..\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 + @@ -175,6 +227,7 @@ Resources.Designer.cs + Always @@ -260,5 +313,28 @@ + + + False + Microsoft .NET Framework 4.8 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + False + Ziti Identity + Ziti + Assets\Images\ziti-white.ico + + + + + \ No newline at end of file diff --git a/ZitiTunneler/app.manifest b/ZitiTunneler/app.manifest index 836edf9d..7937c16b 100644 --- a/ZitiTunneler/app.manifest +++ b/ZitiTunneler/app.manifest @@ -1,6 +1,6 @@  - + @@ -16,35 +16,32 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - + + + + + + - - - - - - - - - - - + \ No newline at end of file diff --git a/ZitiTunneler/packages.config b/ZitiTunneler/packages.config index 281c1455..d4d1038f 100644 --- a/ZitiTunneler/packages.config +++ b/ZitiTunneler/packages.config @@ -1,4 +1,6 @@  + + \ No newline at end of file diff --git a/ZitiTunnelerSetup/Images/BadgeLogo.scale-100.png b/ZitiTunnelerSetup/Images/BadgeLogo.scale-100.png deleted file mode 100644 index cb3921d7..00000000 Binary files a/ZitiTunnelerSetup/Images/BadgeLogo.scale-100.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/BadgeLogo.scale-125.png b/ZitiTunnelerSetup/Images/BadgeLogo.scale-125.png deleted file mode 100644 index f1324ebc..00000000 Binary files a/ZitiTunnelerSetup/Images/BadgeLogo.scale-125.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/BadgeLogo.scale-150.png b/ZitiTunnelerSetup/Images/BadgeLogo.scale-150.png deleted file mode 100644 index 1e4a3cf3..00000000 Binary files a/ZitiTunnelerSetup/Images/BadgeLogo.scale-150.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/BadgeLogo.scale-200.png b/ZitiTunnelerSetup/Images/BadgeLogo.scale-200.png deleted file mode 100644 index 9c267541..00000000 Binary files a/ZitiTunnelerSetup/Images/BadgeLogo.scale-200.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/BadgeLogo.scale-400.png b/ZitiTunnelerSetup/Images/BadgeLogo.scale-400.png deleted file mode 100644 index 018f7b80..00000000 Binary files a/ZitiTunnelerSetup/Images/BadgeLogo.scale-400.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/LargeTile.scale-100.png b/ZitiTunnelerSetup/Images/LargeTile.scale-100.png deleted file mode 100644 index a2373975..00000000 Binary files a/ZitiTunnelerSetup/Images/LargeTile.scale-100.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/LargeTile.scale-125.png b/ZitiTunnelerSetup/Images/LargeTile.scale-125.png deleted file mode 100644 index b7cb56c3..00000000 Binary files a/ZitiTunnelerSetup/Images/LargeTile.scale-125.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/LargeTile.scale-150.png b/ZitiTunnelerSetup/Images/LargeTile.scale-150.png deleted file mode 100644 index 6f4a9a4c..00000000 Binary files a/ZitiTunnelerSetup/Images/LargeTile.scale-150.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/LargeTile.scale-200.png b/ZitiTunnelerSetup/Images/LargeTile.scale-200.png deleted file mode 100644 index 574e7114..00000000 Binary files a/ZitiTunnelerSetup/Images/LargeTile.scale-200.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/LargeTile.scale-400.png b/ZitiTunnelerSetup/Images/LargeTile.scale-400.png deleted file mode 100644 index b71a3575..00000000 Binary files a/ZitiTunnelerSetup/Images/LargeTile.scale-400.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/SmallTile.scale-100.png b/ZitiTunnelerSetup/Images/SmallTile.scale-100.png deleted file mode 100644 index 02fccc4b..00000000 Binary files a/ZitiTunnelerSetup/Images/SmallTile.scale-100.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/SmallTile.scale-125.png b/ZitiTunnelerSetup/Images/SmallTile.scale-125.png deleted file mode 100644 index 7275c688..00000000 Binary files a/ZitiTunnelerSetup/Images/SmallTile.scale-125.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/SmallTile.scale-150.png b/ZitiTunnelerSetup/Images/SmallTile.scale-150.png deleted file mode 100644 index 7ca0fce9..00000000 Binary files a/ZitiTunnelerSetup/Images/SmallTile.scale-150.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/SmallTile.scale-200.png b/ZitiTunnelerSetup/Images/SmallTile.scale-200.png deleted file mode 100644 index 79188482..00000000 Binary files a/ZitiTunnelerSetup/Images/SmallTile.scale-200.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/SmallTile.scale-400.png b/ZitiTunnelerSetup/Images/SmallTile.scale-400.png deleted file mode 100644 index d6206c94..00000000 Binary files a/ZitiTunnelerSetup/Images/SmallTile.scale-400.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/SplashScreen.scale-100.png b/ZitiTunnelerSetup/Images/SplashScreen.scale-100.png deleted file mode 100644 index a54e7b69..00000000 Binary files a/ZitiTunnelerSetup/Images/SplashScreen.scale-100.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/SplashScreen.scale-125.png b/ZitiTunnelerSetup/Images/SplashScreen.scale-125.png deleted file mode 100644 index 29cffc52..00000000 Binary files a/ZitiTunnelerSetup/Images/SplashScreen.scale-125.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/SplashScreen.scale-150.png b/ZitiTunnelerSetup/Images/SplashScreen.scale-150.png deleted file mode 100644 index ac096761..00000000 Binary files a/ZitiTunnelerSetup/Images/SplashScreen.scale-150.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/SplashScreen.scale-200.png b/ZitiTunnelerSetup/Images/SplashScreen.scale-200.png deleted file mode 100644 index 39c23686..00000000 Binary files a/ZitiTunnelerSetup/Images/SplashScreen.scale-200.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/SplashScreen.scale-400.png b/ZitiTunnelerSetup/Images/SplashScreen.scale-400.png deleted file mode 100644 index 6141cca3..00000000 Binary files a/ZitiTunnelerSetup/Images/SplashScreen.scale-400.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square150x150Logo.scale-100.png b/ZitiTunnelerSetup/Images/Square150x150Logo.scale-100.png deleted file mode 100644 index 951fb6da..00000000 Binary files a/ZitiTunnelerSetup/Images/Square150x150Logo.scale-100.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square150x150Logo.scale-125.png b/ZitiTunnelerSetup/Images/Square150x150Logo.scale-125.png deleted file mode 100644 index ec144fc3..00000000 Binary files a/ZitiTunnelerSetup/Images/Square150x150Logo.scale-125.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square150x150Logo.scale-150.png b/ZitiTunnelerSetup/Images/Square150x150Logo.scale-150.png deleted file mode 100644 index 9d5cac72..00000000 Binary files a/ZitiTunnelerSetup/Images/Square150x150Logo.scale-150.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square150x150Logo.scale-200.png b/ZitiTunnelerSetup/Images/Square150x150Logo.scale-200.png deleted file mode 100644 index a62dc524..00000000 Binary files a/ZitiTunnelerSetup/Images/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square150x150Logo.scale-400.png b/ZitiTunnelerSetup/Images/Square150x150Logo.scale-400.png deleted file mode 100644 index 622c8c16..00000000 Binary files a/ZitiTunnelerSetup/Images/Square150x150Logo.scale-400.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/ZitiTunnelerSetup/Images/Square44x44Logo.altform-unplated_targetsize-16.png deleted file mode 100644 index d55945d7..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.altform-unplated_targetsize-16.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/ZitiTunnelerSetup/Images/Square44x44Logo.altform-unplated_targetsize-256.png deleted file mode 100644 index 565b9012..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.altform-unplated_targetsize-256.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/ZitiTunnelerSetup/Images/Square44x44Logo.altform-unplated_targetsize-32.png deleted file mode 100644 index 8d335c19..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.altform-unplated_targetsize-32.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/ZitiTunnelerSetup/Images/Square44x44Logo.altform-unplated_targetsize-48.png deleted file mode 100644 index 370975e2..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.altform-unplated_targetsize-48.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.scale-100.png b/ZitiTunnelerSetup/Images/Square44x44Logo.scale-100.png deleted file mode 100644 index d6f02a22..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.scale-100.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.scale-125.png b/ZitiTunnelerSetup/Images/Square44x44Logo.scale-125.png deleted file mode 100644 index 853735dd..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.scale-125.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.scale-150.png b/ZitiTunnelerSetup/Images/Square44x44Logo.scale-150.png deleted file mode 100644 index b7493134..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.scale-150.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.scale-200.png b/ZitiTunnelerSetup/Images/Square44x44Logo.scale-200.png deleted file mode 100644 index 58997603..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.scale-400.png b/ZitiTunnelerSetup/Images/Square44x44Logo.scale-400.png deleted file mode 100644 index 171b0a29..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.scale-400.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-16.png b/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-16.png deleted file mode 100644 index 2999d05c..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-16.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-24.png b/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-24.png deleted file mode 100644 index c265a585..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-24.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index 94cbe3eb..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-256.png b/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-256.png deleted file mode 100644 index 0a9534b1..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-256.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-32.png b/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-32.png deleted file mode 100644 index 19e4759a..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-32.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-48.png b/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-48.png deleted file mode 100644 index 02beded7..00000000 Binary files a/ZitiTunnelerSetup/Images/Square44x44Logo.targetsize-48.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/StoreLogo.scale-100.png b/ZitiTunnelerSetup/Images/StoreLogo.scale-100.png deleted file mode 100644 index f6fbef6e..00000000 Binary files a/ZitiTunnelerSetup/Images/StoreLogo.scale-100.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/StoreLogo.scale-125.png b/ZitiTunnelerSetup/Images/StoreLogo.scale-125.png deleted file mode 100644 index 3fb349cb..00000000 Binary files a/ZitiTunnelerSetup/Images/StoreLogo.scale-125.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/StoreLogo.scale-150.png b/ZitiTunnelerSetup/Images/StoreLogo.scale-150.png deleted file mode 100644 index d9b61308..00000000 Binary files a/ZitiTunnelerSetup/Images/StoreLogo.scale-150.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/StoreLogo.scale-200.png b/ZitiTunnelerSetup/Images/StoreLogo.scale-200.png deleted file mode 100644 index 6d4c2c7e..00000000 Binary files a/ZitiTunnelerSetup/Images/StoreLogo.scale-200.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/StoreLogo.scale-400.png b/ZitiTunnelerSetup/Images/StoreLogo.scale-400.png deleted file mode 100644 index 9a488ca7..00000000 Binary files a/ZitiTunnelerSetup/Images/StoreLogo.scale-400.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-100.png b/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-100.png deleted file mode 100644 index 0f281c69..00000000 Binary files a/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-100.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-125.png b/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-125.png deleted file mode 100644 index cec9930b..00000000 Binary files a/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-125.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-150.png b/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-150.png deleted file mode 100644 index fe271dd9..00000000 Binary files a/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-150.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-200.png b/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-200.png deleted file mode 100644 index a54e7b69..00000000 Binary files a/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-400.png b/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-400.png deleted file mode 100644 index 39c23686..00000000 Binary files a/ZitiTunnelerSetup/Images/Wide310x150Logo.scale-400.png and /dev/null differ diff --git a/ZitiTunnelerSetup/Package.appxmanifest b/ZitiTunnelerSetup/Package.appxmanifest deleted file mode 100644 index 51545ddb..00000000 --- a/ZitiTunnelerSetup/Package.appxmanifest +++ /dev/null @@ -1,42 +0,0 @@ - - - - - Ziti Tunnel - NetFoundry - Images\StoreLogo.png - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ZitiUWPSolution.sln b/ZitiUWPSolution.sln index 19260d71..7009b81a 100644 --- a/ZitiUWPSolution.sln +++ b/ZitiUWPSolution.sln @@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiTunneler", "ZitiTunneler\ZitiTunneler.csproj", "{FA4291EA-A97E-4854-959F-91EE7B330B37}" EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "ZitiTunnelerSetup", "ZitiTunnelerSetup\ZitiTunnelerSetup.wapproj", "{7B36FB31-5662-4F87-A376-BCE564533D58}" +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "ZitiInstaller", "ZitiInstaller\ZitiInstaller.wapproj", "{520E523A-1E9B-4983-ABA9-0EB3B27B6420}" EndProject Global EndGlobal diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index e703a6dc..7292a2f9 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -3,9 +3,9 @@ package main const ( - Version = "0.0.5" - Revision = "481f28f80cf0" - Branch = "may25" + Version = "0.0.7" + Revision = "25a4c5e1230b" + Branch = "master" BuildUser = "Clint D" - BuildDate = "2020-05-26 23:08:43" + BuildDate = "2020-06-04 12:09:47" )