From 9ecb9bbad7b13d1ca7d74e7f05b6cefd237c99ed Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 25 Jul 2022 08:18:33 -0400 Subject: [PATCH 1/5] fix async warning --- DesktopEdge/MainWindow.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs index d2b386d4..a95372fb 100644 --- a/DesktopEdge/MainWindow.xaml.cs +++ b/DesktopEdge/MainWindow.xaml.cs @@ -779,7 +779,7 @@ namespace ZitiDesktopEdge { private void MonitorClient_OnShutdownEvent(object sender, StatusEvent e) { - this.Dispatcher.Invoke(async () => { + this.Dispatcher.Invoke(() => { Application.Current.Shutdown(); }); } From f4916e9a372254ef0b1808c77ad884961ba21825 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 25 Jul 2022 08:19:34 -0400 Subject: [PATCH 2/5] it's been a year - remove this old code: --- ZitiUpdateService/UninstallOpenZitiWintun.cs | 38 -------------------- ZitiUpdateService/UpdateService.cs | 3 -- ZitiUpdateService/ZitiUpdateService.csproj | 1 - 3 files changed, 42 deletions(-) delete mode 100644 ZitiUpdateService/UninstallOpenZitiWintun.cs diff --git a/ZitiUpdateService/UninstallOpenZitiWintun.cs b/ZitiUpdateService/UninstallOpenZitiWintun.cs deleted file mode 100644 index df5f6f18..00000000 --- a/ZitiUpdateService/UninstallOpenZitiWintun.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Management; -using System.Threading.Tasks; - -using NLog; - -namespace ZitiUpdateService { - internal class UninstallOpenZitiWintun { - private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); - public static void DetectAndUninstallOpenZitiWintun() { - Task.Run(() => { - Logger.Debug("Checking to see if the legacy OpenZitiWintunInstaller is installed"); - try { - bool r = UninstallOpenZitiWintunInstaller(); - if (r) { - Logger.Info("removed legacy OpenZitiWintunInstaller"); - } else { - Logger.Debug("OpenZitiWintunInstaller is not installed"); - } - } catch(Exception ex) { - Logger.Error(ex, "There was a problem invoking UninstallOpenZitiWintunInstaller!"); - } - }); - } - - private static bool UninstallOpenZitiWintunInstaller() { - ManagementObjectSearcher mos = new ManagementObjectSearcher("SELECT * FROM Win32_Product WHERE Name = 'OpenZitiWintunInstaller'"); - foreach (ManagementObject mo in mos.Get()) { - Logger.Info("OpenZitiWintunInstaller is installed. Invoking uninstall"); - var hr = mo.InvokeMethod("Uninstall", null); - return hr != null; - } - //was not found... - return false; - } - } -} diff --git a/ZitiUpdateService/UpdateService.cs b/ZitiUpdateService/UpdateService.cs index d229badb..1703f9cf 100644 --- a/ZitiUpdateService/UpdateService.cs +++ b/ZitiUpdateService/UpdateService.cs @@ -601,9 +601,6 @@ namespace ZitiUpdateService { _updateTimer.Start(); Logger.Info("Version Checker is running every {0} minutes", upInt.TotalMinutes); - //on startup - see if the old wintun software was installed and if so ... try to remove it - UninstallOpenZitiWintun.DetectAndUninstallOpenZitiWintun(); - cleanOldLogs(asmDir); scanForStaleDownloads(updateFolder); diff --git a/ZitiUpdateService/ZitiUpdateService.csproj b/ZitiUpdateService/ZitiUpdateService.csproj index a29b3cd8..e8828d5b 100644 --- a/ZitiUpdateService/ZitiUpdateService.csproj +++ b/ZitiUpdateService/ZitiUpdateService.csproj @@ -160,7 +160,6 @@ ProjectInstaller.cs - Component From 980d78135f7ec326a1409add0ed46dc05c848f29 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 25 Jul 2022 14:57:08 -0400 Subject: [PATCH 3/5] allow version and app name to properly report to ctrl --- ziti-edge-tunnel/build.bat | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ziti-edge-tunnel/build.bat b/ziti-edge-tunnel/build.bat index 4b3c7878..f8f2d43a 100644 --- a/ziti-edge-tunnel/build.bat +++ b/ziti-edge-tunnel/build.bat @@ -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.19.2 +SET ZITI_TUNNEL_REPO_BRANCH=v0.19.3 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= SET ZITI_TUNNEL_REPO_URL=https://github.com/openziti/ziti-tunnel-sdk-c/releases/latest/download/ziti-edge-tunnel-Windows_x86_64.zip @@ -25,6 +25,7 @@ SET WINTUN_DL_URL=https://www.wintun.net/builds/wintun-0.13.zip set SVC_ROOT_DIR=%~dp0 set CURDIR=%CD% +set /P VERSION=<%SVC_ROOT_DIR%\..\version call %SVC_ROOT_DIR%set-env.bat @@ -198,7 +199,7 @@ if "%ZITI_SDK_C_BRANCH%"=="" ( SET ZITI_SDK_C_BRANCH_CMD=-DZITI_SDK_C_BRANCH=%ZITI_SDK_C_BRANCH% ) -cmake -G Ninja -S %TUNNELER_SDK_DIR% -B %TUNNELER_SDK_DIR%build -DCMAKE_INSTALL_PREFIX=%TUNNELER_SDK_DIR%install -DCMAKE_TOOLCHAIN_FILE=%TUNNELER_SDK_DIR%\toolchains\default.cmake %ZITI_SDK_C_BRANCH_CMD% %ZITI_DEBUG_CMAKE% +cmake -G Ninja -S %TUNNELER_SDK_DIR% -B %TUNNELER_SDK_DIR%build -DGIT_VERSION=%VERSION% -DCMAKE_INSTALL_PREFIX=%TUNNELER_SDK_DIR%install -DCMAKE_TOOLCHAIN_FILE=%TUNNELER_SDK_DIR%\toolchains\default.cmake %ZITI_SDK_C_BRANCH_CMD% %ZITI_DEBUG_CMAKE% SET ACTUAL_ERR=%ERRORLEVEL% if %ACTUAL_ERR% NEQ 0 ( @@ -211,7 +212,7 @@ if %ACTUAL_ERR% NEQ 0 ( echo result of ninja build: %ACTUAL_ERR% ) -cmake --build %TUNNELER_SDK_DIR%build --target bundle --verbose +cmake --build %TUNNELER_SDK_DIR%build --target bundle --verbose SET ACTUAL_ERR=%ERRORLEVEL% if %ACTUAL_ERR% NEQ 0 ( From 30d5364abc9cc4e6d842d5f52c29c5e9d6596e2f Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 25 Jul 2022 15:05:28 -0400 Subject: [PATCH 4/5] the version will be 0.19.5 --- ziti-edge-tunnel/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ziti-edge-tunnel/build.bat b/ziti-edge-tunnel/build.bat index f8f2d43a..d0af410e 100644 --- a/ziti-edge-tunnel/build.bat +++ b/ziti-edge-tunnel/build.bat @@ -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.19.3 +SET ZITI_TUNNEL_REPO_BRANCH=v0.19.5 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= SET ZITI_TUNNEL_REPO_URL=https://github.com/openziti/ziti-tunnel-sdk-c/releases/latest/download/ziti-edge-tunnel-Windows_x86_64.zip From 204afd62a1a89ced457f08b9119c3b3af4e3319f Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 25 Jul 2022 15:08:07 -0400 Subject: [PATCH 5/5] bump the version --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index ac2cdeba..7d2ed7c7 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.1.3 +2.1.4