Bug fixes

Author: sunnamed434

src/UnturnedRedistUpdateTool/Program.cs

@@ -96,7 +96,7 @@ private static async Task<int> Main(string[] args)
         var versionInfo = await versionTracker.LoadAsync();
 
         var redistUpdater = new RedistUpdater(managedDirectory, redistPath);
-        var updatedFiles = await redistUpdater.UpdateAsync();
+        var (updatedFiles, manifests) = await redistUpdater.UpdateAsync();
         if (updatedFiles.Count == 0)
         {
             Console.WriteLine("No files were updated - either no changes or something went wrong.");
@@ -109,22 +109,23 @@ private static async Task<int> Main(string[] args)
             return 1;
         }
         Console.WriteLine($"{updatedFiles.Count} Unturned's file(s) were updated");
-        var combinedHash = CreateCombinedHash(updatedFiles);
+        var combinedHash = CreateCombinedHash(manifests);
         Console.WriteLine($"Combined hash of updated files: {combinedHash}");
+        Console.WriteLine($"Old Combined hash of updated files: {versionInfo?.FilesHash}");
         var versionToUse = DetermineVersionToUse(newVersion, newBuildId, currentNuspecVersion, versionInfo, combinedHash, preview);
         Console.WriteLine($"New Version: {newVersion}");
         Console.WriteLine($"New Build Id: {newBuildId}");
         Console.WriteLine($"Version to use: {versionToUse}");
         if (versionToUse == currentNuspecVersion)
         {
-            Console.WriteLine("Files haven't changed since last publish, skipping...");
+            Console.WriteLine("Skip. nuspec and version to use are same.");
             return 0;
         }
         await versionTracker.SaveAsync(new VersionInfo
         {
             GameVersion = newVersion,
             BuildId = newBuildId,
-            NugetVersion = versionToUse,
+            NuGetVersion = versionToUse,
             FilesHash = combinedHash,
             LastUpdated = DateTime.UtcNow
         });
@@ -133,9 +134,12 @@ await versionTracker.SaveAsync(new VersionInfo
         nuspecHandler.Save();
 
         Console.WriteLine($"Updated {updatedFiles.Count} File(s)");
-        foreach (var (filePath, sha256) in updatedFiles)
+        foreach (var (fromPath, toPath) in updatedFiles)
         {
-            Console.WriteLine($"Updated File \"{filePath}\" (SHA256: {sha256[..8]}...)");
+            var fileName = Path.GetFileName(toPath);
+            if (!manifests.TryGetValue(fileName, out var sha256))
+                continue;
+            Console.WriteLine($"{fileName} (SHA256: {sha256[..8]}...)");
         }
 
         await new CommitFileWriter().WriteAsync(unturnedPath, versionToUse, newBuildId, force);
@@ -174,13 +178,13 @@ string GetUnturnedDataDirectoryName()
         }
     }
 
-    private static string CreateCombinedHash(Dictionary<string, string> updatedFiles)
+    private static string CreateCombinedHash(Dictionary<string, string> manifests)
     {
-        var sortedFiles = updatedFiles.OrderBy(kvp => kvp.Key).ToList();
+        var sortedFiles = manifests.OrderBy(kvp => kvp.Key).ToList();
         var combinedData = new StringBuilder();
-        foreach (var (filePath, fileHash) in sortedFiles)
+        foreach (var (fileName, fileHash) in sortedFiles)
         {
-            combinedData.Append($"{Path.GetFileName(filePath)}:{fileHash}");
+            combinedData.Append($"{fileName}:{fileHash}");
         }
         return Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(combinedData.ToString())));
     }

src/UnturnedRedistUpdateTool/RedistUpdater.cs

@@ -14,7 +14,7 @@ public RedistUpdater(string managedDir, string redistPath)
         _redistPath = redistPath;
     }
 
-    public async Task<Dictionary<string, string>> UpdateAsync()
+    public async Task<(Dictionary<string, string> UpdatedFiles, Dictionary<string, string> Manifests)> UpdateAsync()
     {
         Dictionary<string, string> updatedFiles = [];
         Dictionary<string, string> manifest = [];
@@ -37,6 +37,6 @@ public async Task<Dictionary<string, string>> UpdateAsync()
         }
         var manifestPath = Path.Combine(_redistPath, "manifest.sha256.json");
         await File.WriteAllTextAsync(manifestPath, JsonSerializer.Serialize(manifest, ManifestJsonSerializerOptions));
-        return updatedFiles;
+        return (updatedFiles, manifest);
     }
 }

src/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup Condition=" $(Configuration) == 'Debug' ">
     <None Update="TempRedist\**\*.*">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 

src/UnturnedRedistUpdateTool/VersionTracker.cs

@@ -6,7 +6,7 @@ public class VersionInfo
 {
     public string GameVersion { get; set; } = "";
     public string BuildId { get; set; } = "";
-    public string NugetVersion { get; set; } = "";
+    public string NuGetVersion { get; set; } = "";
     public string FilesHash { get; set; } = "";
     public DateTime LastUpdated { get; set; }
 }

tests/UnturnedRedistUpdateTool.Tests/RedistUpdaterTests.cs

@@ -16,16 +16,31 @@ public async Task ShouldCopyOnlyChangedFilesAndGenerateManifest()
         Directory.CreateDirectory(source);
         Directory.CreateDirectory(target);
 
+        // Create one changed file and one unchanged file
         File.WriteAllText(Path.Combine(source, "Test.dll"), "hello");
         File.WriteAllText(Path.Combine(target, "Test.dll"), "stale");
 
+        File.WriteAllText(Path.Combine(source, "Unchanged.dll"), "same");
+        File.WriteAllText(Path.Combine(target, "Unchanged.dll"), "same");
+
         var updater = new RedistUpdater(source, target);
-        var updated = await updater.UpdateAsync();
+        var (updated, manifests) = await updater.UpdateAsync();
 
         updated.ShouldContainKey(Path.Combine(source, "Test.dll"));
+        updated.ShouldNotContainKey(Path.Combine(source, "Unchanged.dll"));
+
         File.ReadAllText(Path.Combine(target, "Test.dll")).ShouldBe("hello");
 
-        var manifest = File.ReadAllText(Path.Combine(target, "manifest.sha256.json"));
-        manifest.ShouldContain("Test.dll");
+        // Manifest checks
+        manifests.ShouldContainKey("Test.dll");
+        manifests.ShouldContainKey("Unchanged.dll");
+        manifests.Count.ShouldBe(2);
+
+        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");
     }
 }