Merge branch 'main' of https://github.com/GeneralLibrary/GeneralUpdate.Tools

Author: JusterZhu

src/Models/SimulateConfigModel.cs

@@ -16,6 +16,5 @@ public partial class SimulateConfigModel : ObservableObject
     [ObservableProperty] private string _appSecretKey = "dfeb5833-975e-4afb-88f1-6278ee9aeff6";
     [ObservableProperty] private string _productId = "2d974e2a-31e6-4887-9bb1-b4689e98c77a";
     [ObservableProperty] private string _outputDirectory = string.Empty;
-    [ObservableProperty] private bool _compileUpgrade = true;
     public int ServerPort { get; set; } = 5000;
 }

src/Services/ClientGeneratorService.cs

@@ -6,9 +6,13 @@
 
 namespace GeneralUpdate.Tools.Services;
 
+/// <summary>
+/// Generates single-file client.csx and upgrade.csx for simulation,
+/// using dotnet script with #r directives (exact NuGet version).
+/// </summary>
 public class ClientGeneratorService
 {
-    private const string ClientScript = """
+    private const string ClientTemplate = """
 #r "nuget:GeneralUpdate.ClientCore,10.4.6"
 
 using GeneralUpdate.ClientCore;
@@ -66,7 +70,7 @@ public class ClientGeneratorService
 }}
 """;
 
-    private const string UpgradeScript = """
+    private const string UpgradeTemplate = """
 #r "nuget:GeneralUpdate.Core,10.4.6"
 
 using GeneralUpdate.Core;
@@ -104,110 +108,28 @@ public class ClientGeneratorService
     Console.Error.WriteLine(ex);
     Environment.Exit(1);
 }}
-""";
-
-    private const string UpgradeCsproj = """
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="GeneralUpdate.Core" Version="10.4.6" />
-  </ItemGroup>
-</Project>
-""";
-
-    private const string UpgradeProgram = """
-using GeneralUpdate.Core;
-using GeneralUpdate.Common.Shared;
-using GeneralUpdate.Common.Internal.Event;
-
-var log = (string msg) => Console.WriteLine($"[{DateTime.Now:HH:mm:ss}] {{msg}}");
-
-try
-{
-    log("Upgrade process started");
-    log("Working directory: " + Environment.CurrentDirectory);
-
-    await new GeneralUpdateBootstrap()
-        .AddListenerMultiDownloadStatistics((_, e) =>
-        {
-            var v = e.Version as GeneralUpdate.Common.Shared.Object.VersionInfo;
-            log($"Download: {{v?.Version}} {{e.ProgressPercentage}}%");
-        })
-        .AddListenerMultiAllDownloadCompleted((_, e) =>
-        {
-            log(e.IsAllDownloadCompleted ? "Downloads done" : "Download failed");
-        })
-        .AddListenerException((_, e) =>
-        {
-            log($"ERROR: {{e.Exception}}");
-        })
-        .LaunchAsync();
-
-    log("Upgrade process finished successfully");
-}
-catch (Exception ex)
-{
-    log($"FATAL: {{ex.Message}}");
-    Console.Error.WriteLine(ex);
-    Environment.Exit(1);
-}
 """;
 
     public async Task GenerateAsync(SimulateConfigModel config, string outputDir)
     {
         var serverUrl = $"http://127.0.0.1:{config.ServerPort}";
-        var appName = config.CompileUpgrade ? "upgrade.exe" : "upgrade.csx";
 
         await File.WriteAllTextAsync(Path.Combine(outputDir, "client.csx"),
-            string.Format(ClientScript,
+            string.Format(ClientTemplate,
                 EscapeForCSharp(config.AppDirectory),
                 serverUrl,
-                appName,
+                "upgrade.csx",
                 "client.csx",
                 config.CurrentVersion,
                 "1.0.0.0",
                 config.ProductId,
                 config.AppSecretKey),
             Encoding.UTF8);
 
-        if (config.CompileUpgrade)
-        {
-            var upgradeDir = Path.Combine(outputDir, "upgrade");
-            Directory.CreateDirectory(upgradeDir);
-            await File.WriteAllTextAsync(Path.Combine(upgradeDir, "upgrade.csproj"), UpgradeCsproj, Encoding.UTF8);
-            await File.WriteAllTextAsync(Path.Combine(upgradeDir, "Program.cs"),
-                UpgradeProgram, Encoding.UTF8);
-        }
-        else
-        {
-            await File.WriteAllTextAsync(Path.Combine(outputDir, "upgrade.csx"),
-                string.Format(UpgradeScript, EscapeForCSharp(config.AppDirectory)), Encoding.UTF8);
-        }
-    }
-
-    public async Task PublishUpgradeAsync(string outputDir)
-    {
-        var upgradeDir = Path.Combine(outputDir, "upgrade");
-        var psi = new System.Diagnostics.ProcessStartInfo("dotnet", "publish -c Release -r win-x64 --self-contained false -o .")
-        {
-            WorkingDirectory = upgradeDir,
-            RedirectStandardOutput = true,
-            RedirectStandardError = true,
-            UseShellExecute = false,
-            CreateNoWindow = true
-        };
-        var p = System.Diagnostics.Process.Start(psi)!;
-        await p.WaitForExitAsync();
-        // Copy the published exe to the output root
-        var src = Path.Combine(upgradeDir, "upgrade.exe");
-        var dst = Path.Combine(outputDir, "upgrade.exe");
-        if (File.Exists(src))
-            File.Copy(src, dst, true);
+        await File.WriteAllTextAsync(Path.Combine(outputDir, "upgrade.csx"),
+            string.Format(UpgradeTemplate,
+                EscapeForCSharp(config.AppDirectory)),
+            Encoding.UTF8);
     }
 
     private static string EscapeForCSharp(string s) =>

src/Services/LocalizationService.cs

@@ -137,7 +137,6 @@ public string this[string key]
             ["Sim.ValidateDirs"] = "请填写所有必填项",
             ["Sim.DotnetCheck"] = "需要 .NET 10.0 SDK，请先安装",
             ["Sim.AutoRun"] = "自动启动服务器并运行客户端",
-            ["Sim.CompileUpgrade"] = "编译 upgrade 为 .exe",
             ["Sim.ManualMode"] = "服务器/客户端已生成，可手动运行:\ndotnet script client.csx",
             ["Sim.Starting"] = "正在启动模拟...",
             ["Sim.Completed"] = "模拟完成 ({0:F1}s)",
@@ -237,7 +236,6 @@ public string this[string key]
             ["Sim.ValidateDirs"] = "Please fill in all required fields",
             ["Sim.DotnetCheck"] = ".NET 10.0 SDK is required. Please install it first.",
             ["Sim.AutoRun"] = "Auto-start server and run client",
-            ["Sim.CompileUpgrade"] = "Compile upgrade to .exe",
             ["Sim.ManualMode"] = "Server/client generated. Run manually:\ndotnet script client.csx",
             ["Sim.Starting"] = "Starting simulation...",
             ["Sim.Completed"] = "Simulation completed ({0:F1}s)",

src/Services/SimulationService.cs

@@ -36,19 +36,10 @@ public async Task<SimulationResult> RunAsync(
             Directory.CreateDirectory(config.OutputDirectory);
 
             // 3. Generate scripts
-            Log("STEP 3: Generating scripts", progress);
+            Log("STEP 3: Generating client.csx and upgrade.csx", progress);
             await _generator.GenerateAsync(config, config.OutputDirectory);
             Log($"  client.csx → {config.OutputDirectory}", progress);
-            if (config.CompileUpgrade)
-            {
-                Log("  Compiling upgrade to .exe (dotnet publish)...", progress);
-                await _generator.PublishUpgradeAsync(config.OutputDirectory);
-                Log("  upgrade.exe ready", progress);
-            }
-            else
-            {
-                Log($"  upgrade.csx → {config.OutputDirectory}", progress);
-            }
+            Log($"  upgrade.csx → {config.OutputDirectory}", progress);
 
             // 4. Start server
             Log("STEP 4: Starting local server", progress);

src/Views/SimulateView.axaml

@@ -82,8 +82,6 @@
             </Border>
 
             <!-- Run -->
-            <CheckBox Content="{Binding Source={x:Static svc:LocalizationService.Instance}, Path=[Sim.CompileUpgrade]}"
-                      IsChecked="{Binding Config.CompileUpgrade}"/>
             <Button Content="{Binding Source={x:Static svc:LocalizationService.Instance}, Path=[Sim.Start]}"
                     Command="{Binding StartSimulationCommand}"
                     IsEnabled="{Binding !IsRunning}" Height="40" FontSize="14" HorizontalAlignment="Stretch"/>