gsadmin/desktop-edge-win
1
0
Fork 0
mirror of https://github.com/openziti/desktop-edge-win.git synced 2026-09-24 03:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

target dotnet 4.7.2 vs 4.8 due to many users not havin 4.8 yet

Browse Source
This commit is contained in:
dovholuknf
2020-11-17 07:32:32 -05:00
parent 5532e4e205
commit 4e39b1e241
2 changed files with 54 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DesktopEdge/MainMenu.xaml.cs
-1
View File
@@ -4,7 +4,6 @@ using System.Windows.Input;
using System.Diagnostics;
using System;
using System.Threading;
using System.Management.Automation;
using ZitiDesktopEdge.Models;
using System.Reflection;
using System.Web;
DesktopEdge/Models/ZitiService.cs
+54 -55
View File
@@ -1,55 +1,54 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Management.Automation.Language;
using System.Text;
using System.Threading.Tasks;
namespace ZitiDesktopEdge.Models {
public class ZitiService {
public string Name { get; set; }
public string AssignedIP { get; set; }
public string Host { get; set; }
public string Port { get; set; }
public bool OwnsIntercept { get; set; }
public string Url
{
get
{
if (this.OwnsIntercept)
{
return Host + ":" + Port;
} else
{
return AssignedIP + ":" + Port;
}
}
}
public string Warning
{
get
{
if (this.OwnsIntercept)
{
return "";
}
else
{
return $"Another identity already mapped the specified hostname: {Host}.\nThis service is only available via IP";
}
}
}
public ZitiService() {
}
public ZitiService(ZitiDesktopEdge.ServiceClient.Service svc)
{
this.Name = svc.Name;
this.AssignedIP = svc.AssignedIP;
this.Host = svc.InterceptHost;
this.Port = svc.InterceptPort.ToString();
this.OwnsIntercept = svc.OwnsIntercept;
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ZitiDesktopEdge.Models {
public class ZitiService {
public string Name { get; set; }
public string AssignedIP { get; set; }
public string Host { get; set; }
public string Port { get; set; }
public bool OwnsIntercept { get; set; }
public string Url
{
get
{
if (this.OwnsIntercept)
{
return Host + ":" + Port;
} else
{
return AssignedIP + ":" + Port;
}
}
}
public string Warning
{
get
{
if (this.OwnsIntercept)
{
return "";
}
else
{
return $"Another identity already mapped the specified hostname: {Host}.\nThis service is only available via IP";
}
}
}
public ZitiService() {
}
public ZitiService(ZitiDesktopEdge.ServiceClient.Service svc)
{
this.Name = svc.Name;
this.AssignedIP = svc.AssignedIP;
this.Host = svc.InterceptHost;
this.Port = svc.InterceptPort.ToString();
this.OwnsIntercept = svc.OwnsIntercept;
}
}
}