From 544fafcc303419e2f201b7e78e25e15f17e0ff63 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Tue, 17 Sep 2019 16:10:20 -0700 Subject: [PATCH 1/2] work --- .../NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs | 2 +- .../NuGet.CommandLine.Test/NuGetPackCommandTest.cs | 2 +- .../Dotnet.Integration.Test/PackCommandTests.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs index 4b7a4613d32..561fa6ceaa8 100644 --- a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs +++ b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs @@ -91,7 +91,7 @@ public PackageBuilder() private PackageBuilder(bool includeEmptyDirectories, bool deterministic) { _includeEmptyDirectories = includeEmptyDirectories; - _deterministic = deterministic; + _deterministic = false; Files = new Collection(); DependencyGroups = new Collection(); FrameworkReferences = new Collection(); diff --git a/test/NuGet.Clients.Tests/NuGet.CommandLine.Test/NuGetPackCommandTest.cs b/test/NuGet.Clients.Tests/NuGet.CommandLine.Test/NuGetPackCommandTest.cs index 439bb66859e..95811cd9351 100644 --- a/test/NuGet.Clients.Tests/NuGet.CommandLine.Test/NuGetPackCommandTest.cs +++ b/test/NuGet.Clients.Tests/NuGet.CommandLine.Test/NuGetPackCommandTest.cs @@ -5970,7 +5970,7 @@ private static void VerifyNuspecRoundTrips(PackageArchiveReader nupkgReader, str } } - [Fact] + [Fact(Skip = "https://github.com/NuGet/Home/issues/8601")] 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 index b4a860c0c82..4d7eda2bb6f 100644 --- a/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs +++ b/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs @@ -3967,7 +3967,7 @@ public void PackCommand_WithGeneratePackageOnBuildSet_CanPublish() } } - [PlatformFact(Platform.Windows)] + [PlatformFact(Platform.Windows, Skip = "https://github.com/NuGet/Home/issues/8601")] public void PackCommand_Deterministic_MultiplePackInvocations_CreateIdenticalPackages() { using (var testDirectory = TestDirectory.Create()) From 1d04623e9cd55ca911d0ec76bf844bc030a40343 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Tue, 17 Sep 2019 17:33:06 -0700 Subject: [PATCH 2/2] address feedback --- .../NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs index 561fa6ceaa8..d273d47e056 100644 --- a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs +++ b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs @@ -91,7 +91,7 @@ public PackageBuilder() private PackageBuilder(bool includeEmptyDirectories, bool deterministic) { _includeEmptyDirectories = includeEmptyDirectories; - _deterministic = false; + _deterministic = false; // fix in https://github.com/NuGet/Home/issues/8601 Files = new Collection(); DependencyGroups = new Collection(); FrameworkReferences = new Collection();