NuGet pack "The DateTimeOffset specified cannot be converted into a Zip file timestamp"

src/NuGet.Clients/NuGet.CommandLine/Commands/ProjectFactory.cs

@@ -228,7 +228,7 @@ public Packaging.PackageBuilder CreateBuilder(string basePath, NuGetVersion vers
                         Path.GetFullPath(Path.GetDirectoryName(TargetPath))), LogLevel.Minimal));
             }
 
-            builder = new Packaging.PackageBuilder();
+            builder = new Packaging.PackageBuilder(Logger);
 
             try
             {

src/NuGet.Core/NuGet.Commands/CommandRunners/PackCommandRunner.cs

@@ -720,15 +720,17 @@ private PackageBuilder CreatePackageBuilderFromNuspec(string path)
                     path,
                     _packArgs.GetPropertyValue,
                     !_packArgs.ExcludeEmptyDirectories,
-                    _packArgs.Deterministic);
+                    _packArgs.Deterministic,
+                    _packArgs.Logger);
             }
 
             return new PackageBuilder(
                 path,
                 _packArgs.BasePath,
                 _packArgs.GetPropertyValue,
                 !_packArgs.ExcludeEmptyDirectories,
-                _packArgs.Deterministic);
+                _packArgs.Deterministic,
+                _packArgs.Logger);
         }
 
         private bool BuildFromProjectFile(string path)

src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs

@@ -10,15 +10,13 @@
 using System.IO.Compression;
 using System.Linq;
 using System.Reflection;
-using System.Reflection.Emit;
 using System.Xml.Linq;
 using NuGet.Client;
 using NuGet.Common;
 using NuGet.ContentModel;
 using NuGet.Frameworks;
 using NuGet.Packaging.Core;
 using NuGet.Packaging.PackageCreation.Resources;
-using NuGet.Packaging.Rules;
 using NuGet.RuntimeModel;
 using NuGet.Versioning;
 
@@ -31,6 +29,7 @@ public class PackageBuilder : IPackageMetadata
         private readonly bool _includeEmptyDirectories;
         private readonly bool _deterministic;
         private static readonly DateTime ZipFormatMinDate = new DateTime(1980, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+        private readonly ILogger _logger = NullLogger.Instance;
 
         /// <summary>
         /// Maximum Icon file size: 1 megabyte
@@ -47,11 +46,23 @@ public PackageBuilder(string path, Func<string, string> propertyProvider, bool i
         {
         }
 
+        public PackageBuilder(string path, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, ILogger logger)
+            : this(path, Path.GetDirectoryName(path), propertyProvider, includeEmptyDirectories, deterministic)
+        {
+            _logger = logger;
+        }
+
         public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories)
             : this(path, basePath, propertyProvider, includeEmptyDirectories, deterministic: false)
         {
         }
 
+        public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, ILogger logger)
+            : this(path, basePath, propertyProvider, includeEmptyDirectories, deterministic)
+        {
+            _logger = logger;
+        }
+
         public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic)
             : this(includeEmptyDirectories, deterministic)
         {
@@ -90,6 +101,12 @@ public PackageBuilder()
         {
         }
 
+        public PackageBuilder(ILogger logger)
+            : this(includeEmptyDirectories: false, deterministic: false)
+        {
+            _logger = logger;
+        }
+
         private PackageBuilder(bool includeEmptyDirectories, bool deterministic)
         {
             _includeEmptyDirectories = includeEmptyDirectories;
@@ -893,7 +910,24 @@ private ZipArchiveEntry CreateEntry(ZipArchive package, string entryName, Compre
         private ZipArchiveEntry CreatePackageFileEntry(ZipArchive package, string entryName, DateTimeOffset timeOffset, CompressionLevel compressionLevel)
         {
             var entry = package.CreateEntry(entryName, compressionLevel);
-            entry.LastWriteTime = timeOffset;
+
+            // Here added 3 days, just in case to avoid any possible TimeZone issue, otherwise we hit this when repackaging the files.
+            if (timeOffset < ZipFormatMinDate.AddDays(3))
+            {
+                _logger.Log(
+                    PackagingLogMessage.CreateMessage(
+                        string.Format(
+                            CultureInfo.CurrentCulture,
+                            Strings.ZipFileTimeStampeModified, entryName, timeOffset.DateTime.ToShortDateString(), ZipFormatMinDate.AddDays(3).ToShortDateString()),
+                        LogLevel.Information));
+
+                entry.LastWriteTime = ZipFormatMinDate.AddDays(3);
+            }
+            else
+            {
+                entry.LastWriteTime = timeOffset;
+            }
+
             return entry;
         }
 

src/NuGet.Core/NuGet.Packaging/PublicAPI/net472/PublicAPI.Unshipped.txt

@@ -1,5 +1,8 @@
 NuGet.Packaging.NupkgMetadataFile.Source.get -> string
 NuGet.Packaging.NupkgMetadataFile.Source.set -> void
+NuGet.Packaging.PackageBuilder.PackageBuilder(NuGet.Common.ILogger logger) -> void
+NuGet.Packaging.PackageBuilder.PackageBuilder(string path, System.Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, NuGet.Common.ILogger logger) -> void
+NuGet.Packaging.PackageBuilder.PackageBuilder(string path, string basePath, System.Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, NuGet.Common.ILogger logger) -> void
 static NuGet.Packaging.Rules.AnalysisResources.InvalidUndottedFrameworkInDependencyGroupsWarning.get -> string
 static NuGet.Packaging.Rules.AnalysisResources.InvalidUndottedFrameworkInFilesWarning.get -> string
 static NuGet.Packaging.Rules.AnalysisResources.InvalidUndottedFrameworkInFrameworkAssemblyGroupsWarning.get -> string

src/NuGet.Core/NuGet.Packaging/PublicAPI/netcoreapp5.0/PublicAPI.Unshipped.txt

@@ -1,5 +1,8 @@
 NuGet.Packaging.NupkgMetadataFile.Source.get -> string
 NuGet.Packaging.NupkgMetadataFile.Source.set -> void
+NuGet.Packaging.PackageBuilder.PackageBuilder(NuGet.Common.ILogger logger) -> void
+NuGet.Packaging.PackageBuilder.PackageBuilder(string path, System.Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, NuGet.Common.ILogger logger) -> void
+NuGet.Packaging.PackageBuilder.PackageBuilder(string path, string basePath, System.Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, NuGet.Common.ILogger logger) -> void
 static NuGet.Packaging.Rules.AnalysisResources.InvalidUndottedFrameworkInDependencyGroupsWarning.get -> string
 static NuGet.Packaging.Rules.AnalysisResources.InvalidUndottedFrameworkInFilesWarning.get -> string
 static NuGet.Packaging.Rules.AnalysisResources.InvalidUndottedFrameworkInFrameworkAssemblyGroupsWarning.get -> string

src/NuGet.Core/NuGet.Packaging/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt

@@ -1,5 +1,8 @@
 NuGet.Packaging.NupkgMetadataFile.Source.get -> string
 NuGet.Packaging.NupkgMetadataFile.Source.set -> void
+NuGet.Packaging.PackageBuilder.PackageBuilder(NuGet.Common.ILogger logger) -> void
+NuGet.Packaging.PackageBuilder.PackageBuilder(string path, System.Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, NuGet.Common.ILogger logger) -> void
+NuGet.Packaging.PackageBuilder.PackageBuilder(string path, string basePath, System.Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, NuGet.Common.ILogger logger) -> void
 static NuGet.Packaging.Rules.AnalysisResources.InvalidUndottedFrameworkInDependencyGroupsWarning.get -> string
 static NuGet.Packaging.Rules.AnalysisResources.InvalidUndottedFrameworkInFilesWarning.get -> string
 static NuGet.Packaging.Rules.AnalysisResources.InvalidUndottedFrameworkInFrameworkAssemblyGroupsWarning.get -> string

src/NuGet.Core/NuGet.Packaging/Strings.resx

@@ -859,4 +859,10 @@ Valid from:</comment>
     <value>Some framework assembly reference TFMs are missing a platform version: {0}</value>
     <comment>0 - comma-separated list of reference group TFMs</comment>
   </data>
+  <data name="ZipFileTimeStampeModified" xml:space="preserve">
+    <value>{0} file lastwritetime(modified) timestamp changed from {1} to {2} due to zip file doesn't support timestamp before 01/01/1980 limitation.</value>
+    <comment>0 - Entry name
+1 - original modified timestamp
+2 - new modified timestamp</comment>
+  </data>
 </root>

test/NuGet.Core.Tests/NuGet.Packaging.Test/PackageBuilderTest.cs

@@ -11,8 +11,11 @@
 using System.Xml;
 using System.Xml.Linq;
 using Moq;
+using NuGet.Commands;
+using NuGet.Common;
 using NuGet.Frameworks;
 using NuGet.Packaging.Core;
+using NuGet.ProjectModel;
 using NuGet.Test.Utility;
 using NuGet.Versioning;
 using Xunit;
@@ -2857,6 +2860,74 @@ public void PackageBuilderPreserveFileLastWriteTime()
             }
         }
 
+        [Fact]
+        public void PackageBuilderCorrectLastWriteTimeForZipfileBefore1980()
+        {
+            // https://github.com/NuGet/Home/issues/7001
+            // Act
+            DateTime ZipFormatMinDate = new DateTime(1980, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+            DateTime Year2017Date = new DateTime(2017, 1, 15, 23, 59, 0, DateTimeKind.Utc);
+            var lastWriteTime = new DateTimeOffset(1979, 11, 15, 23, 59, 0, TimeSpan.Zero);
+            int numberOfDateCorrectedFiles = 0;
+            int numberOfDateNotCorrectedFiles = 0;
+            TestLogger innerLogger = new TestLogger();
+            ILogger logger = new PackCollectorLogger(innerLogger, new WarningProperties());
+
+            using (var directory = new TestLastWriteTimeDirectory(lastWriteTime))
+            {
+                var builder = new PackageBuilder(logger) { Id = "test", Version = NuGetVersion.Parse("1.0"), Description = "test" };
+                builder.Authors.Add("test");
+
+                // Create a file that is modified after 1980 and it shouldn't be modified.
+                string after1980File1 = Path.Combine(directory.Path, "After1980.txt");
+                string after1980File2 = Path.Combine(directory.Path, "After1980_2.txt");
+                File.WriteAllText(after1980File1, string.Empty);
+                File.WriteAllText(after1980File2, string.Empty);
+                File.SetLastWriteTime(after1980File1, ZipFormatMinDate.AddDays(3).AddHours(1));
+                File.SetLastWriteTime(after1980File2, Year2017Date);
+
+                builder.AddFiles(directory.Path, "**", "Content");
+
+                using (var stream = new MemoryStream())
+                {
+                    builder.Save(stream);
+
+                    // Assert
+                    using (var archive = new ZipArchive(stream, ZipArchiveMode.Read, leaveOpen: true))
+                    {
+                        foreach (ZipArchiveEntry entry in archive.Entries)
+                        {
+                            string path = Path.Combine(directory.Path, entry.Name);
+                            // Only checks the entries that originated from files in test directory
+                            if (File.Exists(path))
+                            {
+                                if (path == after1980File1)
+                                {
+                                    Assert.Equal(entry.LastWriteTime.DateTime, ZipFormatMinDate.AddDays(3).AddHours(1));
+                                    numberOfDateNotCorrectedFiles++;
+                                }
+                                else if (path == after1980File2)
+                                {
+                                    Assert.Equal(entry.LastWriteTime.DateTime, Year2017Date);
+                                    numberOfDateNotCorrectedFiles++;
+                                }
+                                else
+                                {
+                                    Assert.NotEqual(entry.LastWriteTime.DateTime, File.GetLastWriteTimeUtc(path));
+                                    Assert.Equal(entry.LastWriteTime.DateTime, ZipFormatMinDate.AddDays(3));
+                                    numberOfDateCorrectedFiles++;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Assert.True(numberOfDateNotCorrectedFiles == 2);
+                Assert.True(numberOfDateCorrectedFiles > 0);
+                Assert.Equal(innerLogger.LogMessages.Count(l => l.Message.Contains("file lastwritetime(modified) timestamp changed from")), innerLogger.LogMessages.Count());
+            }
+        }
+
         private static IPackageFile CreatePackageFile(string name)
         {
             var file = new Mock<IPackageFile>();