From 3bdf3e4fa6cfdaf3fda8b78c2354452a30dc5da3 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Thu, 19 Dec 2024 17:23:47 -0500 Subject: [PATCH 1/3] set feedback timeout to 60s --- ZitiDesktopEdge.Client/ServiceClient/MonitorClient.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZitiDesktopEdge.Client/ServiceClient/MonitorClient.cs b/ZitiDesktopEdge.Client/ServiceClient/MonitorClient.cs index e9d4d424a..b349b3ab4 100644 --- a/ZitiDesktopEdge.Client/ServiceClient/MonitorClient.cs +++ b/ZitiDesktopEdge.Client/ServiceClient/MonitorClient.cs @@ -144,7 +144,7 @@ async public Task StatusAsync() { async public Task CaptureLogsAsync() { ActionEvent action = new ActionEvent() { Op = "CaptureLogs", Action = "Normal" }; await sendMonitorClientAsync(action); - return await readMonitorClientAsync(ipcReader); + return await readMonitorClientAsync(ipcReader, TimeSpan.FromSeconds(60)); } async public Task SetLogLevelAsync(string level) { From 2d2ca439c418f2b436aa35172b35639e17a7c856 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Thu, 19 Dec 2024 17:34:24 -0500 Subject: [PATCH 2/3] add release notes and update version --- release-notes.md | 16 ++++++++++++++++ version | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/release-notes.md b/release-notes.md index ab8b76a98..03175e051 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,3 +1,19 @@ +# Release 2.5.2.3 +## What's New +* nothing - bugfix + +## Other changes +* none + +## Bugs fixed: +* [issue 776 - Asking for feedback log takes too long](https://github.com/openziti/desktop-edge-win/issues/776) + +## Dependencies + +* ziti-tunneler: v1.3.2 +* ziti-sdk: 1.3.2 +* tlsuv: v0.32.9[OpenSSL 3.3.1 4 Jun 2024] + # Release 2.5.2.2 ## What's New diff --git a/version b/version index 2decf4618..5021978f8 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.5.2.2 +2.5.2.3 From 6a173bb9a349b681d33a68b64ef3a5058e7355d4 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:14:13 -0500 Subject: [PATCH 3/3] update release notes, beta url, use 1.3.3 --- Installer/build.ps1 | 2 +- release-notes.md | 2 +- release-streams/beta.json | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Installer/build.ps1 b/Installer/build.ps1 index 567ba0a37..c31329a21 100644 --- a/Installer/build.ps1 +++ b/Installer/build.ps1 @@ -28,7 +28,7 @@ $ADV_INST_HOME = "C:\Program Files (x86)\Caphyon\Advanced Installer ${ADV_INST_V $SIGNTOOL="${ADV_INST_HOME}\third-party\winsdk\x64\signtool.exe" $ADVINST = "${ADV_INST_HOME}\bin\x86\AdvancedInstaller.com" $ADVPROJECT = "${scriptPath}\ZitiDesktopEdge.aip" -$ZITI_EDGE_TUNNEL_VERSION="v1.3.2" +$ZITI_EDGE_TUNNEL_VERSION="v1.3.3" echo "Cleaning previous build folder if it exists" Remove-Item "${buildPath}" -r -ErrorAction Ignore diff --git a/release-notes.md b/release-notes.md index 03175e051..fc908b32a 100644 --- a/release-notes.md +++ b/release-notes.md @@ -10,7 +10,7 @@ ## Dependencies -* ziti-tunneler: v1.3.2 +* ziti-tunneler: v1.3.3 * ziti-sdk: 1.3.2 * tlsuv: v0.32.9[OpenSSL 3.3.1 4 Jun 2024] diff --git a/release-streams/beta.json b/release-streams/beta.json index c19950902..3fbe91b50 100644 --- a/release-streams/beta.json +++ b/release-streams/beta.json @@ -1,12 +1,12 @@ { - "name": "2.5.1.2", - "tag_name": "2.5.1.2", - "published_at": "2024-12-10T10:39:52Z", + "name": "2.5.2.3", + "tag_name": "2.5.2.3", + "published_at": "2024-12-20T07:12:05Z", "installation_critical": false, "assets": [ { - "name": "Ziti.Desktop.Edge.Client-2.5.1.2.exe", - "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.5.1.2/Ziti.Desktop.Edge.Client-2.5.1.2.exe" + "name": "Ziti.Desktop.Edge.Client-2.5.2.3.exe", + "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.5.2.3/Ziti.Desktop.Edge.Client-2.5.2.3.exe" } ] }