diff options
Diffstat (limited to 'src/api')
-rw-r--r-- | src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs | 6 | ||||
-rw-r--r-- | src/api/wix/api_wix.v3.ncrunchsolution | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs index 8d69cd08..66d9a56f 100644 --- a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs +++ b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs | |||
@@ -18,6 +18,10 @@ namespace WixToolset.Data.WindowsInstaller | |||
18 | 18 | ||
19 | private static readonly Version CurrentVersion = new Version("4.0.0.0"); | 19 | private static readonly Version CurrentVersion = new Version("4.0.0.0"); |
20 | private const string WixOutputStreamName = "wix-wid.xml"; | 20 | private const string WixOutputStreamName = "wix-wid.xml"; |
21 | private static readonly XmlReaderSettings ReaderSettings = new XmlReaderSettings | ||
22 | { | ||
23 | CheckCharacters = false | ||
24 | }; | ||
21 | private static readonly XmlWriterSettings WriterSettings = new XmlWriterSettings | 25 | private static readonly XmlWriterSettings WriterSettings = new XmlWriterSettings |
22 | { | 26 | { |
23 | CheckCharacters = false, | 27 | CheckCharacters = false, |
@@ -159,7 +163,7 @@ namespace WixToolset.Data.WindowsInstaller | |||
159 | public static WindowsInstallerData Load(WixOutput wixOutput, TableDefinitionCollection tableDefinitions, bool suppressVersionCheck = false) | 163 | public static WindowsInstallerData Load(WixOutput wixOutput, TableDefinitionCollection tableDefinitions, bool suppressVersionCheck = false) |
160 | { | 164 | { |
161 | using (var stream = wixOutput.GetDataStream(WixOutputStreamName)) | 165 | using (var stream = wixOutput.GetDataStream(WixOutputStreamName)) |
162 | using (var reader = XmlReader.Create(stream, null, wixOutput.Uri.AbsoluteUri)) | 166 | using (var reader = XmlReader.Create(stream, ReaderSettings, wixOutput.Uri.AbsoluteUri)) |
163 | { | 167 | { |
164 | try | 168 | try |
165 | { | 169 | { |
diff --git a/src/api/wix/api_wix.v3.ncrunchsolution b/src/api/wix/api_wix.v3.ncrunchsolution new file mode 100644 index 00000000..10420ac9 --- /dev/null +++ b/src/api/wix/api_wix.v3.ncrunchsolution | |||
@@ -0,0 +1,6 @@ | |||
1 | <SolutionConfiguration> | ||
2 | <Settings> | ||
3 | <AllowParallelTestExecution>True</AllowParallelTestExecution> | ||
4 | <SolutionConfigured>True</SolutionConfigured> | ||
5 | </Settings> | ||
6 | </SolutionConfiguration> \ No newline at end of file | ||