From 5dc8c8975b2356654410b2ba4755dfa2c32e7b91 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 2 Sep 2024 22:14:19 -0400 Subject: Use an unnamed bindpath as a default root for... ...harvesting files (as documented). - Fixes https://github.com/wixtoolset/issues/issues/8585 --- .../ExtensibilityServices/FileResolver.cs | 2 +- src/wix/WixToolset.Core/HarvestFilesCommand.cs | 6 ++-- .../HarvestFilesFixture.cs | 32 ++++++++++++++++++++-- .../TestData/HarvestFiles/BindPathsUnnamed.wxs | 19 +++++++++++++ .../HarvestFiles/unnamedbindpath/namedfile.txt | 1 + .../HarvestFiles/unnamedbindpath/unnamedfile.txt | 1 + 6 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 src/wix/test/WixToolsetTest.CoreIntegration/TestData/HarvestFiles/BindPathsUnnamed.wxs create mode 100644 src/wix/test/WixToolsetTest.CoreIntegration/TestData/HarvestFiles/unnamedbindpath/namedfile.txt create mode 100644 src/wix/test/WixToolsetTest.CoreIntegration/TestData/HarvestFiles/unnamedbindpath/unnamedfile.txt (limited to 'src') diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/FileResolver.cs b/src/wix/WixToolset.Core/ExtensibilityServices/FileResolver.cs index 8f08e75e..c4f212c9 100644 --- a/src/wix/WixToolset.Core/ExtensibilityServices/FileResolver.cs +++ b/src/wix/WixToolset.Core/ExtensibilityServices/FileResolver.cs @@ -90,7 +90,7 @@ namespace WixToolset.Core.ExtensibilityServices if (-1 != closeParen) { bindName = source.Substring(BindPathOpenString.Length, closeParen - BindPathOpenString.Length); - path = source.Substring(BindPathOpenString.Length + bindName.Length + 1); // +1 for the closing brace. + path = source.Substring(BindPathOpenString.Length + bindName.Length + 1); // +1 for the closing paren. path = path.TrimStart('\\'); // remove starting '\\' char so the path doesn't look rooted. } } diff --git a/src/wix/WixToolset.Core/HarvestFilesCommand.cs b/src/wix/WixToolset.Core/HarvestFilesCommand.cs index 6927f741..4acd9f24 100644 --- a/src/wix/WixToolset.Core/HarvestFilesCommand.cs +++ b/src/wix/WixToolset.Core/HarvestFilesCommand.cs @@ -195,14 +195,16 @@ namespace WixToolset.Core if (-1 != closeParen) { bindName = source.Substring(BindPathOpenString.Length, closeParen - BindPathOpenString.Length); - path = source.Substring(BindPathOpenString.Length + bindName.Length + 1); // +1 for the closing brace. + path = source.Substring(BindPathOpenString.Length + bindName.Length + 1); // +1 for the closing paren. path = path.TrimStart('\\'); // remove starting '\\' char so the path doesn't look rooted. } } if (String.IsNullOrEmpty(bindName)) { - resultingDirectories.Add(path); + var unnamedBindPath = this.Context.BindPaths.SingleOrDefault(bp => bp.Name == null)?.Path; + + resultingDirectories.Add(unnamedBindPath is null ? path : Path.Combine(unnamedBindPath, path)); } else { diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/HarvestFilesFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/HarvestFilesFixture.cs index e189c42d..2630e295 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/HarvestFilesFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/HarvestFilesFixture.cs @@ -238,7 +238,7 @@ namespace WixToolsetTest.CoreIntegration } [Fact] - public void CanHarvestFilesWithBindPaths() + public void CanHarvestFilesWithNamedBindPaths() { var expected = new[] { @@ -256,6 +256,27 @@ namespace WixToolsetTest.CoreIntegration Build("BindPaths.wxs", (msiPath, _) => AssertFileIdsAndTargetPaths(msiPath, expected)); } + [Fact] + public void CanHarvestFilesWithUnnamedBindPaths() + { + var expected = new[] + { + @"flsNNsTNrgmjASmTBbP.45J1F50dEc=PFiles\HarvestedFiles\test1.txt", + @"flsASLR5pHQzLmWRE.Snra7ndH7sIA=PFiles\HarvestedFiles\test2.txt", + @"flsTZFPiMHb.qfUxdGKQYrnXOhZ.8M=PFiles\HarvestedFiles\files1_sub1\test10.txt", + @"flsLGcTTZPIU3ELiWybqnm.PQ0Ih_g=PFiles\HarvestedFiles\files1_sub1\files1_sub2\test120.txt", + @"fls1Jx2Y9Vea_.WZBH_h2e79arvDRU=PFiles\HarvestedFiles\test3.txt", + @"flsJ9gNxWaau2X3ufphQuCV9WwAgcw=PFiles\HarvestedFiles\test4.txt", + @"flswcmX9dpMQytmD_5QA5aJ5szoQVA=PFiles\HarvestedFiles\files2_sub2\test20.txt", + @"flskKeCKFUtCYMuvw564rgPLJmyBx0=PFiles\HarvestedFiles\files2_sub2\test21.txt", + @"fls2agLZFnQwjoijShwT9Z0RwHyGrI=PFiles\HarvestedFiles\files2_sub3\FileName.Extension", + @"fls9UMOE.TOv61JuYF8IhvCKb8eous=PFiles\HarvestedFiles\namedfile.txt", + @"flsu53T_9CcaBegDflAImGHTajDbJ0=PFiles\HarvestedFiles\unnamedfile.txt", + }; + + Build("BindPathsUnnamed.wxs", (msiPath, _) => AssertFileIdsAndTargetPaths(msiPath, expected), addUnnamedBindPath: true); + } + [Fact] public void CanHarvestFilesInStandardDirectory() { @@ -325,7 +346,7 @@ namespace WixToolsetTest.CoreIntegration Assert.Equal(sortedExpected, actual); } - private static void Build(string file, Action tester, bool isPackage = true, bool warningsAsErrors = true, params string[] additionalCommandLineArguments) + private static void Build(string file, Action tester, bool isPackage = true, bool warningsAsErrors = true, bool addUnnamedBindPath = false, params string[] additionalCommandLineArguments) { var folder = TestData.Get("TestData", "HarvestFiles"); @@ -341,12 +362,17 @@ namespace WixToolsetTest.CoreIntegration "build", Path.Combine(folder, file), "-intermediateFolder", intermediateFolder, - "-bindpath", folder, "-bindpath", @$"ToBeHarvested={folder}\files1", "-bindpath", @$"ToBeHarvested={folder}\files2", "-o", msiPath, }; + if (addUnnamedBindPath) + { + arguments.Add("-bindpath"); + arguments.Add(Path.Combine(folder, "unnamedbindpath")); + } + if (additionalCommandLineArguments.Length > 0) { arguments.AddRange(additionalCommandLineArguments); diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/HarvestFiles/BindPathsUnnamed.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/HarvestFiles/BindPathsUnnamed.wxs new file mode 100644 index 00000000..cd764926 --- /dev/null +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/HarvestFiles/BindPathsUnnamed.wxs @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/HarvestFiles/unnamedbindpath/namedfile.txt b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/HarvestFiles/unnamedbindpath/namedfile.txt new file mode 100644 index 00000000..d32727e0 --- /dev/null +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/HarvestFiles/unnamedbindpath/namedfile.txt @@ -0,0 +1 @@ +This is test.txt. diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/HarvestFiles/unnamedbindpath/unnamedfile.txt b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/HarvestFiles/unnamedbindpath/unnamedfile.txt new file mode 100644 index 00000000..d32727e0 --- /dev/null +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/HarvestFiles/unnamedbindpath/unnamedfile.txt @@ -0,0 +1 @@ +This is test.txt. -- cgit v1.2.3-55-g6feb