1 files changed, 71 insertions, 5 deletions

diff --git a/src/WixToolset.Data/IntermediateFieldValueExtensions.cs b/src/WixToolset.Data/IntermediateFieldValueExtensions.cs
index bc106d4b..9a4237d8 100644
--- a/src/WixToolset.Data/IntermediateFieldValueExtensions.cs
+++ b/src/WixToolset.Data/IntermediateFieldValueExtensions.cs
@@ -2,26 +2,71 @@
 
 namespace WixToolset.Data
 {
+    using System;
+
     public static class IntermediateFieldValueExtensions
     {
         public static bool AsBool(this IntermediateFieldValue value)
         {
-            return value?.Data == null ? false : (bool)value.Data;
+            var result = value.AsNullableBool();
+            return result.HasValue && result.Value;
         }
 
         public static bool? AsNullableBool(this IntermediateFieldValue value)
         {
-            return (bool?)value?.Data;
+            if (value?.Data == null)
+            {
+                return null;
+            }
+            else if (value.Data is bool b)
+            {
+                return b;
+            }
+            else if (value.Data is int n)
+            {
+                return n != 0;
+            }
+            else if (value.Data is string s)
+            {
+                if (s.Equals("yes", StringComparison.OrdinalIgnoreCase) || s.Equals("true", StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+                else if (s.Equals("no", StringComparison.OrdinalIgnoreCase) || s.Equals("false", StringComparison.OrdinalIgnoreCase))
+                {
+                    return false;
+                }
+            }
+
+            return (bool)value.Data;
         }
 
         public static int AsNumber(this IntermediateFieldValue value)
         {
-            return value?.Data == null ? 0 : (int)value.Data;
+            var result = value.AsNullableNumber();
+            return result ?? 0;
         }
 
         public static int? AsNullableNumber(this IntermediateFieldValue value)
         {
-            return (int?)value?.Data;
+            if (value?.Data == null)
+            {
+                return null;
+            }
+            else if (value.Data is int n)
+            {
+                return n;
+            }
+            else if (value.Data is bool b)
+            {
+                return b ? 1 : 0;
+            }
+            else if (value.Data is string s)
+            {
+                return Convert.ToInt32(s);
+            }
+
+            return (int)value.Data;
         }
 
         public static IntermediateFieldPathValue AsPath(this IntermediateFieldValue value)
@@ -31,7 +76,28 @@ namespace WixToolset.Data
 
         public static string AsString(this IntermediateFieldValue value)
         {
-            return (string)value?.Data;
+            if (value?.Data == null)
+            {
+                return null;
+            }
+            else if (value.Data is string s)
+            {
+                return s;
+            }
+            else if (value.Data is int n)
+            {
+                return n.ToString();
+            }
+            else if (value.Data is bool b)
+            {
+                return b ? "true" : "false";
+            }
+            else if (value.Data is IntermediateFieldPathValue p)
+            {
+                return p.Path;
+            }
+
+            return (string)value.Data;
         }
     }
 }