Merge pull request #557 from openziti/issue-545

Issue 545

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();
 			});
 		}

ZitiUpdateService/UninstallOpenZitiWintun.cs

@@ -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;
-        }
-    }
-}

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);
 

ZitiUpdateService/ZitiUpdateService.csproj

@@ -160,7 +160,6 @@
       <DependentUpon>ProjectInstaller.cs</DependentUpon>
     </Compile>
     <Compile Include="checkers\UpdateCheckers.cs" />
-    <Compile Include="UninstallOpenZitiWintun.cs" />
     <Compile Include="UpdateService.cs">
       <SubType>Component</SubType>
     </Compile>

version

@@ -1 +1 @@
-2.1.3
+2.1.4

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.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
@@ -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 (