Re-enable support for deterministic pack

omajid · omajid · commit 8e626f94c54f · 2026-02-27T07:03:49.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/src/NuGet.Clients/NuGet.CommandLine/Commands/PackCommand.cs b/src/NuGet.Clients/NuGet.CommandLine/Commands/PackCommand.cs
@@ -103,6 +103,12 @@ public Dictionary<string, string> Properties
         [Option(typeof(NuGetCommand), "PackageCommandConfigFile")]
         public new string ConfigFile { get; set; }
 
+        [Option(typeof(NuGetCommand), "PackageCommandDeterministic")]
+        public bool Deterministic { get; set; }
+
+        [Option(typeof(NuGetCommand), "PackageCommandDeterministicTimestamp")]
+        public string DeterministicTimestamp { get; set; }
+
         public override void ExecuteCommand()
         {
             var packArgs = new PackArgs();
@@ -111,6 +117,8 @@ 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;
+            packArgs.DeterministicTimestamp = DeterministicTimestamp;
 
             if (!string.IsNullOrEmpty(PackagesDirectory))
             {
diff --git a/src/NuGet.Clients/NuGet.CommandLine/NuGetCommand.Designer.cs b/src/NuGet.Clients/NuGet.CommandLine/NuGetCommand.Designer.cs
diff --git a/src/NuGet.Clients/NuGet.CommandLine/NuGetCommand.resx b/src/NuGet.Clients/NuGet.CommandLine/NuGetCommand.resx
@@ -841,6 +841,9 @@ nuget trusted-signers Remove -Name TrustedRepo</value>
   <data name="PackageCommandDeterministic" xml:space="preserve">
     <value>Specify if the command should create a deterministic package. Multiple invocations of the pack command will create the exact same package.</value>
   </data>
+  <data name="PackageCommandDeterministicTimestamp" xml:space="preserve">
+    <value>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</value>
+  </data>
   <data name="ClientCertificatesCommandFilePathDescription" xml:space="preserve">
     <value>Path to certificate file.</value>
   </data>
diff --git a/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.cs.xlf b/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.cs.xlf
@@ -601,6 +601,11 @@ nuget pack foo.nuspec -Version 2.1.0</target>
         <target state="translated">Určete, jestli má příkaz vytvořit deterministický balíček. Vícenásobné vyvolání příkazu pack vytvoří úplně stejný balíček.</target>
         <note />
       </trans-unit>
+      <trans-unit id="PackageCommandDeterministicTimestamp">
+        <source>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</source>
+        <target state="new">Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="PackageCommandExcludeDescription">
         <source>Specifies one or more wildcard patterns to exclude when creating a package.</source>
         <target state="translated">Určuje nejméně jeden vzor zástupných znaků, který se má vyloučit při vytváření balíčku.</target>
diff --git a/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.de.xlf b/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.de.xlf
@@ -601,6 +601,11 @@ nuget pack foo.nuspec -Version 2.1.0</target>
         <target state="translated">Geben Sie an, ob der Befehl ein deterministisches Paket erstellen soll. Durch mehrere Aufrufe des Paketbefehls wird genau dasselbe Paket erstellt.</target>
         <note />
       </trans-unit>
+      <trans-unit id="PackageCommandDeterministicTimestamp">
+        <source>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</source>
+        <target state="new">Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="PackageCommandExcludeDescription">
         <source>Specifies one or more wildcard patterns to exclude when creating a package.</source>
         <target state="translated">Gibt mindestens ein Platzhaltermuster an, das beim Erstellen eines Pakets ausgeschlossen werden soll.</target>
diff --git a/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.es.xlf b/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.es.xlf
@@ -601,6 +601,11 @@ nuget pack foo.nuspec -Version 2.1.0</target>
         <target state="translated">Especifique si el comando debe crear un paquete determinista. Varias invocaciones del comando pack crearán exactamente el mismo paquete.</target>
         <note />
       </trans-unit>
+      <trans-unit id="PackageCommandDeterministicTimestamp">
+        <source>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</source>
+        <target state="new">Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="PackageCommandExcludeDescription">
         <source>Specifies one or more wildcard patterns to exclude when creating a package.</source>
         <target state="translated">Especifica uno o varios patrones de comodines que se excluirán al crear un paquete.</target>
diff --git a/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.fr.xlf b/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.fr.xlf
@@ -601,6 +601,11 @@ nuget pack foo.nuspec -Version 2.1.0</target>
         <target state="translated">Spécifiez si la commande doit créer un package déterministe. Plusieurs appels de la commande pack créent exactement le même package.</target>
         <note />
       </trans-unit>
+      <trans-unit id="PackageCommandDeterministicTimestamp">
+        <source>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</source>
+        <target state="new">Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="PackageCommandExcludeDescription">
         <source>Specifies one or more wildcard patterns to exclude when creating a package.</source>
         <target state="translated">Spécifie un ou plusieurs modèles à caractère générique à exclure durant la création d'un package.</target>
diff --git a/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.it.xlf b/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.it.xlf
@@ -601,6 +601,11 @@ nuget pack foo.nuspec -Version 2.1.0</target>
         <target state="translated">Specificare se il comando deve creare un pacchetto deterministico. Le chiamate multiple del comando pack creeranno lo stesso pacchetto.</target>
         <note />
       </trans-unit>
+      <trans-unit id="PackageCommandDeterministicTimestamp">
+        <source>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</source>
+        <target state="new">Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="PackageCommandExcludeDescription">
         <source>Specifies one or more wildcard patterns to exclude when creating a package.</source>
         <target state="translated">Specifica uno o più caratteri jolly da escludere durante la creazione di un pacchetto.</target>
diff --git a/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.ja.xlf b/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.ja.xlf
@@ -601,6 +601,11 @@ nuget pack foo.nuspec -Version 2.1.0</target>
         <target state="translated">コマンドで決定論的パッケージを作成する必要があるかどうかを指定します。パック コマンドを複数回呼び出すと、まったく同じパッケージが作成されます。</target>
         <note />
       </trans-unit>
+      <trans-unit id="PackageCommandDeterministicTimestamp">
+        <source>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</source>
+        <target state="new">Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="PackageCommandExcludeDescription">
         <source>Specifies one or more wildcard patterns to exclude when creating a package.</source>
         <target state="translated">パッケージの作成時に除外する 1 つまたは複数のワイルドカード パターンを指定します。</target>
diff --git a/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.ko.xlf b/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.ko.xlf
@@ -601,6 +601,11 @@ nuget pack foo.nuspec -Version 2.1.0</target>
         <target state="translated">명령이 결정적 패키지를 생성해야 하는지 여부를 지정합니다. pack 명령을 여러 번 호출하면 정확히 동일한 패키지가 생성됩니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="PackageCommandDeterministicTimestamp">
+        <source>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</source>
+        <target state="new">Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="PackageCommandExcludeDescription">
         <source>Specifies one or more wildcard patterns to exclude when creating a package.</source>
         <target state="translated">패키지를 만들 때 제외할 와일드카드 패턴을 하나 이상 지정합니다.</target>
diff --git a/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.pl.xlf b/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.pl.xlf
@@ -601,6 +601,11 @@ nuget pack foo.nuspec -Version 2.1.0</target>
         <target state="translated">Określ, czy polecenie powinno utworzyć pakiet deterministyczny. Wiele wywołań polecenia pakietu spowoduje utworzenie dokładnie tego samego pakietu.</target>
         <note />
       </trans-unit>
+      <trans-unit id="PackageCommandDeterministicTimestamp">
+        <source>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</source>
+        <target state="new">Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="PackageCommandExcludeDescription">
         <source>Specifies one or more wildcard patterns to exclude when creating a package.</source>
         <target state="translated">Określa co najmniej jeden wzorzec symboli wieloznacznych do wykluczenia podczas tworzenia pakietu.</target>
diff --git a/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.pt-BR.xlf b/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.pt-BR.xlf
@@ -601,6 +601,11 @@ nuget pack foo.nuspec -Version 2.1.0</target>
         <target state="translated">Especifique se o comando deve criar um pacote determinístico. Várias invocações do comando pack criarão exatamente o mesmo pacote.</target>
         <note />
       </trans-unit>
+      <trans-unit id="PackageCommandDeterministicTimestamp">
+        <source>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</source>
+        <target state="new">Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="PackageCommandExcludeDescription">
         <source>Specifies one or more wildcard patterns to exclude when creating a package.</source>
         <target state="translated">Especifica um ou mais padrões de curinga a serem excluídos ao criar um pacote.</target>
diff --git a/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.ru.xlf b/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.ru.xlf
@@ -601,6 +601,11 @@ nuget pack foo.nuspec -Version 2.1.0</target>
         <target state="translated">Укажите, должна ли эта команда создавать детерминированный пакет. Если вызвать команду упаковки несколько раз, будет создаваться одинаковый пакет.</target>
         <note />
       </trans-unit>
+      <trans-unit id="PackageCommandDeterministicTimestamp">
+        <source>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</source>
+        <target state="new">Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="PackageCommandExcludeDescription">
         <source>Specifies one or more wildcard patterns to exclude when creating a package.</source>
         <target state="translated">Задает шаблоны подстановочных знаков, которые нужно исключить при создании пакета.</target>
diff --git a/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.tr.xlf b/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.tr.xlf
@@ -601,6 +601,11 @@ nuget pack foo.nuspec -Sürüm 2.1.0</target>
         <target state="translated">Komutun belirleyici bir paket oluşturması gerekip gerekmediğini belirtin. Paket komutunun birden çok çağrısı aynı paketi oluşturur.</target>
         <note />
       </trans-unit>
+      <trans-unit id="PackageCommandDeterministicTimestamp">
+        <source>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</source>
+        <target state="new">Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="PackageCommandExcludeDescription">
         <source>Specifies one or more wildcard patterns to exclude when creating a package.</source>
         <target state="translated">Bir paket oluşturulurken hariç tutulacak bir veya daha fazla joker karakter desenini belirtir.</target>
diff --git a/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.zh-Hans.xlf b/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.zh-Hans.xlf
@@ -601,6 +601,11 @@ nuget pack foo.nuspec -Version 2.1.0</target>
         <target state="translated">指定命令是否应创建确定性包。多次调用包命令将创建完全相同的包。</target>
         <note />
       </trans-unit>
+      <trans-unit id="PackageCommandDeterministicTimestamp">
+        <source>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</source>
+        <target state="new">Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="PackageCommandExcludeDescription">
         <source>Specifies one or more wildcard patterns to exclude when creating a package.</source>
         <target state="translated">创建包时指定一个或多个要排除的通配符模式。</target>
diff --git a/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.zh-Hant.xlf b/src/NuGet.Clients/NuGet.CommandLine/xlf/NuGetCommand.zh-Hant.xlf
@@ -601,6 +601,11 @@ nuget pack foo.nuspec -Version 2.1.0</target>
         <target state="translated">指定命令是否應該建立確定性封裝。多次呼叫封裝命令將會建立完全相同的封裝。</target>
         <note />
       </trans-unit>
+      <trans-unit id="PackageCommandDeterministicTimestamp">
+        <source>Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</source>
+        <target state="new">Specify the timestamp this command should use when creating a deterministic package. Multiple invocations of the pack command will create the exact same package.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="PackageCommandExcludeDescription">
         <source>Specifies one or more wildcard patterns to exclude when creating a package.</source>
         <target state="translated">指定一或多個在建立套件時要排除的萬用字元模式。</target>
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
diff --git a/src/NuGet.Core/NuGet.Commands/PublicAPI/net472/PublicAPI.Shipped.txt b/src/NuGet.Core/NuGet.Commands/PublicAPI/net472/PublicAPI.Shipped.txt
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
diff --git a/src/NuGet.Core/NuGet.Packaging/GlobalSuppressions.cs b/src/NuGet.Core/NuGet.Packaging/GlobalSuppressions.cs
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs
diff --git a/src/NuGet.Core/NuGet.Packaging/PublicAPI/net472/PublicAPI.Shipped.txt b/src/NuGet.Core/NuGet.Packaging/PublicAPI/net472/PublicAPI.Shipped.txt
diff --git a/src/NuGet.Core/NuGet.Packaging/PublicAPI/net8.0/PublicAPI.Shipped.txt b/src/NuGet.Core/NuGet.Packaging/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/test/NuGet.Clients.Tests/NuGet.CommandLine.Test/NuGetPackCommandTest.cs b/test/NuGet.Clients.Tests/NuGet.CommandLine.Test/NuGetPackCommandTest.cs
diff --git a/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs b/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs
