From 9eeaf6cc7d32ddd1a45b824558ecbb89f466308a Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 4 Jan 2022 17:21:30 -0800 Subject: Read WindowsInstallerData at same XML conformance as writing --- .../wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs | 6 +++++- src/api/wix/api_wix.v3.ncrunchsolution | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/api/wix/api_wix.v3.ncrunchsolution (limited to 'src/api') 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 private static readonly Version CurrentVersion = new Version("4.0.0.0"); private const string WixOutputStreamName = "wix-wid.xml"; + private static readonly XmlReaderSettings ReaderSettings = new XmlReaderSettings + { + CheckCharacters = false + }; private static readonly XmlWriterSettings WriterSettings = new XmlWriterSettings { CheckCharacters = false, @@ -159,7 +163,7 @@ namespace WixToolset.Data.WindowsInstaller public static WindowsInstallerData Load(WixOutput wixOutput, TableDefinitionCollection tableDefinitions, bool suppressVersionCheck = false) { using (var stream = wixOutput.GetDataStream(WixOutputStreamName)) - using (var reader = XmlReader.Create(stream, null, wixOutput.Uri.AbsoluteUri)) + using (var reader = XmlReader.Create(stream, ReaderSettings, wixOutput.Uri.AbsoluteUri)) { try { 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 @@ + + + True + True + + \ No newline at end of file -- cgit v1.2.3-55-g6feb