refactor: integrate manifest reading into OssStrategy, simplify Validate()

- OssStrategy.ExecuteAsync() now calls AppMetadataDiscoverer.Discover()
  to fill identity fields from generalupdate.manifest.json, same as the
  standard ClientStrategy flow.
- OssStrategy.ExecuteUpgradeAsync() calls ManifestInfo.TryUpdateVersion()
  after decompression to persist the applied version back to manifest,
  preventing infinite update loops.
- UpdateRequest.Validate() no longer requires MainAppName, UpdateAppName,
  ClientVersion — these are filled from manifest by strategies at runtime.
  This also aligns with SetSource() which never set these fields.
- Updated UpdateRequestTests to reflect the relaxed validation rules.
- Simplified ClientTest/UpgradeTest: only secrets in SetConfig(), identity
  fields come from manifest automatically.

Author: JusterZhu

src/c#/GeneralUpdate.Core/Configuration/UpdateRequest.cs

@@ -62,17 +62,8 @@ public void Validate()
             if (!string.IsNullOrWhiteSpace(UpdateLogUrl) && !Uri.IsWellFormedUriString(UpdateLogUrl, UriKind.Absolute))
                 throw new ArgumentException("Invalid UpdateLogUrl");
 
-            if (string.IsNullOrWhiteSpace(UpdateAppName))
-                throw new ArgumentException("UpdateAppName cannot be empty");
-
-            if (string.IsNullOrWhiteSpace(MainAppName))
-                throw new ArgumentException("MainAppName cannot be empty");
-
             if (string.IsNullOrWhiteSpace(AppSecretKey))
                 throw new ArgumentException("AppSecretKey cannot be empty");
-
-            if (string.IsNullOrWhiteSpace(ClientVersion))
-                throw new ArgumentException("ClientVersion cannot be empty");
         }
     }
 }

src/c#/GeneralUpdate.Core/Strategy/OssStrategy.cs

@@ -150,7 +150,12 @@ public async Task ExecuteAsync()
         if (_configInfo == null)
             throw new InvalidOperationException("OssStrategy not configured. Call Create() first.");
 
-        // Dispatch by role �?no env-var detection needed.
+        // Fill missing identity fields from generalupdate.manifest.json,
+        // making the manifest the single source of configuration across
+        // all update flows (standard ClientStrategy and OssStrategy).
+        Configuration.AppMetadataDiscoverer.Discover(_configInfo);
+
+        // Dispatch by role — no env-var detection needed.
         if (_role == AppType.OssUpgrade)
         {
             await ExecuteUpgradeAsync();
@@ -371,6 +376,12 @@ private async Task ExecuteUpgradeAsync()
             var encoding = Encoding.GetEncoding(_configInfo?.Encoding?.CodePage ?? Encoding.UTF8.CodePage);
             DecompressAssets(assets, installPath, encoding);
 
+            // Update generalupdate.manifest.json ClientVersion so the client
+            // reads the correct version on next startup, preventing infinite loops.
+            Configuration.ManifestInfo.TryUpdateVersion(
+                installPath,
+                clientVersion: _configInfo.LastVersion);
+
             await SafeOnDownloadCompletedAsync(ctx).ConfigureAwait(false);
             await SafeOnAfterUpdateAsync(ctx).ConfigureAwait(false);
             await SafeReportUpdateAppliedAsync(ctx).ConfigureAwait(false);

tests/ClientTest/Program.cs

@@ -39,37 +39,21 @@ static async Task RunOssClientAsync()
     Console.WriteLine($"Started at {DateTime.Now}");
     Console.WriteLine($"Running from: {AppDomain.CurrentDomain.BaseDirectory}");
 
+    // Secrets come from code. Identity fields (MainAppName, ClientVersion,
+    // UpdateAppName, UpdatePath) are read from generalupdate.manifest.json
+    // by OssStrategy via AppMetadataDiscoverer.Discover() — same as standard flow.
     var updateUrl = "http://localhost:5000/packages/versions.json";
+    var appSecretKey = "dfeb5833-975e-4afb-88f1-6278ee9aeff6";
 
-    // Read current version from marker file (written by UpgradeTest after each successful update).
-    // This prevents infinite update loops when the package doesn't change the client binary.
-    var markerPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ".current_version");
-    var clientVersion = "1.0.0";
-    if (File.Exists(markerPath))
-    {
-        clientVersion = File.ReadAllText(markerPath).Trim();
-        Console.WriteLine($"Marker file found: current version = {clientVersion}");
-    }
-
-    Console.WriteLine($"UpdateUrl (versions.json): {updateUrl}");
-    Console.WriteLine($"Current version: {clientVersion}");
+    Console.WriteLine($"UpdateUrl: {updateUrl}");
     Console.WriteLine();
 
-    // OssClient flow:
-    // 1. Download versions.json from UpdateUrl to InstallPath
-    // 2. Deserialize as List<OssVersionRecord>, sort by PubTime desc
-    // 3. Compare latest.Version > ClientVersion
-    // 4. If newer: launch UpdateAppName from InstallPath, then exit
     await new GeneralUpdateBootstrap()
         .SetConfig(new UpdateRequest
         {
             UpdateUrl = updateUrl,
             InstallPath = AppDomain.CurrentDomain.BaseDirectory,
-            ClientVersion = clientVersion,
-            MainAppName = "ClientTest.exe",
-            UpdateAppName = "UpgradeTest.exe",
-            UpdatePath = "update",
-            AppSecretKey = "dfeb5833-975e-4afb-88f1-6278ee9aeff6"
+            AppSecretKey = appSecretKey
         })
         .SetOption(Option.AppType, AppType.OssClient)
         .Hooks<ClientTestHooks>()

tests/CoreTest/Configuration/UpdateRequestTests.cs

@@ -95,8 +95,9 @@ public void Validate_UpdateLogUrlInvalid_ThrowsArgumentException()
     [InlineData(null)]
     [InlineData("")]
     [InlineData("   ")]
-    public void Validate_UpgradeAppNameNullOrWhitespace_ThrowsArgumentException(string appName)
+    public void Validate_UpgradeAppNameNullOrWhitespace_NoException(string appName)
     {
+        // UpdateAppName is optional — filled from manifest by strategies.
         var config = new UpdateRequest
         {
             UpdateUrl = "https://api.example.com",
@@ -106,15 +107,17 @@ public void Validate_UpgradeAppNameNullOrWhitespace_ThrowsArgumentException(stri
             ClientVersion = "1.0.0",
             InstallPath = "C:\\app"
         };
-        Assert.Throws<ArgumentException>(() => config.Validate());
+        var ex = Record.Exception(() => config.Validate());
+        Assert.Null(ex);
     }
 
     [Theory]
     [InlineData(null)]
     [InlineData("")]
     [InlineData("   ")]
-    public void Validate_MainAppNameNullOrWhitespace_ThrowsArgumentException(string mainUpgradeAppName)
+    public void Validate_MainAppNameNullOrWhitespace_NoException(string mainUpgradeAppName)
     {
+        // MainAppName is optional — filled from manifest by strategies.
         var config = new UpdateRequest
         {
             UpdateUrl = "https://api.example.com",
@@ -124,7 +127,8 @@ public void Validate_MainAppNameNullOrWhitespace_ThrowsArgumentException(string
             ClientVersion = "1.0.0",
             InstallPath = "C:\\app"
         };
-        Assert.Throws<ArgumentException>(() => config.Validate());
+        var ex = Record.Exception(() => config.Validate());
+        Assert.Null(ex);
     }
 
     [Theory]
@@ -149,8 +153,9 @@ public void Validate_AppSecretKeyNullOrWhitespace_ThrowsArgumentException(string
     [InlineData(null)]
     [InlineData("")]
     [InlineData("   ")]
-    public void Validate_ClientVersionNullOrWhitespace_ThrowsArgumentException(string clientVersion)
+    public void Validate_ClientVersionNullOrWhitespace_NoException(string clientVersion)
     {
+        // ClientVersion is optional — filled from manifest by strategies.
         var config = new UpdateRequest
         {
             UpdateUrl = "https://api.example.com",
@@ -160,7 +165,8 @@ public void Validate_ClientVersionNullOrWhitespace_ThrowsArgumentException(strin
             ClientVersion = clientVersion,
             InstallPath = "C:\\app"
         };
-        Assert.Throws<ArgumentException>(() => config.Validate());
+        var ex = Record.Exception(() => config.Validate());
+        Assert.Null(ex);
     }
 
     [Theory]

tests/UpgradeTest/Program.cs

@@ -33,39 +33,24 @@ static async Task RunOssUpgradeAsync()
     Console.WriteLine($"Started at {DateTime.Now}");
     Console.WriteLine($"Running from: {AppDomain.CurrentDomain.BaseDirectory}");
 
-    // OssUpgrade flow:
-    // 1. Read {MainAppName}_versions.json from InstallPath (downloaded by OssClient)
-    // 2. Filter versions > ClientVersion, sorted by PubTime asc
-    // 3. Download each asset's ZIP from the URL in the version record
-    // 4. Decompress all ZIPs to InstallPath, delete archives
-    // 5. Launch MainAppName, then exit
-    //
-    // NOTE: Unlike the standard Upgrade path (which reads config from IPC),
-    // OssUpgrade requires explicit SetConfig() so it knows where to find
-    // the version JSON and which version to compare against.
-    //
-    // InstallPath must point to the SAME directory as the OssClient's InstallPath,
-    // because the versions.json was downloaded there. When the upgrade runs from
-    // a subdirectory (e.g. update/), we resolve up to the parent.
-
+    // OssUpgrade runs from a subdirectory (e.g. update/), but the manifest
+    // and versions.json are in the parent directory (same as OssClient).
+    // InstallPath resolves to the parent so OssStrategy reads the correct
+    // manifest and versions.json.
     var baseDir = AppDomain.CurrentDomain.BaseDirectory;
-    // baseDir ends with '\' (e.g. "...\update\"), so Path.Combine with ".." goes up one level.
     var installPath = Path.GetFullPath(Path.Combine(baseDir, ".."));
 
-    Console.WriteLine($"[OssUpgrade] BaseDir={baseDir}");
-    Console.WriteLine($"[OssUpgrade] InstallPath={installPath}");
-    GeneralUpdate.Core.GeneralTracer.Info($"[OssUpgrade] BaseDir={baseDir}");
-    GeneralUpdate.Core.GeneralTracer.Info($"[OssUpgrade] InstallPath={installPath}");
+    Console.WriteLine($"BaseDir={baseDir}");
+    Console.WriteLine($"InstallPath={installPath} (parent, where manifest + versions.json live)");
+    Console.WriteLine();
 
     await new GeneralUpdateBootstrap()
         .SetConfig(new UpdateRequest
         {
             UpdateUrl = "http://localhost:5000/packages/versions.json",
             InstallPath = installPath,
-            ClientVersion = "1.0.0",
-            MainAppName = "ClientTest.exe",
-            UpdateAppName = "UpgradeTest.exe",
             AppSecretKey = "dfeb5833-975e-4afb-88f1-6278ee9aeff6"
+            // Identity fields from generalupdate.manifest.json via Discover().
         })
         .SetOption(Option.AppType, AppType.OssUpgrade)
         .Hooks<UpgradeTestHooks>()
@@ -160,16 +145,8 @@ public async Task OnDownloadCompletedAsync(DownloadContext ctx)
     public async Task OnAfterUpdateAsync(HookContext ctx)
     {
         Console.WriteLine($"[Hook] OnAfterUpdate: {ctx.CurrentVersion} -> {ctx.TargetVersion}");
-
-        // Write version marker to prevent infinite update loops.
-        // The OssClient reads this file on startup to know its current version.
-        if (!string.IsNullOrWhiteSpace(ctx.TargetVersion) && !string.IsNullOrWhiteSpace(ctx.InstallPath))
-        {
-            var markerPath = Path.Combine(ctx.InstallPath, ".current_version");
-            File.WriteAllText(markerPath, ctx.TargetVersion);
-            Console.WriteLine($"[Hook] Version marker written: {markerPath} = {ctx.TargetVersion}");
-        }
-
+        // Manifest ClientVersion is updated by OssStrategy itself via
+        // ManifestInfo.TryUpdateVersion() after decompression.
         await Task.CompletedTask;
     }