gsadmin/desktop-edge-win
1
0
Fork 0
mirror of https://github.com/openziti/desktop-edge-win.git synced 2026-10-13 16:21:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #288 from openziti/release-1.6.25

Browse Source 
Release 1.6.25
This commit is contained in:
dovholuknf
2021-01-08 12:02:46 -05:00
committed by GitHub
parent f0dea26919 190623c9f4
commit 1c8c71cfa4
18 changed files with 159 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DesktopEdge/Assets/Images/update.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

DesktopEdge/IdentityDetails.xaml
+18 -1
View File
@@ -51,7 +51,24 @@
<local:MenuEditItem x:Name="IdentityNetwork" Grid.Column="0" Grid.Row="1" HorizontalAlignment="Stretch" Label="Network" IsLocked="True"></local:MenuEditItem>
<local:MenuEditItem x:Name="IdentityStatus" Grid.Column="0" Grid.Row="2" HorizontalAlignment="Stretch" Label="Status" IsLocked="True"></local:MenuEditItem>
<local:MenuEditItem x:Name="IdentityEnrollment" Grid.Column="0" Grid.Row="3" HorizontalAlignment="Stretch" Label="Enrollment Status" IsLocked="True"></local:MenuEditItem>
<Label Name="ServiceTitle" Content="SERVICES" Grid.Column="0" Grid.Row="4" Foreground="Gray" Padding="0,10,0,10" FontWeight="SemiBold" />
<Grid Grid.Row="4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="40"></RowDefinition>
</Grid.RowDefinitions>
<Label Name="ServiceTitle" Content="SERVICES" Grid.Column="0" Grid.Row="0" Foreground="Gray" Padding="0,10,0,10" FontWeight="SemiBold" />
<TextBox x:Name="Filter" Grid.Column="1" Grid.Row="0" LostFocus="FilterBlur" VerticalContentAlignment="Center" Padding="5,0,5,0" Margin="0" KeyUp="FilterServices" FontFamily="/ZitiDesktopEdge;component/Assets/Fonts/#Open Sans" SpellCheck.IsEnabled="True" VerticalAlignment="Center" FontSize="10" Height="24" MaxLength="100">
<TextBox.Resources>
<Style TargetType="{x:Type Border}">
<Setter Property="CornerRadius" Value="10"/>
</Style>
</TextBox.Resources>
</TextBox>
<Label Name="FilterLabel" Grid.Column="1" Cursor="Hand" MouseDown="FilterClicked" Grid.Row="0" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="10" Content="filter" FontFamily="/ZitiDesktopEdge;component/Assets/Fonts/#Open Sans" Foreground="#FFC7C7C7" Margin="5,0"></Label>
</Grid>
<ScrollViewer Name="MainDetailScroll" Grid.Column="0" MaxHeight="160" Grid.Row="5" VerticalScrollBarVisibility="Auto" CanContentScroll="True">
<StackPanel Name="ServiceList" Orientation="Vertical"></StackPanel>
</ScrollViewer>
DesktopEdge/IdentityDetails.xaml.cs
+33 -7
View File
@@ -24,6 +24,7 @@ namespace ZitiDesktopEdge {
public delegate void Detched(MouseButtonEventArgs e);
public event Detched OnDetach;
public double MainHeight = 500;
public string filter = "";
private List<ZitiIdentity> identities {
get {
@@ -83,14 +84,18 @@ namespace ZitiDesktopEdge {
IdentityStatus.Value = _identity.IsEnabled ? "active" : "disabled";
ServiceList.Children.Clear();
if (_identity.Services.Count>0) {
Filter.Visibility = Visibility.Visible;
FilterLabel.Visibility = Visibility.Visible;
foreach(var zitiSvc in _identity.Services.OrderBy(s => s.Name.ToLower())) {
Logger.Debug("painting: " + zitiSvc.Name);
ServiceInfo editor = new ServiceInfo();
editor.Label = zitiSvc.Name;
editor.Value = zitiSvc.Url;
editor.Warning = zitiSvc.Warning;
editor.IsLocked = true;
ServiceList.Children.Add(editor);
if (zitiSvc.Name.ToLower().IndexOf(filter)>=0||zitiSvc.Url.ToLower().IndexOf(filter)>=0) {
Logger.Debug("painting: " + zitiSvc.Name);
ServiceInfo editor = new ServiceInfo();
editor.Label = zitiSvc.Name;
editor.Value = zitiSvc.Url;
editor.Warning = zitiSvc.Warning;
editor.IsLocked = true;
ServiceList.Children.Add(editor);
}
}
double newHeight = MainHeight - 300;
ServiceRow.Height = new GridLength((double)newHeight);
@@ -99,6 +104,8 @@ namespace ZitiDesktopEdge {
MainDetailScroll.Visibility = Visibility.Visible;
ServiceTitle.Content = _identity.Services.Count + " SERVICES";
} else {
Filter.Visibility = Visibility.Collapsed;
FilterLabel.Visibility = Visibility.Collapsed;
ServiceRow.Height = new GridLength((double)0.0);
MainDetailScroll.Visibility = Visibility.Collapsed;
ServiceTitle.Content = "NO SERVICES AVAILABLE";
@@ -158,5 +165,24 @@ namespace ZitiDesktopEdge {
OnError(ex.Message);
}
}
private void FilterServices(object sender, KeyEventArgs e) {
if (e.Key == Key.Return) {
DoFilter();
}
}
private void DoFilter() {
filter = Filter.Text.ToLower().Trim();
UpdateView();
}
private void FilterClicked(object sender, MouseButtonEventArgs e) {
DoFilter();
}
private void FilterBlur(object sender, RoutedEventArgs e) {
DoFilter();
}
}
}
DesktopEdge/MainMenu.xaml
+19 -5
View File
@@ -53,7 +53,7 @@
<local:MenuItem HorizontalAlignment="Stretch" Icon="/Assets/Images/logs.png" Width="Auto" Label="Service Logs" MouseUp="ShowLogs"></local:MenuItem>
<local:MenuItem HorizontalAlignment="Stretch" Icon="/Assets/Images/logs.png" Width="Auto" Label="Application Logs" MouseUp="ShowUILogs"></local:MenuItem>
<local:MenuItem HorizontalAlignment="Stretch" Icon="/Assets/Images/advanced.png" Width="Auto" Label="Set Logging Level" MouseUp="SetLogLevel"></local:MenuItem>
<local:MenuItem x:Name="ShowReleaseStreamMenuItem" Visibility="Collapsed" HorizontalAlignment="Stretch" Icon="/Assets/Images/advanced.png" Width="Auto" Label="Set Release Stream" MouseUp="ShowReleaseStreamMenuAction"></local:MenuItem>
<local:MenuItem x:Name="ShowReleaseStreamMenuItem" Visibility="Collapsed" HorizontalAlignment="Stretch" Icon="/Assets/Images/update.png" Width="Auto" Label="Set Release Stream" MouseUp="ShowReleaseStreamMenuAction"></local:MenuItem>
</StackPanel>
<StackPanel Name="LogLevelItems" Visibility="Collapsed" Orientation="Vertical" HorizontalAlignment="Stretch">
<local:SubOptionItem x:Name="LogFatal" HorizontalAlignment="Stretch" Width="Auto" Label="Fatal" MouseUp="SetLevel"></local:SubOptionItem>
@@ -67,10 +67,24 @@
<StackPanel Name="ReleaseStreamItems" Visibility="Collapsed" Orientation="Vertical" HorizontalAlignment="Stretch">
<local:SubOptionItem x:Name="ReleaseStreamItemStable" HorizontalAlignment="Stretch" Width="Auto" Label="Stable" MouseUp="SetReleaseStreamMenuAction"></local:SubOptionItem>
<local:SubOptionItem x:Name="ReleaseStreamItemBeta" HorizontalAlignment="Stretch" Width="Auto" Label="Beta" MouseUp="SetReleaseStreamMenuAction"></local:SubOptionItem>
<StackPanel Name="UpdateNowPanel">
<Button x:Name="CheckForUpdate" Content="Check for Update" Click="CheckForUpdate_Click"/>
<Label Name="CheckForUpdateStatus" Content=""></Label>
<Button Visibility="Collapsed" x:Name="TriggerUpdateButton" Content="Perform Update" Click="TriggerUpdate_Click"/>
<StackPanel Name="UpdateNowPanel" HorizontalAlignment="Center" Margin="0, 20, 0, 0">
<Button Name="CheckForUpdate" Height="40" Grid.Column="1" Margin="20,0,40,0" Width="260" Cursor="Hand" BorderThickness="0" Foreground="#FFFFFF" Background="#0069FF" Content="Check for Update" Click="CheckForUpdate_Click" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans">
<Button.Resources>
<Style TargetType="Border">
<Setter Property="CornerRadius" Value="5"/>
</Style>
</Button.Resources>
</Button>
<Label HorizontalAlignment="Center" Name="CheckForUpdateStatus" Content=""></Label>
<Button Name="TriggerUpdateButton" Visibility="Collapsed" Height="40" Width="260" Grid.Column="1" Margin="20,0,40,0" Cursor="Hand" BorderThickness="0" Foreground="#FFFFFF" Background="#0069FF" Content="Perform Update" Click="TriggerUpdate_Click" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans">
<Button.Resources>
<Style TargetType="Border">
<Setter Property="CornerRadius" Value="5"/>
</Style>
</Button.Resources>
</Button>
</StackPanel>
</StackPanel>
<StackPanel Name="ConfigItems" Visibility="Collapsed" Orientation="Vertical" HorizontalAlignment="Stretch">
DesktopEdge/MainMenu.xaml.cs
+6 -11
View File
@@ -6,11 +6,9 @@ using System;
using System.Reflection;
using System.Net.Mail;
using System.IO;
using System.Net;
using Newtonsoft.Json.Linq;
using ZitiDesktopEdge.ServiceClient;
using NLog;
using ZitiDesktopEdge.DataStructures;
using ZitiDesktopEdge.Native;
using System.Configuration;
@@ -118,11 +116,10 @@ namespace ZitiDesktopEdge {
bool releaseClicked = opt.Label.ToLower() == "stable";
SvcResponse r = null;
if (releaseClicked) {
if (isBeta) {
//toggle to stable
r = await monitorClient.SetReleaseStreamAsync("stable");
var r = await monitorClient.SetReleaseStreamAsync("stable");
checkResponse(r, "Error When Setting Release Stream", "An error occurred while trying to set the release stream.");
} else {
logger.Debug("stable clicked but already on stable stream");
@@ -130,16 +127,14 @@ namespace ZitiDesktopEdge {
} else {
if (!isBeta) {
//toggle to beta
r = await monitorClient.SetReleaseStreamAsync("beta");
var r = await monitorClient.SetReleaseStreamAsync("beta");
checkResponse(r, "Error When Setting Release Stream", "An error occurred while trying to set the release stream.");
} else {
logger.Debug("beta clicked but already on beta stream");
}
}
if (r != null) {
Application.Current.Properties["ReleaseStream"] = opt.Label.ToLower();
UpdateState();
}
Application.Current.Properties["ReleaseStream"] = opt.Label.ToLower();
UpdateState();
}
private void checkResponse(SvcResponse r, string titleOnErr, string msgOnErr) {
@@ -279,7 +274,7 @@ namespace ZitiDesktopEdge {
try {
MainWindow.ShowLoad("Collecting Information", "Please wait while we run some commands\nand collect some diagnostic information");
DataClient client = (DataClient)Application.Current.Properties["ServiceClient"];
var mailMessage = new MailMessage("ziti-support@netfoundry.io", "ziti-support@netfoundry.io");
var mailMessage = new MailMessage("help@openziti.org", "help@openziti.org");
mailMessage.Subject = "Ziti Support";
mailMessage.IsBodyHtml = false;
System.Text.StringBuilder sb = new System.Text.StringBuilder();
DesktopEdge/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -50,6 +50,6 @@ using System.Windows;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.6.24.0")]
[assembly: AssemblyVersion("1.6.24.0")]
[assembly: AssemblyFileVersion("1.6.24.0")]
// [assembly: AssemblyVersion("1.6.25.0")]
[assembly: AssemblyVersion("1.6.25.0")]
[assembly: AssemblyFileVersion("1.6.25.0")]
DesktopEdge/ZitiDesktopEdge.csproj
+4 -1
View File
@@ -89,7 +89,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.5\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.7.6\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
@@ -378,5 +378,8 @@
<Name>ZitiDesktopEdge.Client</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\Images\update.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
DesktopEdge/packages.config
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
<package id="NLog" version="4.7.5" targetFramework="net48" />
<package id="NLog" version="4.7.6" targetFramework="net48" />
</packages>
Installer/ZitiDesktopEdge.aip
+2 -2
View File
@@ -22,10 +22,10 @@
<ROW Property="CTRLS" Value="2"/>
<ROW Property="Manufacturer" Value="NetFoundry, Inc."/>
<ROW Property="MsiLogging" MultiBuildValue="AnyCPU_Release:vp"/>
<ROW Property="ProductCode" Value="1033:{77023CA6-A17A-492F-90A5-59AADD28BAF2} " Type="16"/>
<ROW Property="ProductCode" Value="1033:{91DDD9AE-B9E8-4765-8B43-9C3707AA373D} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Ziti Desktop Edge"/>
<ROW Property="ProductVersion" Value="1.6.24" Type="32"/>
<ROW Property="ProductVersion" Value="1.6.25" Type="32"/>
<ROW Property="REBOOT" MultiBuildValue="AnyCPU_Release:Suppress"/>
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
<ROW Property="UpgradeCode" Value="{CB7E173A-663D-4A23-BB22-D1E8D885C2F3}"/>
ZitiDesktopEdge.Client/ZitiDesktopEdge.Client.csproj
+1 -1
View File
@@ -36,7 +36,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.5\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.7.6\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
ZitiDesktopEdge.Client/packages.config
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
<package id="NLog" version="4.7.5" targetFramework="net472" />
<package id="NLog" version="4.7.6" targetFramework="net48" />
</packages>
ZitiUpdateService/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -30,6 +30,6 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.6.24.0")]
[assembly: AssemblyVersion("1.6.24.0")]
[assembly: AssemblyFileVersion("1.6.24.0")]
// [assembly: AssemblyVersion("1.6.25.0")]
[assembly: AssemblyVersion("1.6.25.0")]
[assembly: AssemblyFileVersion("1.6.25.0")]
ZitiUpdateService/ZitiUpdateService.csproj
+1 -1
View File
@@ -80,7 +80,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.5\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.7.6\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
ZitiUpdateService/packages.config
+1 -1
View File
@@ -2,5 +2,5 @@
<packages>
<package id="Microsoft.PowerShell.5.ReferenceAssemblies" version="1.1.0" targetFramework="net48" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
<package id="NLog" version="4.7.5" targetFramework="net48" />
<package id="NLog" version="4.7.6" targetFramework="net48" />
</packages>
release-notes.md
+60
View File
@@ -1,3 +1,63 @@
# Release 1.6.25
## What's New
* Filtering is now available on the detail page of identities
## Other changes:
* none
## Bugs fixed:
* [#287](https://github.com/openziti/desktop-edge-win/issues/287) - access fileshare via UNC path in Windows explorer very slow
## Dependency Updates
* updated TSDK/CSDK to v0.7.26.1
* updated .net logging to NLog 4.7.6
# Release 1.6.24
## What's New
* fixes to c sdk to better handle when the controller is unavailable at startup
## Other changes:
* none
## Bugs fixed:
* none
## Dependency Updates
* updated TSDK/CSDK to v0.7.26/0.18.7
# Release 1.6.23
## What's New
* fixes to c sdk to better handle when the controller is unavailable at startup
## Other changes:
* none
## Bugs fixed:
* none
## Dependency Updates
* updated TSDK/CSDK to v0.7.26/0.18.7
# Release 1.6.22
## What's New
* fixes [#274](https://github.com/openziti/desktop-edge-win/issues/274) - Added logging to all SC calls into the monitor service
* feedback now collects systeminfo and dnscache info
* added a "please wait" to the feedback option
## Other changes:
* none
## Bugs fixed:
* stability fixes when the monitor service is down the UI should not crash when trying to access the monitor service
* stability fixes from tsdk/csdk
## Dependency Updates
* updated TSDK/CSDK to v0.7.25/0.18.6
# Release 1.6.20
## What's New
service/build.bat
+1 -1
View File
@@ -14,7 +14,7 @@ REM See the License for the specific language governing permissions and
REM limitations under the License.
REM
SET REPO_URL=https://github.com/openziti/ziti-tunnel-sdk-c.git
SET ZITI_TUNNEL_REPO_BRANCH=v0.7.26
SET ZITI_TUNNEL_REPO_BRANCH=v0.7.26.1
REM override the c sdk used in the build - leave blank for the same as specified in the tunneler sdk
SET ZITI_SDK_C_BRANCH=
REM the number of TCP connections the tunneler sdk can have at any one time
service/ziti-tunnel/version.go
+4 -4
View File
@@ -20,9 +20,9 @@
package main
const (
Version = "1.6.24"
Revision = "8fff18ede7dc"
Branch = "master"
Version = "1.6.25"
Revision = "520a9788f433"
Branch = "release-1.6.25"
BuildUser = ""
BuildDate = "2020-12-23 13:32:35"
BuildDate = "2021-01-08 16:12:45"
)
version
+1 -1
View File
@@ -1 +1 @@
1.6.24
1.6.25