From 323cdfd7158988b4c8971376ef8a6de00d3f2e84 Mon Sep 17 00:00:00 2001 From: Deyan Nenov Date: Wed, 3 Jul 2024 19:48:33 +0100 Subject: [PATCH 1/3] removed dyf files deletion - removed (commented out) the logic to delete the source for the custom definition during the package creation process --- src/DynamoPackages/PackageDirectoryBuilder.cs | 6 ++++-- .../PackageManagerTests/PackageDirectoryBuilderTests.cs | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/DynamoPackages/PackageDirectoryBuilder.cs b/src/DynamoPackages/PackageDirectoryBuilder.cs index 2b5873d7d31..c4c820bb617 100644 --- a/src/DynamoPackages/PackageDirectoryBuilder.cs +++ b/src/DynamoPackages/PackageDirectoryBuilder.cs @@ -57,7 +57,8 @@ public IDirectoryInfo BuildDirectory(Package package, string packagesDirectory, WritePackageHeader(package, rootDir); RemoveUnselectedFiles(contentFiles, rootDir); CopyFilesIntoPackageDirectory(contentFiles, markdownFiles, dyfDir, binDir, extraDir, docDir); - RemoveDyfFiles(contentFiles, dyfDir); + + //RemoveDyfFiles(contentFiles, dyfDir); // Commenting this out for now to allow for unforeseen issues to manifest RemapCustomNodeFilePaths(contentFiles, dyfDir.FullName); @@ -84,7 +85,8 @@ public IDirectoryInfo BuildRetainDirectory(Package package, string packagesDirec RemoveUnselectedFiles(contentFiles.SelectMany(files => files).ToList(), rootDir); CopyFilesIntoRetainedPackageDirectory(contentFiles, markdownFiles, sourcePackageDir, rootDir, out dyfFiles); - RemoveRetainDyfFiles(contentFiles.SelectMany(files => files).ToList(), dyfFiles); + + //RemoveRetainDyfFiles(contentFiles.SelectMany(files => files).ToList(), dyfFiles); // Commenting this out for now to allow for unforeseen issues to manifest RemapRetainCustomNodeFilePaths(contentFiles.SelectMany(files => files).ToList(), dyfFiles); WritePackageHeader(package, rootDir); diff --git a/test/Libraries/PackageManagerTests/PackageDirectoryBuilderTests.cs b/test/Libraries/PackageManagerTests/PackageDirectoryBuilderTests.cs index b5830036267..54325175a44 100644 --- a/test/Libraries/PackageManagerTests/PackageDirectoryBuilderTests.cs +++ b/test/Libraries/PackageManagerTests/PackageDirectoryBuilderTests.cs @@ -503,7 +503,7 @@ public void CopyFilesIntoPackageDirectory_DoesNotMoveFilesAlreadyWithinDirectory [Test] public void BuildPackageDirectory_DeletesOriginalDyfFiles() { - // This tests asserts that the initial custom definition files will be deleted in the build process + // This tests asserts that the initial custom definition files won't be deleted in the build process var files = new[] { @"C:\pkg\file1.dyf", @"C:\pkg\file2.DYF" }; var pkg = new Package(@"C:\pkg", "Foo", "0.1.0", "MIT"); @@ -519,7 +519,7 @@ public void BuildPackageDirectory_DeletesOriginalDyfFiles() var dyfDir = Path.Combine(pkgsDir, pkg.Name, PackageDirectoryBuilder.CustomNodeDirectoryName); Assert.AreEqual(files.Length, fs.CopiedFiles.Count()); - Assert.AreEqual(files.Length, fs.DeletedFiles.Count()); + Assert.AreEqual(0, fs.DeletedFiles.Count()); } #endregion From 277c7fe52aa30a0e55aaeff132561c8cb24289da Mon Sep 17 00:00:00 2001 From: Deyan Nenov Date: Thu, 11 Jul 2024 17:34:20 +0100 Subject: [PATCH 2/3] test updates - updated test to match the change with file deletion --- .../PackageDirectoryBuilderTests.cs | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/test/Libraries/PackageManagerTests/PackageDirectoryBuilderTests.cs b/test/Libraries/PackageManagerTests/PackageDirectoryBuilderTests.cs index 54325175a44..3f053c16a27 100644 --- a/test/Libraries/PackageManagerTests/PackageDirectoryBuilderTests.cs +++ b/test/Libraries/PackageManagerTests/PackageDirectoryBuilderTests.cs @@ -34,7 +34,7 @@ public void BuildPackageDirectory_DoesExpectedNumberOfOperations() Assert.AreEqual(5, fs.DirectoriesCreated.Count()); Assert.AreEqual(2, fs.CopiedFiles.Count()); - Assert.AreEqual(2, fs.DeletedFiles.Count()); + Assert.AreEqual(0, fs.DeletedFiles.Count()); Assert.AreEqual(1, fs.NewFilesWritten.Count()); } @@ -52,7 +52,7 @@ public void BuildRetainPackageDirectory_DoesExpectedNumberOfOperations() Assert.AreEqual(1, fs.DirectoriesCreated.Count()); Assert.AreEqual(2, fs.CopiedFiles.Count()); - Assert.AreEqual(2, fs.DeletedFiles.Count()); + Assert.AreEqual(0, fs.DeletedFiles.Count()); Assert.AreEqual(1, fs.NewFilesWritten.Count()); } @@ -272,7 +272,7 @@ public void BuildPackageDirectory_CopiesTheOriginalFiles() var dyfDir = Path.Combine(pkgsDir, pkg.Name, PackageDirectoryBuilder.CustomNodeDirectoryName); Assert.AreEqual(2, fs.CopiedFiles.Count()); - Assert.AreEqual(2, fs.DeletedFiles.Count()); + Assert.AreEqual(0, fs.DeletedFiles.Count()); // no longer deletes the original dyf files Assert.AreEqual(0, fs.DeletedDirectories.Count()); Assert.IsTrue(fs.CopiedFiles.Any(x => ComparePaths(x.Item2, Path.Combine(dyfDir, "file1.dyf")))); @@ -297,7 +297,7 @@ public void BuildPackageRetainDirectory_CopiesTheOriginalFiles() var dyfDir2 = Path.Combine(pkgsDir, pkg.Name, Path.GetFileName(Path.GetDirectoryName(files[1].First()))); Assert.AreEqual(2, fs.CopiedFiles.Count()); - Assert.AreEqual(2, fs.DeletedFiles.Count()); + Assert.AreEqual(0, fs.DeletedFiles.Count()); // no longer deletes the original dyf files Assert.AreEqual(0, fs.DeletedDirectories.Count()); Assert.IsTrue(fs.CopiedFiles.Any(x => ComparePaths(x.Item2, Path.Combine(dyfDir1, "file1.dyf")))); @@ -373,13 +373,10 @@ public void BuildPackageDirectory_DeletesTheOriginalFiles() db.BuildDirectory(pkg, pkgsDir, files, Enumerable.Empty()); - // The original files are moved + // The original files are moved but DYF files are not deleted - Assert.AreEqual(2, fs.DeletedFiles.Count()); + Assert.AreEqual(0, fs.DeletedFiles.Count()); Assert.AreEqual(0, fs.DeletedDirectories.Count()); - - Assert.Contains(files[0], fs.DeletedFiles.ToList()); - Assert.Contains(files[1], fs.DeletedFiles.ToList()); } [Test] @@ -397,13 +394,10 @@ public void BuildRetainPackageDirectory_DeletesTheOriginalFiles() db.BuildRetainDirectory(pkg, pkgsDir, files, Enumerable.Empty()); - // The original files are moved + // The original files are moved but DYF files are not deleted - Assert.AreEqual(2, fs.DeletedFiles.Count()); + Assert.AreEqual(0, fs.DeletedFiles.Count()); Assert.AreEqual(0, fs.DeletedDirectories.Count()); - - Assert.Contains(files[0].First(), fs.DeletedFiles.ToList()); - Assert.Contains(files[1].First(), fs.DeletedFiles.ToList()); } [Test] @@ -430,7 +424,7 @@ public void BuildPackageDirectory_DoesNotIncludeUnselectedFiles() Assert.AreEqual(5, fs.DirectoriesCreated.Count()); Assert.AreEqual(4, fs.CopiedFiles.Count()); - Assert.AreEqual(3, fs.DeletedFiles.Count()); + Assert.AreEqual(2, fs.DeletedFiles.Count()); Assert.AreEqual(2, fs.DeletedDirectories.Count()); Assert.AreEqual(1, fs.NewFilesWritten.Count()); } @@ -460,7 +454,7 @@ public void BuildRetainPackageDirectory_DoesNotIncludeUnselectedFiles() Assert.AreEqual(1, fs.DirectoriesCreated.Count()); Assert.AreEqual(4, fs.CopiedFiles.Count()); - Assert.AreEqual(3, fs.DeletedFiles.Count()); + Assert.AreEqual(2, fs.DeletedFiles.Count()); Assert.AreEqual(2, fs.DeletedDirectories.Count()); Assert.AreEqual(1, fs.NewFilesWritten.Count()); } From e0e891a3f8321421a473ae6f6a6eaecc61a731a2 Mon Sep 17 00:00:00 2001 From: Deyan Nenov Date: Tue, 23 Jul 2024 16:36:35 +0100 Subject: [PATCH 3/3] after recent refactoring - another branch was merged causing additional change --- src/DynamoPackages/PackageDirectoryBuilder.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/DynamoPackages/PackageDirectoryBuilder.cs b/src/DynamoPackages/PackageDirectoryBuilder.cs index ab7ad3cadf1..588c8400449 100644 --- a/src/DynamoPackages/PackageDirectoryBuilder.cs +++ b/src/DynamoPackages/PackageDirectoryBuilder.cs @@ -61,9 +61,7 @@ public IDirectoryInfo BuildDirectory(Package package, string packagesDirectory, WritePackageHeader(package, rootDir); RemoveUnselectedFiles(contentFiles, rootDir); CopyFilesIntoPackageDirectory(contentFiles, markdownFiles, dyfDir, binDir, extraDir, docDir); - //RemoveDyfFiles(contentFiles, dyfDir); // Commenting this out for now to allow for unforeseen issues to manifest - RemapCustomNodeFilePaths(contentFiles, dyfDir.FullName); return rootDir; @@ -89,7 +87,7 @@ public IDirectoryInfo BuildRetainDirectory(Package package, string packagesDirec RemoveUnselectedFiles(contentFiles.SelectMany(files => files).ToList(), rootDir); CopyFilesIntoRetainedPackageDirectory(contentFiles, markdownFiles, roots, rootDir, out dyfFiles); - RemoveRetainDyfFiles(contentFiles.SelectMany(files => files).ToList(), dyfFiles); + //RemoveRetainDyfFiles(contentFiles.SelectMany(files => files).ToList(), dyfFiles); // Commenting this out for now to allow for unforeseen issues to manifest RemapRetainCustomNodeFilePaths(contentFiles.SelectMany(files => files).ToList(), dyfFiles); WritePackageHeader(package, rootDir);