Re-enable support for deterministic pack

But don't enable the fixed Minimum Zip format timestamps; that can lead
to issues we are not ready to handle yet.

See: NuGet/Home#8601

Author: omajid

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

@@ -103,6 +103,9 @@ public Dictionary<string, string> Properties
         [Option(typeof(NuGetCommand), "PackageCommandConfigFile")]
         public new string ConfigFile { get; set; }
 
+        [Option(typeof(NuGetCommand), "PackageCommandDeterministic")]
+        public bool Deterministic { get; set; }
+
         public override void ExecuteCommand()
         {
             var packArgs = new PackArgs();
@@ -111,6 +114,7 @@ public override void ExecuteCommand()
             packArgs.OutputDirectory = OutputDirectory;
             packArgs.BasePath = BasePath;
             packArgs.MsBuildDirectory = new Lazy<string>(() => MsBuildUtility.GetMsBuildDirectoryFromMsBuildPath(MSBuildPath, MSBuildVersion, Console).Value.Path);
+            packArgs.Deterministic = Deterministic;
 
             if (!string.IsNullOrEmpty(PackagesDirectory))
             {

src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTaskLogic.cs

@@ -42,6 +42,7 @@ public PackArgs GetPackArgs(IPackTaskRequest<IMSBuildItem> request)
                 BasePath = request.NuspecBasePath,
                 NoPackageAnalysis = request.NoPackageAnalysis,
                 NoDefaultExcludes = request.NoDefaultExcludes,
+                Deterministic = request.Deterministic,
                 WarningProperties = WarningProperties.GetWarningProperties(request.TreatWarningsAsErrors, request.WarningsAsErrors, request.NoWarn, request.WarningsNotAsErrors),
                 PackTargetArgs = new MSBuildPackTargetArgs()
             };

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 bool _deterministicDateTime = false;
         private readonly ILogger _logger;
 
         /// <summary>
@@ -118,7 +119,7 @@ private PackageBuilder(bool includeEmptyDirectories, bool deterministic)
         private PackageBuilder(bool includeEmptyDirectories, bool deterministic, ILogger logger)
         {
             _includeEmptyDirectories = includeEmptyDirectories;
-            _deterministic = false; // fix in https://github.com/NuGet/Home/issues/8601
+            _deterministic = deterministic;
             _logger = logger;
             Files = new Collection<IPackageFile>();
             DependencyGroups = new Collection<PackageDependencyGroup>();
@@ -1002,9 +1003,9 @@ public void PopulateFiles(string basePath, IEnumerable<ManifestFile> files)
         private ZipArchiveEntry CreateEntry(ZipArchive package, string entryName, CompressionLevel compressionLevel)
         {
             var entry = package.CreateEntry(entryName, compressionLevel);
-            if (_deterministic)
+            if (_deterministicDateTime)
             {
-                entry.LastWriteTime = ZipFormatMinDate;
+                entry.LastWriteTime = ZipFormatMinDate; // Or something better
             }
             return entry;
         }
@@ -1060,7 +1061,7 @@ private SortedSet<string> WriteFiles(ZipArchive package, SortedSet<string> files
                         package,
                         file.Path,
                         stream,
-                        lastWriteTime: _deterministic ? ZipFormatMinDate : file.LastWriteTime,
+                        lastWriteTime: _deterministicDateTime ? ZipFormatMinDate : file.LastWriteTime,
                         warningMessage);
                     var fileExtension = Path.GetExtension(file.Path);
 

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();

test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs

@@ -4951,7 +4951,7 @@ 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()
         {
             using (var testDirectory = _dotnetFixture.CreateTestDirectory())