From 8edfa5db1d8bd006a6eb8ca7d77998f8b0d6917e Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 22 Apr 2020 17:11:10 -0400 Subject: [PATCH] minor updates to the uwp app --- ZitiTunneler/MainMenu.xaml.cs | 14 +------------- ZitiTunneler/ServiceClient/ClientImpl.cs | 3 ++- ZitiTunneler/ServiceClient/DataStructures.cs | 4 ++-- ZitiTunneler/ZitiTunneler.csproj | 3 +++ ZitiUWPSolution.sln | 1 + 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/ZitiTunneler/MainMenu.xaml.cs b/ZitiTunneler/MainMenu.xaml.cs index f76a336d..28e97a59 100644 --- a/ZitiTunneler/MainMenu.xaml.cs +++ b/ZitiTunneler/MainMenu.xaml.cs @@ -1,19 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; +using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; using System.Diagnostics; -using System.Windows.Navigation; namespace ZitiTunneler { diff --git a/ZitiTunneler/ServiceClient/ClientImpl.cs b/ZitiTunneler/ServiceClient/ClientImpl.cs index d55c2cb7..100de561 100644 --- a/ZitiTunneler/ServiceClient/ClientImpl.cs +++ b/ZitiTunneler/ServiceClient/ClientImpl.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.IO; using System.IO.Pipes; +using System.Threading.Tasks; using Newtonsoft.Json; /// @@ -115,7 +116,7 @@ namespace ZitiTunneler.ServiceClient return resp.Payload; } - catch (IOException ioe) + catch (IOException) { //almost certainly a problem with the pipe - recreate the pipe... setupPipe(); diff --git a/ZitiTunneler/ServiceClient/DataStructures.cs b/ZitiTunneler/ServiceClient/DataStructures.cs index ba7da2a2..b1cecdac 100644 --- a/ZitiTunneler/ServiceClient/DataStructures.cs +++ b/ZitiTunneler/ServiceClient/DataStructures.cs @@ -112,7 +112,7 @@ namespace ZitiTunneler.ServiceClient { public string Name { get; set; } public string HostName { get; set; } - public int Port { get; set; } + public UInt16 Port { get; set; } } public class EnrollmentFlags @@ -127,7 +127,7 @@ namespace ZitiTunneler.ServiceClient { public string Ip { get; set; } public string Subnet { get; set; } - public Int16 MTU { get; set; } + public UInt16 MTU { get; set; } public string DNS { get; set; } } diff --git a/ZitiTunneler/ZitiTunneler.csproj b/ZitiTunneler/ZitiTunneler.csproj index 97248fdf..a6362ee8 100644 --- a/ZitiTunneler/ZitiTunneler.csproj +++ b/ZitiTunneler/ZitiTunneler.csproj @@ -169,6 +169,9 @@ Always + + .editorconfig + SettingsSingleFileGenerator diff --git a/ZitiUWPSolution.sln b/ZitiUWPSolution.sln index 9f833930..c12bd37e 100644 --- a/ZitiUWPSolution.sln +++ b/ZitiUWPSolution.sln @@ -5,6 +5,7 @@ VisualStudioVersion = 16.0.29806.167 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