Browse Source

Update some shell code

jimmy.jiang@vinno.com 1 year ago
parent
commit
a9122de630

BIN
fis.Loader/.vs/fis.Loader/v17/.suo


+ 3 - 3
fis.Loader/Handlers/FullUpgradeHandler.cs

@@ -5,7 +5,6 @@ namespace fis.Loader.Handlers
 {
     internal class FullUpgradeHandler : BaseHandler
     {
-        private string _fisFileDir = AppDomain.CurrentDomain.BaseDirectory;
         public FullUpgradeHandler() : base(LaunchMethodEnum.FullUpgrade)
         {
         }
@@ -18,8 +17,9 @@ namespace fis.Loader.Handlers
             ToolManager.Instance.UpgradeCenter.ExecuteFullUpgrade(Logger.WriteLine);
             if (IsCartSystemVersion)
             {
-                var fileName = Path.Combine(_fisFileDir, "fis.exe");
-                StartDamon(fileName,_fisFileDir);
+                var fisFileDir = Directory.GetParent(AppDomain.CurrentDomain.BaseDirectory).Parent.FullName;
+                var fileName = Path.Combine(fisFileDir, "fis.exe");
+                StartDamon(fileName, fisFileDir);
             }
         }
     }

+ 3 - 3
fis.Loader/Handlers/PartUpgradeHandler.cs

@@ -10,7 +10,6 @@ namespace fis.Loader.Handlers
 {
     internal class PartUpgradeHandler : BaseHandler
     {
-        private string _fisFileDir = AppDomain.CurrentDomain.BaseDirectory;
         public PartUpgradeHandler() : base(LaunchMethodEnum.PartUpgrade)
         {
         }
@@ -24,8 +23,9 @@ namespace fis.Loader.Handlers
 
             if (IsCartSystemVersion)
             {
-                var fileName = Path.Combine(_fisFileDir, "fis.exe");
-                StartDamon(fileName, _fisFileDir);
+                var fisFileDir = Directory.GetParent(AppDomain.CurrentDomain.BaseDirectory).Parent.FullName;
+                var fileName = Path.Combine(fisFileDir, "fis.exe");
+                StartDamon(fileName, fisFileDir);
             }
         }
     }

+ 1 - 1
fis.Loader/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2024-01-30T12:05:38.2341188Z;True|2023-07-01T13:25:24.3046976+08:00;True|2023-07-01T13:17:02.2551863+08:00;True|2023-07-01T13:14:43.0201548+08:00;True|2023-07-01T11:31:38.8848335+08:00;True|2023-06-29T20:46:09.9209251+08:00;True|2023-06-16T13:49:27.3641813+08:00;True|2023-04-22T17:47:56.0023097+08:00;True|2023-04-12T19:06:06.4479182+08:00;True|2023-04-04T18:58:41.6724252+08:00;True|2023-04-04T18:35:05.7046836+08:00;True|2023-04-04T17:44:37.8374974+08:00;True|2023-03-25T10:29:30.7741020+08:00;True|2023-03-17T17:49:34.3793924+08:00;True|2023-03-17T17:40:02.4174170+08:00;True|2023-03-17T16:43:20.9800116+08:00;True|2023-03-16T22:28:33.0346010+08:00;True|2023-03-16T22:23:06.8342042+08:00;True|2023-03-16T22:21:06.5706331+08:00;True|2023-03-16T22:18:51.8888279+08:00;True|2023-03-16T21:53:28.9360253+08:00;True|2023-03-16T21:47:25.5873091+08:00;True|2023-03-16T21:42:53.1468354+08:00;True|2023-03-16T21:02:30.3296546+08:00;True|2023-03-16T20:56:49.7751516+08:00;True|2022-12-01T16:57:09.2735980+08:00;True|2022-12-01T16:26:20.9412787+08:00;True|2022-12-01T16:25:14.1261397+08:00;True|2022-12-01T16:23:50.3487072+08:00;</History>
+    <History>True|2024-02-05T13:32:12.2992507Z;True|2024-02-05T21:30:40.8963673+08:00;True|2024-02-05T21:26:11.7849344+08:00;True|2024-02-05T21:05:56.2464514+08:00;True|2024-02-05T21:01:19.1864871+08:00;True|2024-02-05T20:26:06.6070689+08:00;True|2024-02-05T20:23:51.2032282+08:00;True|2024-02-05T20:18:44.1231622+08:00;True|2024-02-05T20:13:50.4722084+08:00;True|2024-02-05T20:10:28.1378874+08:00;True|2024-02-05T20:10:20.5852366+08:00;True|2024-02-05T20:03:16.9679108+08:00;True|2024-02-05T19:56:39.1561397+08:00;True|2024-01-30T20:05:38.2341188+08:00;True|2023-07-01T13:25:24.3046976+08:00;True|2023-07-01T13:17:02.2551863+08:00;True|2023-07-01T13:14:43.0201548+08:00;True|2023-07-01T11:31:38.8848335+08:00;True|2023-06-29T20:46:09.9209251+08:00;True|2023-06-16T13:49:27.3641813+08:00;True|2023-04-22T17:47:56.0023097+08:00;True|2023-04-12T19:06:06.4479182+08:00;True|2023-04-04T18:58:41.6724252+08:00;True|2023-04-04T18:35:05.7046836+08:00;True|2023-04-04T17:44:37.8374974+08:00;True|2023-03-25T10:29:30.7741020+08:00;True|2023-03-17T17:49:34.3793924+08:00;True|2023-03-17T17:40:02.4174170+08:00;True|2023-03-17T16:43:20.9800116+08:00;True|2023-03-16T22:28:33.0346010+08:00;True|2023-03-16T22:23:06.8342042+08:00;True|2023-03-16T22:21:06.5706331+08:00;True|2023-03-16T22:18:51.8888279+08:00;True|2023-03-16T21:53:28.9360253+08:00;True|2023-03-16T21:47:25.5873091+08:00;True|2023-03-16T21:42:53.1468354+08:00;True|2023-03-16T21:02:30.3296546+08:00;True|2023-03-16T20:56:49.7751516+08:00;True|2022-12-01T16:57:09.2735980+08:00;True|2022-12-01T16:26:20.9412787+08:00;True|2022-12-01T16:25:14.1261397+08:00;True|2022-12-01T16:23:50.3487072+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

+ 1 - 1
fis.Loader/fis.Loader.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_LastSelectedProfileId>G:\Wing\fis\fis.Loader\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+    <_LastSelectedProfileId>E:\Wing\fis\fis.Loader\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
 </Project>

BIN
fis_tools/process/FisTools.dll


+ 2 - 2
fis_tools_code/FisTools.cs

@@ -312,8 +312,8 @@ namespace FisTools
                 File.Copy(file, fileDest, true);
                 File.Delete(file);
             }
-            var fisFileName = Path.Combine(fisDir, "fis.exe");
-            ToolManager.Instance.LoaderCenter.StartProcessDirectly(fisFileName);
+            //var fisFileName = Path.Combine(fisDir, "fis.exe");
+            //ToolManager.Instance.LoaderCenter.StartProcessDirectly(fisFileName);
         }
 
         public void ExecuteFullUpgrade(Action<string> logger, Action<double>? onProgressChanged = null)