Publicize specified assemblies. Do not carry all hashes from managed dir, only updated files

Author: sunnamed434

src/UnturnedRedistUpdateTool/Program.cs

@@ -16,7 +16,7 @@ private static async Task<int> Main(string[] args)
 #if DEBUG
         if (args.Length == 0)
         {
-            args = [@"C:\Me\Apps\Steam\steamapps\common\Unturned", Path.Combine(AppContext.BaseDirectory, "TempRedist", "Client"), "304930", "--force"];
+            args = [@"C:\Me\Apps\Steam\steamapps\common\Unturned", Path.Combine(AppContext.BaseDirectory, "TempRedist", "Client"), "304930", "--force", "-publicize", "Assembly-CSharp.dll"];
         }
 #endif
 
@@ -30,6 +30,17 @@ private static async Task<int> Main(string[] args)
         var appId = args[2];
         var force = args.Any(x => x.Equals("--force", StringComparison.OrdinalIgnoreCase));
         var preview = args.Any(x => x.Equals("--preview", StringComparison.OrdinalIgnoreCase));
+        List<string> publicizeAssemblies = [];
+        var publicizeIndex = Array.FindIndex(args, x => x.Equals("-publicize", StringComparison.OrdinalIgnoreCase));
+        if (publicizeIndex != -1)
+        {
+            for (var i = publicizeIndex + 1; i < args.Length; i++)
+            {
+                if (args[i].StartsWith("-") || args[i].StartsWith("--"))
+                    break;
+                publicizeAssemblies.Add(args[i]);
+            }
+        }
 
         if (string.IsNullOrWhiteSpace(appId))
         {
@@ -97,7 +108,7 @@ private static async Task<int> Main(string[] args)
 
         Console.WriteLine($"Current Build Id: {versionInfo?.BuildId}");
 
-        var redistUpdater = new RedistUpdater(managedDirectory, redistPath);
+        var redistUpdater = new RedistUpdater(managedDirectory, redistPath, publicizeAssemblies);
         var (updatedFiles, manifests) = await redistUpdater.UpdateAsync();
         if (updatedFiles.Count == 0)
         {

src/UnturnedRedistUpdateTool/RedistUpdater.cs

@@ -1,4 +1,5 @@
 using System.Text.Json;
+using BepInEx.AssemblyPublicizer;
 
 namespace UnturnedRedistUpdateTool;
 
@@ -7,36 +8,49 @@ public class RedistUpdater
     private static readonly JsonSerializerOptions ManifestJsonSerializerOptions = new() { WriteIndented = true };
     private readonly string _managedDir;
     private readonly string _redistPath;
+    private readonly List<string> _publicizeAssemblies;
 
-    public RedistUpdater(string managedDir, string redistPath)
+    public RedistUpdater(string managedDir, string redistPath, List<string> publicizeAssemblies)
     {
         _managedDir = managedDir;
         _redistPath = redistPath;
+        _publicizeAssemblies = publicizeAssemblies;
     }
 
     public async Task<(Dictionary<string, string> UpdatedFiles, Dictionary<string, string> Manifests)> UpdateAsync()
     {
         Dictionary<string, string> updatedFiles = [];
-        Dictionary<string, string> manifest = [];
+        Dictionary<string, string> manifests = [];
         var managedFiles = new DirectoryInfo(_managedDir).GetFiles();
         if (managedFiles.Length == 0)
             throw new InvalidOperationException($"{_managedDir} is empty");
         foreach (var file in managedFiles)
         {
             var managedFilePath = file.FullName;
             var redistFilePath = Path.Combine(_redistPath, file.Name);
-            var managedHash = HashHelper.GetFileHash(managedFilePath);
-            manifest[file.Name] = managedHash;
             if (!File.Exists(redistFilePath))
                 continue;
-            var redistHash = HashHelper.GetFileHash(redistFilePath);
-            if (managedHash == redistHash)
-                continue;
-            file.CopyTo(redistFilePath, true);
+            if (_publicizeAssemblies.Any(x => x == file.Name))
+            {
+                AssemblyPublicizer.Publicize(managedFilePath, redistFilePath);
+                Console.WriteLine($"Publicized {redistFilePath}");
+                var publicizedHash = HashHelper.GetFileHash(redistFilePath);
+                manifests[file.Name] = publicizedHash;
+            }
+            else
+            {
+                var managedHash = HashHelper.GetFileHash(managedFilePath);
+                var redistHash = HashHelper.GetFileHash(redistFilePath);
+                if (managedHash == redistHash)
+                    continue;
+                file.CopyTo(redistFilePath, true);
+                var copiedHash = HashHelper.GetFileHash(redistFilePath);
+                manifests[file.Name] = copiedHash;
+            }
             updatedFiles[managedFilePath] = redistFilePath;
         }
         var manifestPath = Path.Combine(_redistPath, "manifest.sha256.json");
-        await File.WriteAllTextAsync(manifestPath, JsonSerializer.Serialize(manifest, ManifestJsonSerializerOptions));
-        return (updatedFiles, manifest);
+        await File.WriteAllTextAsync(manifestPath, JsonSerializer.Serialize(manifests, ManifestJsonSerializerOptions));
+        return (updatedFiles, manifests);
     }
 }

src/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.csproj

@@ -17,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="BepInEx.AssemblyPublicizer" Version="0.4.3" />
     <PackageReference Include="SharpZipLib" Version="1.4.2"/>
     <PackageReference Include="ValveKeyValue" Version="0.13.1.398"/>
   </ItemGroup>

tests/UnturnedRedistUpdateTool.Tests/RedistUpdaterTests.cs

@@ -23,7 +23,7 @@ public async Task ShouldCopyOnlyChangedFilesAndGenerateManifest()
         File.WriteAllText(Path.Combine(source, "Unchanged.dll"), "same");
         File.WriteAllText(Path.Combine(target, "Unchanged.dll"), "same");
 
-        var updater = new RedistUpdater(source, target);
+        var updater = new RedistUpdater(source, target, []);
         var (updated, manifests) = await updater.UpdateAsync();
 
         updated.ShouldContainKey(Path.Combine(source, "Test.dll"));
@@ -33,14 +33,12 @@ public async Task ShouldCopyOnlyChangedFilesAndGenerateManifest()
 
         // Manifest checks
         manifests.ShouldContainKey("Test.dll");
-        manifests.ShouldContainKey("Unchanged.dll");
-        manifests.Count.ShouldBe(2);
+        manifests.Count.ShouldBe(1);
 
         var manifestPath = Path.Combine(target, "manifest.sha256.json");
         File.Exists(manifestPath).ShouldBeTrue();
 
         var manifestContent = File.ReadAllText(manifestPath);
         manifestContent.ShouldContain("Test.dll");
-        manifestContent.ShouldContain("Unchanged.dll");
     }
 }