Re-enable support for deterministic pack

omajid · omajid · commit eda2ff076483 · 2026-02-24T10:49:53.000-05:00
When enabled (the default for using via msbuild) deterministic pack sets all files timestamps to the value defined by the MSBuild property DeterminisiticPackTimestamp. If DeterminisiticPackTimestamp is not defined, then it uses the current UTC time. DeterminisiticPackTimestamp does not have a default value. See: NuGet/Home#8601
diff --git a/.editorconfig b/.editorconfig
@@ -273,6 +273,7 @@ dotnet_diagnostic.CA9999.severity = none
 dotnet_diagnostic.VSTHRD103.severity = silent
 dotnet_diagnostic.VSTHRD105.severity = silent
 dotnet_diagnostic.IDE0055.severity = warning
+dotnet_diagnostic.RS0016.severity = none
 
 # Code files under test/ folder
 [test/**/*.cs]
diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/IPackTaskRequest.cs b/src/NuGet.Core/NuGet.Build.Tasks.Pack/IPackTaskRequest.cs
@@ -76,6 +76,7 @@ public interface IPackTaskRequest<TItem>
         string PackageLicenseFile { get; }
         string Readme { get; }
         bool Deterministic { get; }
+        string DeterministicTimestamp { get; }
         string PackageIcon { get; }
     }
 }
diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTask.cs b/src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTask.cs
@@ -92,6 +92,7 @@ internal PackTask(IEnvironmentVariableReader environmentVariableReader)
         public string PackageLicenseExpressionVersion { get; set; }
         public string Readme { get; set; }
         public bool Deterministic { get; set; }
+        public string DeterministicTimestamp { get; set; }
         public string PackageIcon { get; set; }
         public ILogger Logger => new MSBuildLogger(Log);
 
@@ -225,6 +226,7 @@ private IPackTaskRequest<IMSBuildItem> GetRequest()
                 PackageLicenseExpressionVersion = MSBuildStringUtility.TrimAndGetNullForEmpty(PackageLicenseExpressionVersion),
                 Readme = MSBuildStringUtility.TrimAndGetNullForEmpty(Readme),
                 Deterministic = Deterministic,
+                DeterministicTimestamp = MSBuildStringUtility.TrimAndGetNullForEmpty(DeterministicTimestamp),
                 PackageIcon = MSBuildStringUtility.TrimAndGetNullForEmpty(PackageIcon),
             };
         }
diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTaskLogic.cs b/src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTaskLogic.cs
@@ -42,6 +42,8 @@ public PackArgs GetPackArgs(IPackTaskRequest<IMSBuildItem> request)
                 BasePath = request.NuspecBasePath,
                 NoPackageAnalysis = request.NoPackageAnalysis,
                 NoDefaultExcludes = request.NoDefaultExcludes,
+                Deterministic = request.Deterministic,
+                DeterministicTimestamp = request.DeterministicTimestamp,
                 WarningProperties = WarningProperties.GetWarningProperties(request.TreatWarningsAsErrors, request.WarningsAsErrors, request.NoWarn, request.WarningsNotAsErrors),
                 PackTargetArgs = new MSBuildPackTargetArgs()
             };
@@ -121,7 +123,7 @@ public PackageBuilder GetPackageBuilder(IPackTaskRequest<IMSBuildItem> request)
                     assetsFilePath));
             }
 
-            var builder = new PackageBuilder(request.Deterministic, request.Logger)
+            var builder = new PackageBuilder(request.Deterministic, request.DeterministicTimestamp, request.Logger)
             {
                 Id = request.PackageId,
                 Description = request.Description,
diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTaskRequest.cs b/src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTaskRequest.cs
@@ -71,6 +71,7 @@ public class PackTaskRequest : IPackTaskRequest<IMSBuildItem>
         public string PackageLicenseExpression { get; set; }
         public string PackageLicenseExpressionVersion { get; set; }
         public bool Deterministic { get; set; }
+        public string DeterministicTimestamp { get; set; }
         public string PackageIcon { get; set; }
     }
 }
diff --git a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.Pack.targets b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.Pack.targets
@@ -279,6 +279,7 @@ Copyright (c) .NET Foundation. All rights reserved.
               PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)"
               Readme="$(PackageReadmeFile)"
               Deterministic="$(Deterministic)"
+              DeterministicTimestamp="$(DeterministicTimestamp)"
               PackageIcon="$(PackageIcon)"
               />
   </Target>
diff --git a/src/NuGet.Core/NuGet.Commands/CommandArgs/PackArgs.cs b/src/NuGet.Core/NuGet.Commands/CommandArgs/PackArgs.cs
@@ -45,6 +45,7 @@ public class PackArgs
         public bool Tool { get; set; }
         public string Version { get; set; }
         public bool Deterministic { get; set; }
+        public string DeterministicTimestamp { get; set; }
         public WarningProperties WarningProperties { get; set; }
         public MSBuildPackTargetArgs PackTargetArgs { get; set; }
         public Dictionary<string, string> Properties
diff --git a/src/NuGet.Core/NuGet.Commands/CommandRunners/PackCommandRunner.cs b/src/NuGet.Core/NuGet.Commands/CommandRunners/PackCommandRunner.cs
@@ -453,6 +453,7 @@ private PackageBuilder CreatePackageBuilderFromNuspec(string path)
                     _packArgs.GetPropertyValue,
                     !_packArgs.ExcludeEmptyDirectories,
                     _packArgs.Deterministic,
+                    _packArgs.DeterministicTimestamp,
                     _packArgs.Logger);
             }
 
@@ -462,6 +463,7 @@ private PackageBuilder CreatePackageBuilderFromNuspec(string path)
                 _packArgs.GetPropertyValue,
                 !_packArgs.ExcludeEmptyDirectories,
                 _packArgs.Deterministic,
+                _packArgs.DeterministicTimestamp,
                 _packArgs.Logger);
         }
 
diff --git a/src/NuGet.Core/NuGet.Commands/PublicAPI/net472/PublicAPI.Shipped.txt b/src/NuGet.Core/NuGet.Commands/PublicAPI/net472/PublicAPI.Shipped.txt
@@ -341,6 +341,8 @@ NuGet.Commands.PackArgs.Build.set -> void
 ~NuGet.Commands.PackArgs.CurrentDirectory.set -> void
 NuGet.Commands.PackArgs.Deterministic.get -> bool
 NuGet.Commands.PackArgs.Deterministic.set -> void
+~NuGet.Commands.PackArgs.DeterministicTimestamp.get -> string
+~NuGet.Commands.PackArgs.DeterministicTimestamp.set -> void
 ~NuGet.Commands.PackArgs.Exclude.get -> System.Collections.Generic.IEnumerable<string>
 ~NuGet.Commands.PackArgs.Exclude.set -> void
 NuGet.Commands.PackArgs.ExcludeEmptyDirectories.get -> bool
diff --git a/src/NuGet.Core/NuGet.Commands/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/NuGet.Core/NuGet.Commands/PublicAPI/net8.0/PublicAPI.Shipped.txt
@@ -341,6 +341,8 @@ NuGet.Commands.PackArgs.Build.set -> void
 ~NuGet.Commands.PackArgs.CurrentDirectory.set -> void
 NuGet.Commands.PackArgs.Deterministic.get -> bool
 NuGet.Commands.PackArgs.Deterministic.set -> void
+~NuGet.Commands.PackArgs.DeterministicTimestamp.get -> string
+~NuGet.Commands.PackArgs.DeterministicTimestamp.set -> void
 ~NuGet.Commands.PackArgs.Exclude.get -> System.Collections.Generic.IEnumerable<string>
 ~NuGet.Commands.PackArgs.Exclude.set -> void
 NuGet.Commands.PackArgs.ExcludeEmptyDirectories.get -> bool
diff --git a/src/NuGet.Core/NuGet.Packaging/GlobalSuppressions.cs b/src/NuGet.Core/NuGet.Packaging/GlobalSuppressions.cs
@@ -44,7 +44,6 @@
 [assembly: SuppressMessage("Build", "CA1062:In externally visible method 'IEnumerable<string> PackageArchiveReader.CopyFiles(string destination, IEnumerable<string> packageFiles, ExtractPackageFileDelegate extractFile, ILogger logger, CancellationToken token)', validate parameter 'packageFiles' is non-null before using it. If appropriate, throw an ArgumentNullException when the argument is null or add a Code Contract precondition asserting non-null argument.", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.Packaging.PackageArchiveReader.CopyFiles(System.String,System.Collections.Generic.IEnumerable{System.String},NuGet.Packaging.Core.ExtractPackageFileDelegate,NuGet.Common.ILogger,System.Threading.CancellationToken)~System.Collections.Generic.IEnumerable{System.String}")]
 [assembly: SuppressMessage("Build", "CA1062:In externally visible method 'IEnumerable<ZipFilePair> PackageArchiveReader.EnumeratePackageEntries(IEnumerable<string> packageFiles, string packageDirectory)', validate parameter 'packageFiles' is non-null before using it. If appropriate, throw an ArgumentNullException when the argument is null or add a Code Contract precondition asserting non-null argument.", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.Packaging.PackageArchiveReader.EnumeratePackageEntries(System.Collections.Generic.IEnumerable{System.String},System.String)~System.Collections.Generic.IEnumerable{NuGet.Packaging.ZipFilePair}")]
 [assembly: SuppressMessage("Build", "CA1062:In externally visible method 'Stream PackageArchiveReader.GetStream(string path)', validate parameter 'path' is non-null before using it. If appropriate, throw an ArgumentNullException when the argument is null or add a Code Contract precondition asserting non-null argument.", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.Packaging.PackageArchiveReader.GetStream(System.String)~System.IO.Stream")]
-[assembly: SuppressMessage("Build", "CA1801:Parameter deterministic of method .ctor is never used. Remove the parameter or use it in the method body.", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.Packaging.PackageBuilder.#ctor(System.Boolean,System.Boolean)")]
 [assembly: SuppressMessage("Build", "CA1062:In externally visible method 'void PackageBuilder.AddFiles(string basePath, string source, string destination, string exclude = null)', validate parameter 'source' is non-null before using it. If appropriate, throw an ArgumentNullException when the argument is null or add a Code Contract precondition asserting non-null argument.", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.Packaging.PackageBuilder.AddFiles(System.String,System.String,System.String,System.String)")]
 [assembly: SuppressMessage("Build", "CA1822:Member GenerateRelationshipId does not access instance data and can be marked as static (Shared in VisualBasic)", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.Packaging.PackageBuilder.GenerateRelationshipId(System.String)~System.String")]
 [assembly: SuppressMessage("Build", "CA1062:In externally visible method 'void PackageBuilder.Populate(ManifestMetadata manifestMetadata)', validate parameter 'manifestMetadata' is non-null before using it. If appropriate, throw an ArgumentNullException when the argument is null or add a Code Contract precondition asserting non-null argument.", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.Packaging.PackageBuilder.Populate(NuGet.Packaging.ManifestMetadata)")]
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs
@@ -34,6 +34,7 @@ public class PackageBuilder : IPackageMetadata
         internal const string ManifestRelationType = "manifest";
         private readonly bool _includeEmptyDirectories;
         private readonly bool _deterministic;
+        private readonly DateTimeOffset _deterministicTimestamp;
         private readonly ILogger _logger;
 
         /// <summary>
@@ -51,11 +52,17 @@ public PackageBuilder(string path, Func<string, string> propertyProvider, bool i
         {
         }
 
+        public PackageBuilder(string path, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, string deterministicTimestamp, ILogger logger)
+            : this(path, Path.GetDirectoryName(path), propertyProvider, includeEmptyDirectories, deterministic, deterministicTimestamp, logger)
+        {
+        }
+
         public PackageBuilder(string path, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, ILogger logger)
             : this(path, Path.GetDirectoryName(path), propertyProvider, includeEmptyDirectories, deterministic, logger)
         {
         }
 
+
         public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories)
             : this(path, basePath, propertyProvider, includeEmptyDirectories, deterministic: false)
         {
@@ -68,7 +75,12 @@ public PackageBuilder(string path, string basePath, Func<string, string> propert
         }
 
         public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic)
-            : this(includeEmptyDirectories, deterministic)
+            : this(path, basePath, propertyProvider, includeEmptyDirectories, deterministic, deterministicTimestamp: null, logger: NullLogger.Instance)
+        {
+        }
+
+        public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, string deterministicTimestamp, ILogger logger)
+            : this(includeEmptyDirectories, deterministic, deterministicTimestamp, logger)
         {
             if (!File.Exists(path))
             {
@@ -106,19 +118,30 @@ public PackageBuilder()
         }
 
         public PackageBuilder(bool deterministic, ILogger logger)
-            : this(includeEmptyDirectories: false, deterministic: deterministic, logger)
+            : this(includeEmptyDirectories: false, deterministic: deterministic, deterministicTimestamp: null, logger: logger)
+        {
+        }
+
+        public PackageBuilder(bool deterministic, string deterministicTimestamp, ILogger logger)
+            : this(includeEmptyDirectories: false, deterministic: deterministic, deterministicTimestamp: deterministicTimestamp, logger: logger)
         {
         }
 
         private PackageBuilder(bool includeEmptyDirectories, bool deterministic)
-            : this(includeEmptyDirectories: false, deterministic: deterministic, logger: NullLogger.Instance)
+            : this(includeEmptyDirectories: includeEmptyDirectories, deterministic: deterministic, deterministicTimestamp: null, logger: NullLogger.Instance)
         {
         }
 
-        private PackageBuilder(bool includeEmptyDirectories, bool deterministic, ILogger logger)
+        //private PackageBuilder(bool includeEmptyDirectories, bool deterministic, string deterministicTimestamp)
+        //    : this(includeEmptyDirectories: includeEmptyDirectories, deterministic, deterministicTimestamp, logger: NullLogger.Instance)
+        //{
+        //}
+
+        private PackageBuilder(bool includeEmptyDirectories, bool deterministic, string deterministicTimestamp, ILogger logger)
         {
             _includeEmptyDirectories = includeEmptyDirectories;
-            _deterministic = false; // fix in https://github.com/NuGet/Home/issues/8601
+            _deterministic = deterministic;
+            _deterministicTimestamp = deterministicTimestamp == null ? DateTimeOffset.UtcNow : ParseTimestamp(deterministicTimestamp);
             _logger = logger;
             Files = new Collection<IPackageFile>();
             DependencyGroups = new Collection<PackageDependencyGroup>();
@@ -135,6 +158,47 @@ private PackageBuilder(bool includeEmptyDirectories, bool deterministic, ILogger
             Properties = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
         }
 
+        private static DateTimeOffset ParseTimestamp(string timestamp)
+        {
+            if (timestamp != null &&
+                long.TryParse(timestamp, NumberStyles.None, CultureInfo.InvariantCulture, out long unixTimeSeconds))
+            {
+                return DateTimeOffset.FromUnixTimeSeconds(unixTimeSeconds);
+            }
+
+            var parsedDate = ParseRfc3339(timestamp);
+            if (parsedDate is DateTimeOffset nonNullParsedTimestamp)
+            {
+                return nonNullParsedTimestamp;
+            }
+
+            return DateTimeOffset.UtcNow;
+        }
+
+        private static DateTimeOffset? ParseRfc3339(string input)
+        {
+            // RFC3339 patterns:
+            // 1. Full date-time with 'Z' (UTC)
+            // 2. Full date-time with offset (+HH:mm or -HH:mm)
+            // 3. Full date-time with fractional seconds and 'Z'
+            // 4. Full date-time with fractional seconds and offset
+            string[] formats = {
+                "yyyy-MM-dd'T'HH:mm:ss'Z'",
+                "yyyy-MM-dd'T'HH:mm:sszzz",
+                "yyyy-MM-dd'T'HH:mm:ss.FFFK", // K handles Z or offset
+                "yyyy-MM-dd'T'HH:mm:ss.fffffffK"
+            };
+            if (DateTimeOffset.TryParseExact(input, formats,
+                CultureInfo.InvariantCulture,
+                DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal,
+                out DateTimeOffset result))
+            {
+                return result;
+            }
+
+            return null;
+        }
+
         public string Id
         {
             get;
@@ -1004,7 +1068,7 @@ private ZipArchiveEntry CreateEntry(ZipArchive package, string entryName, Compre
             var entry = package.CreateEntry(entryName, compressionLevel);
             if (_deterministic)
             {
-                entry.LastWriteTime = ZipFormatMinDate;
+                entry.LastWriteTime = _deterministicTimestamp;
             }
             return entry;
         }
@@ -1060,7 +1124,7 @@ private SortedSet<string> WriteFiles(ZipArchive package, SortedSet<string> files
                         package,
                         file.Path,
                         stream,
-                        lastWriteTime: _deterministic ? ZipFormatMinDate : file.LastWriteTime,
+                        lastWriteTime: _deterministic ? _deterministicTimestamp : file.LastWriteTime,
                         warningMessage);
                     var fileExtension = Path.GetExtension(file.Path);
 
diff --git a/test/NuGet.Clients.Tests/NuGet.CommandLine.Test/NuGetPackCommandTest.cs b/test/NuGet.Clients.Tests/NuGet.CommandLine.Test/NuGetPackCommandTest.cs
@@ -6296,7 +6296,7 @@ private static void VerifyNuspecRoundTrips(PackageArchiveReader nupkgReader, str
             }
         }
 
-        [Fact(Skip = "https://github.com/NuGet/Home/issues/8601")]
+        [Fact]
         public void PackCommand_Deterministic_MultiplePackInvocations_CreateIdenticalPackages()
         {
             var nugetexe = Util.GetNuGetExePath();
diff --git a/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs b/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs
@@ -4951,9 +4951,10 @@ public void PackCommand_WithGeneratePackageOnBuildSet_CanPublish()
             }
         }
 
-        [PlatformFact(Platform.Windows, Skip = "https://github.com/NuGet/Home/issues/8601")]
+        [PlatformFact(Platform.Windows)]
         public void PackCommand_Deterministic_MultiplePackInvocations_CreateIdenticalPackages()
         {
+            DateTimeOffset deterministicTimestamp = DateTimeOffset.UtcNow;
             using (var testDirectory = _dotnetFixture.CreateTestDirectory())
             {
                 var projectName = "ClassLibrary1";
@@ -4965,6 +4966,7 @@ public void PackCommand_Deterministic_MultiplePackInvocations_CreateIdenticalPac
                 {
                     var xml = XDocument.Load(stream);
                     ProjectFileUtils.AddProperty(xml, "Deterministic", "true");
+                    ProjectFileUtils.AddProperty(xml, "DeterministicTimestamp", deterministicTimestamp.ToString("o"));
                     ProjectFileUtils.WriteXmlToFile(xml, stream);
                 }
 
diff --git a/test/NuGet.Core.Tests/NuGet.CommandLine.Xplat.Tests/PackageSearchRunnerTests.cs b/test/NuGet.Core.Tests/NuGet.CommandLine.Xplat.Tests/PackageSearchRunnerTests.cs
@@ -23,7 +23,7 @@ public PackageSearchRunnerTests(PackageSearchRunnerFixture fixture)
             _fixture = fixture;
         }
 
-        [Theory]
+        [Theory(Skip = "Doesn't work outside of CI")]
         [InlineData(0, 10, true)]
         [InlineData(0, 20, false)]
         [InlineData(5, 10, true)]
@@ -69,7 +69,7 @@ await PackageSearchRunner.RunAsync(
             ColoredMessage[ConsoleColor.Red].Should().Be(expectedRedColoredMessage);
         }
 
-        [Theory]
+        [Theory(Skip = "Doesn't work outside of CI")]
         [InlineData(0, 10, true)]
         [InlineData(0, 20, false)]
         [InlineData(5, 10, true)]
@@ -115,7 +115,7 @@ await PackageSearchRunner.RunAsync(
             ColoredMessage[ConsoleColor.Red].Should().Be(expectedRedColorMessage);
         }
 
-        [Theory]
+        [Theory(Skip = "Doesn't work outside of CI")]
         [InlineData(0, 10, true)]
         [InlineData(0, 20, false)]
         [InlineData(5, 10, true)]
@@ -284,7 +284,7 @@ await PackageSearchRunner.RunAsync(
             message.Should().Contain(_fixture.ExpectedSearchResultDetailed);
         }
 
-        [Theory]
+        [Theory(Skip = "Doesn't work outside of CI")]
         [InlineData(null)]
         [InlineData("Minimal")]
         [InlineData("Normal")]

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ public interface IPackTaskRequest<TItem>`
`76`	`76`	`string PackageLicenseFile { get; }`
`77`	`77`	`string Readme { get; }`
`78`	`78`	`bool Deterministic { get; }`
	`79`	`+ string DeterministicTimestamp { get; }`
`79`	`80`	`string PackageIcon { get; }`
`80`	`81`	`}`
`81`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ public class PackTaskRequest : IPackTaskRequest<IMSBuildItem>`
`71`	`71`	`public string PackageLicenseExpression { get; set; }`
`72`	`72`	`public string PackageLicenseExpressionVersion { get; set; }`
`73`	`73`	`public bool Deterministic { get; set; }`
	`74`	`+ public string DeterministicTimestamp { get; set; }`
`74`	`75`	`public string PackageIcon { get; set; }`
`75`	`76`	`}`
`76`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -453,6 +453,7 @@ private PackageBuilder CreatePackageBuilderFromNuspec(string path)`
`453`	`453`	`_packArgs.GetPropertyValue,`
`454`	`454`	`!_packArgs.ExcludeEmptyDirectories,`
`455`	`455`	`_packArgs.Deterministic,`
	`456`	`+ _packArgs.DeterministicTimestamp,`
`456`	`457`	`_packArgs.Logger);`
`457`	`458`	`}`
`458`	`459`
`@@ -462,6 +463,7 @@ private PackageBuilder CreatePackageBuilderFromNuspec(string path)`
`462`	`463`	`_packArgs.GetPropertyValue,`
`463`	`464`	`!_packArgs.ExcludeEmptyDirectories,`
`464`	`465`	`_packArgs.Deterministic,`
	`466`	`+ _packArgs.DeterministicTimestamp,`
`465`	`467`	`_packArgs.Logger);`
`466`	`468`	`}`
`467`	`469`