Re-enable and update a patching test fixed previously
Rob Mensching committed
Sep 3, 2022 at 11:00 UTC
7074da16f85458e535f38c68830ee56361f119f6
2 files changed
+12
-13
src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
+9
-8
@@ -191,20 +191,21 @@ namespace WixToolsetTest.CoreIntegration
191
}
192
}
193
194
- [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6387")]
194
+ [Fact]
195
public void CanBuildPatchFromProductWithFilesFromWixlib()
196
{
197
- var folder = TestData.Get(@"TestData\PatchFromWixlib");
197
+ var sourceFolder = TestData.Get(@"TestData", "PatchFromWixlib");
198
199
using (var fs = new DisposableFileSystem())
200
{
201
- var tempFolderBaseline = fs.GetFolder();
202
- var tempFolderUpdate = fs.GetFolder();
203
- var tempFolderPatch = fs.GetFolder();
201
+ var baseFolder = fs.GetFolder();
202
+ var tempFolderBaseline = Path.Combine(baseFolder, "baseline");
203
+ var tempFolderUpdate = Path.Combine(baseFolder, "update");
204
+ var tempFolderPatch = Path.Combine(baseFolder, "patch");
205
205
- var baselinePdb = BuildMsi("Baseline.msi", folder, tempFolderBaseline, "1.0.0", "1.0.0", "1.0.0");
206
- var update1Pdb = BuildMsi("Update.msi", folder, tempFolderUpdate, "1.0.1", "1.0.1", "1.0.1");
207
- var patchPdb = BuildMsp("Patch1.msp", folder, tempFolderPatch, "1.0.1", bindpaths: new[] { Path.GetDirectoryName(baselinePdb), Path.GetDirectoryName(update1Pdb) }, hasNoFiles: true);
206
+ var baselinePdb = BuildMsi("Baseline.msi", sourceFolder, tempFolderBaseline, "1.0.0", "1.0.0", "1.0.0");
207
+ var update1Pdb = BuildMsi("Update.msi", sourceFolder, tempFolderUpdate, "1.0.1", "1.0.1", "1.0.1");
208
+ var patchPdb = BuildMsp("Patch1.msp", sourceFolder, tempFolderPatch, "1.0.1", bindpaths: new[] { Path.GetDirectoryName(baselinePdb), Path.GetDirectoryName(update1Pdb) }, hasNoFiles: true);
209
var patchPath = Path.ChangeExtension(patchPdb, ".msp");
210
211
Assert.True(File.Exists(baselinePdb));
src/wix/test/WixToolsetTest.CoreIntegration/TestData/PatchFromWixlib/Package.wxs
+3
-5
@@ -5,11 +5,9 @@
5
6
<CustomAction Id="CAFromExtension" DllEntry="DoesntExist" BinaryRef="BinFromWir" />
7
8
- <Directory Id="TARGETDIR" Name="SourceDir">
9
- <Directory Id="ProgramFilesFolder">
10
- <Directory Id="INSTALLFOLDER" Name="~Test App" />
11
- </Directory>
12
- </Directory>
8
+ <StandardDirectory Id="ProgramFilesFolder">
9
+ <Directory Id="INSTALLFOLDER" Name="~Test App" />
10
+ </StandardDirectory>
11
12
<Feature Id="Main">
13
<ComponentGroupRef Id="Components" />