Merge pull request #381 from myhomeiot/master

Add /preservetimestamp command line option
gluck · Dec 10, 2024 · 98fadf4 · 98fadf4
2 parents 0856f03 + fbcafb5
commit 98fadf4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/ILRepack/Application.cs b/ILRepack/Application.cs
@@ -154,6 +154,7 @@ allows dropping members denoted by this attribute name when merging
  - /keepotherversionreferences
                       take reference assembly version into account when removing references
 
+ - /preservetimestamp preserve original file PE timestamp
  - /skipconfig        skips merging config files
  - /illink            merge IL Linker files
  - /xmldocs           merges XML documentation as well

diff --git a/ILRepack/ILRepack.cs b/ILRepack/ILRepack.cs
@@ -446,10 +446,14 @@ private void RepackCore(string tempOutputDirectory)
                     StrongNameKeyBlob = signingStep.KeyInfo?.KeyBlob,
                     WriteSymbols = Options.DebugInfo && symbolWriterProvider != null,
                     SymbolWriterProvider = symbolWriterProvider,
-                    DeterministicMvid = true,
-                    Timestamp = ComputeDeterministicTimestamp()
+                    DeterministicMvid = true
                 };
 
+                if (!Options.PreserveTimestamp)
+                {
+                    parameters.Timestamp = ComputeDeterministicTimestamp();
+                }
+
                 Logger.Verbose($"Writing temporary assembly: {tempOutputFilePath}");
                 TargetAssemblyDefinition.Write(tempOutputFilePath, parameters);
 

diff --git a/ILRepack/RepackOptions.cs b/ILRepack/RepackOptions.cs
@@ -75,6 +75,7 @@ public string ExcludeFile
         public IEnumerable<string> SearchDirectories { get; set; } = Array.Empty<string>();
         public bool UnionMerge { get; set; }
         public Version Version { get; set; }
+        public bool PreserveTimestamp { get; set; }
         public bool SkipConfigMerge { get; set; }
         public bool MergeIlLinkerFiles { get; set; }
         public bool XmlDocumentation { get; set; }
@@ -260,6 +261,7 @@ void Parse()
             var version = cmd.Option("ver");
             if (!string.IsNullOrEmpty(version))
                 Version = new Version(version);
+            PreserveTimestamp = cmd.Modifier("preservetimestamp");
             SkipConfigMerge = cmd.Modifier("skipconfig");
             MergeIlLinkerFiles = cmd.Modifier("illink");
             XmlDocumentation = cmd.Modifier("xmldocs");