Add Wix4 prefix Http CA binary and make HandleExisting an enum

4 files changed, 21 insertions, 11 deletions

diff --git a/src/wixext/HttpCompiler.cs b/src/wixext/HttpCompiler.cs
index e6246619..cb217147 100644
--- a/src/wixext/HttpCompiler.cs
+++ b/src/wixext/HttpCompiler.cs
@@ -72,7 +72,7 @@ namespace WixToolset.Http
         {
             var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
             Identifier id = null;
-            var handleExisting = HttpConstants.heReplace;
+            var handleExisting = HandleExisting.Replace;
             string sddl = null;
             string url = null;
             var foundACE = false;
@@ -91,13 +91,13 @@ namespace WixToolset.Http
                             switch (handleExistingValue)
                             {
                                 case "replace":
-                                    handleExisting = HttpConstants.heReplace;
+                                    handleExisting = HandleExisting.Replace;
                                     break;
                                 case "ignore":
-                                    handleExisting = HttpConstants.heIgnore;
+                                    handleExisting = HandleExisting.Ignore;
                                     break;
                                 case "fail":
-                                    handleExisting = HttpConstants.heFail;
+                                    handleExisting = HandleExisting.Fail;
                                     break;
                                 default:
                                     this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "HandleExisting", handleExistingValue, "replace", "ignore", "fail"));
diff --git a/src/wixext/HttpConstants.cs b/src/wixext/HttpConstants.cs
index 1c96f278..5fb42d86 100644
--- a/src/wixext/HttpConstants.cs
+++ b/src/wixext/HttpConstants.cs
@@ -11,9 +11,5 @@ namespace WixToolset.Http
         public const int GENERIC_EXECUTE = 0x20000000;
         public const int GENERIC_WRITE = 0x40000000;
 
-        // from wixhttpca.cpp
-        public const int heReplace = 0;
-        public const int heIgnore = 1;
-        public const int heFail = 2;
     }
 }
diff --git a/src/wixext/Symbols/HandleExisting.cs b/src/wixext/Symbols/HandleExisting.cs
new file mode 100644
index 00000000..0d70cebc
--- /dev/null
+++ b/src/wixext/Symbols/HandleExisting.cs
@@ -0,0 +1,14 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Http.Symbols
+{
+    /// <summary>
+    /// Must match constants in wixhttpca.cpp
+    /// </summary>
+    public enum HandleExisting
+    {
+        Replace = 0,
+        Ignore = 1,
+        Fail = 2,
+    }
+}
diff --git a/src/wixext/Symbols/WixHttpUrlReservationSymbol.cs b/src/wixext/Symbols/WixHttpUrlReservationSymbol.cs
index 4bdc2fee..4aa4a5da 100644
--- a/src/wixext/Symbols/WixHttpUrlReservationSymbol.cs
+++ b/src/wixext/Symbols/WixHttpUrlReservationSymbol.cs
@@ -44,10 +44,10 @@ namespace WixToolset.Http.Symbols
 
         public IntermediateField this[WixHttpUrlReservationSymbolFields index] => this.Fields[(int)index];
 
-        public int HandleExisting
+        public HandleExisting HandleExisting
         {
-            get => this.Fields[(int)WixHttpUrlReservationSymbolFields.HandleExisting].AsNumber();
-            set => this.Set((int)WixHttpUrlReservationSymbolFields.HandleExisting, value);
+            get => (HandleExisting)this.Fields[(int)WixHttpUrlReservationSymbolFields.HandleExisting].AsNumber();
+            set => this.Set((int)WixHttpUrlReservationSymbolFields.HandleExisting, (int)value);
         }
 
         public string Sddl