2 files changed, 34 insertions, 4 deletions

diff --git a/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs b/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs
index fb6f72dd..e88f26ef 100644
--- a/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs
+++ b/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs
@@ -21,10 +21,25 @@ namespace WixToolset.Core.Burn
 
             base.WriteXml(writer);
 
-            if (this.SetVariableSymbol.Type != null)
+            if (this.SetVariableSymbol.Type != WixBundleVariableType.Unknown)
             {
                 writer.WriteAttributeString("Value", this.SetVariableSymbol.Value);
-                writer.WriteAttributeString("Type", this.SetVariableSymbol.Type);
+
+                switch (this.SetVariableSymbol.Type)
+                {
+                    case WixBundleVariableType.Formatted:
+                        writer.WriteAttributeString("Type", "formatted");
+                        break;
+                    case WixBundleVariableType.Numeric:
+                        writer.WriteAttributeString("Type", "numeric");
+                        break;
+                    case WixBundleVariableType.String:
+                        writer.WriteAttributeString("Type", "string");
+                        break;
+                    case WixBundleVariableType.Version:
+                        writer.WriteAttributeString("Type", "version");
+                        break;
+                }
             }
 
             writer.WriteEndElement();
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
index 05b15ab6..6eafcdd9 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
@@ -131,10 +131,25 @@ namespace WixToolset.Core.Burn.Bundles
                 {
                     writer.WriteStartElement("Variable");
                     writer.WriteAttributeString("Id", variable.Id.Id);
-                    if (null != variable.Type)
+                    if (variable.Type != WixBundleVariableType.Unknown)
                     {
                         writer.WriteAttributeString("Value", variable.Value);
-                        writer.WriteAttributeString("Type", variable.Type);
+
+                        switch (variable.Type)
+                        {
+                            case WixBundleVariableType.Formatted:
+                                writer.WriteAttributeString("Type", "formatted");
+                                break;
+                            case WixBundleVariableType.Numeric:
+                                writer.WriteAttributeString("Type", "numeric");
+                                break;
+                            case WixBundleVariableType.String:
+                                writer.WriteAttributeString("Type", "string");
+                                break;
+                            case WixBundleVariableType.Version:
+                                writer.WriteAttributeString("Type", "version");
+                                break;
+                        }
                     }
                     writer.WriteAttributeString("Hidden", variable.Hidden ? "yes" : "no");
                     writer.WriteAttributeString("Persisted", variable.Persisted ? "yes" : "no");