diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-10-25 02:47:47 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-26 13:32:21 -0700 |
| commit | f01d284101e95d490497062c2dc9065423d0cf37 (patch) | |
| tree | 39e5516a836ccd3436c117f790e7c5374e59a6b2 /src/test | |
| parent | 98bdcfac8bd4f699bc6865abd283f710943e77bc (diff) | |
| download | wix-f01d284101e95d490497062c2dc9065423d0cf37.tar.gz wix-f01d284101e95d490497062c2dc9065423d0cf37.tar.bz2 wix-f01d284101e95d490497062c2dc9065423d0cf37.zip | |
Fix MsiAssembly table processing
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs index 6ebdb993..1b302065 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | |||
| @@ -480,7 +480,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 480 | } | 480 | } |
| 481 | } | 481 | } |
| 482 | 482 | ||
| 483 | [Fact(Skip = "Test demonstrates failure")] | 483 | [Fact] |
| 484 | public void PopulatesMsiAssemblyTables() | 484 | public void PopulatesMsiAssemblyTables() |
| 485 | { | 485 | { |
| 486 | var folder = TestData.Get(@"TestData"); | 486 | var folder = TestData.Get(@"TestData"); |
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs index 980c5ca4..45cc7114 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Assembly/Win32Assembly.wxs | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | <Fragment> | 3 | <Fragment> |
| 4 | <ComponentGroup Id="ProductComponents"> | 4 | <ComponentGroup Id="ProductComponents"> |
| 5 | <Component Directory="INSTALLFOLDER"> | 5 | <Component Directory="INSTALLFOLDER"> |
| 6 | <File Source="test.txt" Assembly="win32" AssemblyManifest="test.dll.manifest" /> | 6 | <File Id="test.txt" Source="test.txt" Assembly="win32" AssemblyManifest="test.dll.manifest" /> |
| 7 | </Component> | 7 | </Component> |
| 8 | <Component Id="test.dll.manifest" Directory="INSTALLFOLDER"> | 8 | <Component Id="test.dll.manifest" Directory="INSTALLFOLDER"> |
| 9 | <File Id="test.dll.manifest" Source="test.manifest" Name="test.dll.manifest"></File> | 9 | <File Id="test.dll.manifest" Source="test.manifest" Name="test.dll.manifest"></File> |