添加测试代码

Author: JusterZhu

src/c#/GeneralUpdate.Client/Program.cs

@@ -22,14 +22,17 @@ private static void Main(string[] args)
                 await DifferentialCore.Instance?.Dirty(source, patch);
             });*/
 
-            Task.Run(() =>
+            Task.Run(async () =>
             {
+                Console.WriteLine("主程序启动辣！！！！");
+                await Task.Delay(3000);
+                
                 var configinfo = new Configinfo();
-                configinfo.UpdateLogUrl = "https://www.baidu.com";
+                //configinfo.UpdateLogUrl = "https://www.baidu.com";
                 configinfo.ReportUrl = "http://127.0.0.1:5008/Upgrade/Report";
                 configinfo.UpdateUrl = "http://127.0.0.1:5008/Upgrade/Verification";
 
-                configinfo.AppName = "GeneralUpdate.Upgrade.exe";
+                configinfo.AppName = "GeneralUpdate.Upgrad.exe";
                 configinfo.MainAppName = "GeneralUpdate.Client.exe";
                 configinfo.InstallPath = Thread.GetDomain().BaseDirectory;
 
@@ -59,9 +62,8 @@ private static void Main(string[] args)
                     .AddListenerException(OnException)
                     .SetConfig(configinfo)
                     .Option(UpdateOption.DownloadTimeOut, 60)
-                    .Option(UpdateOption.Encoding, Encoding.Default)
+                    .Option(UpdateOption.Encoding, Encoding.UTF8)
                     .Option(UpdateOption.Format, Format.ZIP)
-                    .Option(UpdateOption.Drive, false)
                     .LaunchAsync();
             });
 

src/c#/GeneralUpdate.ClientCore/GeneralClientBootstrap.cs

@@ -159,14 +159,17 @@ private async Task ExecuteWorkflowAsync()
         _configinfo.Encoding = GetOption(UpdateOption.Encoding) ?? Encoding.Default;
         _configinfo.Format = GetOption(UpdateOption.Format) ?? ".zip";
         _configinfo.DownloadTimeOut = GetOption(UpdateOption.DownloadTimeOut) == 0 ? 60 : GetOption(UpdateOption.DownloadTimeOut);
-        _configinfo.DriveEnabled = GetOption(UpdateOption.Drive);
+        _configinfo.DriveEnabled = GetOption(UpdateOption.Drive) ?? false;
         _configinfo.TempPath = GeneralFileManager.GetTempDirectory("main_temp");
 
         if (_configinfo.IsMainUpdate)
         {
             _configinfo.UpdateVersions = mainResp.Body.OrderBy(x => x.ReleaseDate).ToList();
             _configinfo.LastVersion = _configinfo.UpdateVersions.Last().Version;
 
+            //var failed = CheckFail(_configinfo.LastVersion);
+            //if (failed) return;
+            
             //Initialize the process transfer parameter object.
             var processInfo = new ProcessInfo(_configinfo.MainAppName
                 , _configinfo.InstallPath
@@ -220,6 +223,31 @@ private async Task Download()
         await manager.LaunchTasksAsync();
     }
 
+    /// <summary>
+    /// Check if there has been a recent update failure.
+    /// </summary>
+    /// <param name="version"></param>
+    /// <returns></returns>
+    private bool CheckFail(string version)
+    {
+        /*
+          Read the version number of the last failed upgrade from the system environment variables, then compare it with the version number of the current request.
+          If it is less than or equal to the failed version number, do not perform the update.
+          */
+        var fail = Environment.GetEnvironmentVariable("UpgradeFail", EnvironmentVariableTarget.User);
+        if (string.IsNullOrEmpty(fail) || string.IsNullOrEmpty(version))
+            return false;
+        
+        var failVersion = new Version(fail);
+        var lastVersion = new Version(version);
+        return failVersion >= lastVersion;
+    }
+
+    /// <summary>
+    /// Determine whether the current version verification result indicates that an update is needed.
+    /// </summary>
+    /// <param name="response"></param>
+    /// <returns></returns>
     private bool CheckUpgrade(VersionRespDTO? response)
     {
         if (response == null)
@@ -235,6 +263,27 @@ private bool CheckUpgrade(VersionRespDTO? response)
         return false;
     }
 
+    /// <summary>
+    /// During the iteration process, if any version requires a mandatory update, all the update content from this request should be updated.
+    /// </summary>
+    /// <param name="versions"></param>
+    /// <returns></returns>
+    private bool CheckForcibly(List<VersionBodyDTO>? versions)
+    {
+        if (versions == null) 
+            return false;
+        
+        foreach (var item in versions)
+        {
+            if (item.IsForcibly == true)
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+    
     /// <summary>
     /// User decides if update is required.
     /// </summary>
@@ -274,28 +323,10 @@ private void ClearEnvironmentVariable()
         }
         catch (Exception ex)
         {
-            EventManager.Instance.Dispatch(this,
-                new ExceptionEventArgs(ex,
-                    "Error: An unknown error occurred while deleting the environment variable."));
+            EventManager.Instance.Dispatch(this, new ExceptionEventArgs(ex, "Error: An unknown error occurred while deleting the environment variable."));
         }
     }
 
-    private bool CheckForcibly(List<VersionBodyDTO>? versions)
-    {
-        if (versions == null) 
-            return false;
-        
-        foreach (var item in versions)
-        {
-            if (item.IsForcibly == true)
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-    
     protected override void ExecuteStrategy()=> throw new NotImplementedException();
 
     protected override Task ExecuteStrategyAsync()=> throw new NotImplementedException();

src/c#/GeneralUpdate.ClientCore/Strategys/WindowsStrategy.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using GeneralUpdate.ClientCore.Pipeline;
 using GeneralUpdate.Common.FileBasic;
@@ -88,7 +89,11 @@ public override void StartApp()
             if (File.Exists(appPath))
             {
                 Environment.SetEnvironmentVariable("ProcessInfo", _configinfo.ProcessInfo, EnvironmentVariableTarget.User);
-                Process.Start(appPath);
+                Process.Start(new ProcessStartInfo
+                {
+                    UseShellExecute = true,
+                    FileName = appPath
+                });
             }
         }
         catch (Exception e)

src/c#/GeneralUpdate.Common/Internal/Bootstrap/AbstractBootstrap.cs

@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using GeneralUpdate.Common.Internal.Strategy;
@@ -48,10 +49,17 @@ public TBootstrap Option<T>(UpdateOption<T> option, T value)
 
         protected T? GetOption<T>(UpdateOption<T>? option)
         {
-            Debug.Assert(option != null && _options.Count != 0);
-            var val = _options[option];
-            if (val != null) return (T)val.GetValue();
-            return default;
+            try
+            {
+                Debug.Assert(option != null && _options.Count != 0);
+                var val = _options[option];
+                if (val != null) return (T)val.GetValue();
+                return default;
+            }
+            catch
+            {
+                return default;
+            }
         }
     }
 }

src/c#/GeneralUpdate.Core/Strategys/WindowsStrategy.cs

@@ -97,8 +97,14 @@ public override void StartApp()
             {
                 var appPath = Path.Combine(_configinfo.InstallPath, _configinfo.MainAppName);
                 if (File.Exists(appPath))
-                    Process.Start(appPath);
-                
+                {
+                    Process.Start(new ProcessStartInfo
+                    {
+                        FileName = appPath,
+                        UseShellExecute = true
+                    });
+                }
+
                 Environment.SetEnvironmentVariable("ProcessInfo", null, EnvironmentVariableTarget.User);
             }
             catch (Exception e)

src/c#/GeneralUpdate.Differential/DifferentialCore.cs

@@ -141,9 +141,7 @@ private async Task DirtyPatch(string appPath, string patchPath)
             try
             {
                 if (!File.Exists(appPath) || !File.Exists(patchPath))
-                {
                     return;
-                }
 
                 var newPath = Path.Combine(Path.GetDirectoryName(appPath)!, $"{Path.GetRandomFileName()}_{Path.GetFileName(appPath)}");
                 await new BinaryHandler().Dirty(appPath, newPath, patchPath);

src/c#/GeneralUpdate.Upgrad/Program.cs

@@ -52,11 +52,14 @@ private static void Main(string[] args)
             processor.AddCommand(new InstallDriverCommand(information));
             processor.ProcessCommands();*/
 
-            Task.Run(() =>
+            Task.Run(async () =>
             {
-                var jsonPath = @"D:\packet\test.json";
-                var json = File.ReadAllText(jsonPath);
-                Environment.SetEnvironmentVariable("ProcessInfo", json, EnvironmentVariableTarget.User);
+                Console.WriteLine("升级程序启动辣！！！！");
+                await Task.Delay(3000);
+                
+                //var jsonPath = @"D:\packet\test.json";
+                //var json = File.ReadAllText(jsonPath);
+                //Environment.SetEnvironmentVariable("ProcessInfo", json, EnvironmentVariableTarget.User);
 
                 _ = new GeneralUpdateBootstrap() //单个或多个更新包下载通知事件
                     .AddListenerMultiDownloadProgress(OnMultiDownloadProgressChanged)