Skip to content

Commit

Permalink
Properly set WixMerge columns nullable
Browse files Browse the repository at this point in the history
FileCompression and ConfigurationData should both be nullable.

Fixes wixtoolset/issues#5270
  • Loading branch information
robmen committed Feb 12, 2017
1 parent 3064b4a commit e79de23
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/tools/wix/Data/tables.xml
Expand Up @@ -1519,8 +1519,8 @@
<columnDefinition name="Directory_" type="string" nullable="yes" length="72"/>
<columnDefinition name="SourceFile" type="object" length="0"/>
<columnDefinition name="DiskId" type="number" length="2"/>
<columnDefinition name="FileCompression" type="number" length="2"/>
<columnDefinition name="ConfigurationData" type="string" length="255"/>
<columnDefinition name="FileCompression" type="number" length="2" nullable="yes"/>
<columnDefinition name="ConfigurationData" type="string" length="255" nullable="yes"/>
<columnDefinition name="Feature_" type="string" length="72"/>
</tableDefinition>
<tableDefinition name="WixOrdering" createSymbols="yes" unreal="yes">
Expand Down

0 comments on commit e79de23

Please sign in to comment.