Read WindowsInstallerData at same XML conformance as writing

4 files changed, 50 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
 
         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 @@
+<SolutionConfiguration>
+  <Settings>
+    <AllowParallelTestExecution>True</AllowParallelTestExecution>
+    <SolutionConfigured>True</SolutionConfigured>
+  </Settings>
+</SolutionConfiguration>
\ No newline at end of file
diff --git a/src/ext/UI/UI.wixext.v3.ncrunchsolution b/src/ext/UI/UI.wixext.v3.ncrunchsolution
new file mode 100644
index 00000000..10420ac9
--- /dev/null
+++ b/src/ext/UI/UI.wixext.v3.ncrunchsolution
@@ -0,0 +1,6 @@
+<SolutionConfiguration>
+  <Settings>
+    <AllowParallelTestExecution>True</AllowParallelTestExecution>
+    <SolutionConfigured>True</SolutionConfigured>
+  </Settings>
+</SolutionConfiguration>
\ No newline at end of file
diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
index ca36fed5..778bfb64 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
+++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
@@ -2,9 +2,14 @@
 
 namespace WixToolsetTest.UI
 {
+    using System;
+    using System.IO;
     using System.Linq;
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
+    using WixToolset.Data;
+    using WixToolset.Data.Symbols;
+    using WixToolset.Data.WindowsInstaller;
     using WixToolset.UI;
     using Xunit;
 
@@ -67,6 +72,34 @@ namespace WixToolsetTest.UI
         }
 
         [Fact]
+        public void CanBuildUsingWixUIMinimalAndReadPdb()
+        {
+            var folder = TestData.Get(@"TestData\WixUI_Minimal");
+            var bindFolder = TestData.Get(@"TestData\data");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var intermediateFolder = fs.GetFolder();
+
+                Build(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Package.wxs"),
+                    "-ext", Path.GetFullPath(new Uri(typeof(UIExtensionFactory).Assembly.CodeBase).LocalPath),
+                    "-bindpath", bindFolder,
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
+                });
+
+                var wid = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
+                var propertyTable = wid.Tables["Property"];
+
+                var propertyRow = propertyTable.Rows.Single(r => r.GetPrimaryKey() == "WixUI_Mode");
+                WixAssert.StringEqual("Minimal", propertyRow.FieldAsString(1));
+            }
+        }
+
+        [Fact]
         public void CanBuildUsingWixUIMondo()
         {
             var folder = TestData.Get(@"TestData\WixUI_Mondo");