Implement many more strong tuples

Also fixes several warnings.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/WixToolset.Data/IntermediateFieldValueExtensions.cs b/src/WixToolset.Data/IntermediateFieldValueExtensions.cs
index 25a40ee6..f9322e09 100644
--- a/src/WixToolset.Data/IntermediateFieldValueExtensions.cs
+++ b/src/WixToolset.Data/IntermediateFieldValueExtensions.cs
@@ -71,7 +71,14 @@ namespace WixToolset.Data
             }
             else if (value.Data is string s)
             {
-                return Convert.ToInt32(s);
+                try
+                {
+                    return Convert.ToInt32(s);
+                }
+                catch (FormatException)
+                {
+                    throw new WixException(ErrorMessages.UnableToConvertFieldToNumber(s));
+                }
             }
 
             return (int)value.Data;