From 3ccd5e439da4296d6f2b66ce47075ab20d039676 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 14 Mar 2021 07:38:48 -0700
Subject: Minimize public surface area of Core

Fixes wixtoolset/issues#6374
---
 src/WixToolset.Core/Compiler_Patch.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/WixToolset.Core/Compiler_Patch.cs')

diff --git a/src/WixToolset.Core/Compiler_Patch.cs b/src/WixToolset.Core/Compiler_Patch.cs
index 998894d8..a2cadd67 100644
--- a/src/WixToolset.Core/Compiler_Patch.cs
+++ b/src/WixToolset.Core/Compiler_Patch.cs
@@ -95,13 +95,13 @@ namespace WixToolset.Core
                         targetProductName = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                         break;
                     case "ApiPatchingSymbolNoImagehlpFlag":
-                        apiPatchingSymbolFlags |= (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib)) ? (int)PatchSymbolFlagsType.PATCH_SYMBOL_NO_IMAGEHLP : 0;
+                        apiPatchingSymbolFlags |= (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib)) ? (int)PatchSymbolFlags.PatchSymbolNoImagehlp : 0;
                         break;
                     case "ApiPatchingSymbolNoFailuresFlag":
-                        apiPatchingSymbolFlags |= (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib)) ? (int)PatchSymbolFlagsType.PATCH_SYMBOL_NO_FAILURES : 0;
+                        apiPatchingSymbolFlags |= (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib)) ? (int)PatchSymbolFlags.PatchSymbolNoFailures : 0;
                         break;
                     case "ApiPatchingSymbolUndecoratedTooFlag":
-                        apiPatchingSymbolFlags |= (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib)) ? (int)PatchSymbolFlagsType.PATCH_SYMBOL_UNDECORATED_TOO : 0;
+                        apiPatchingSymbolFlags |= (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib)) ? (int)PatchSymbolFlags.PatchSymbolUndecoratedToo : 0;
                         break;
                     case "OptimizePatchSizeForLargeFiles":
                         optimizePatchSizeForLargeFiles = (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib));
@@ -275,7 +275,7 @@ namespace WixToolset.Core
         private int ParseOptimizeCustomActionsElement(XElement node)
         {
             var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
-            var optimizeCA = OptimizeCA.None;
+            var optimizeCA = OptimizeCAFlags.None;
 
             foreach (var attrib in node.Attributes())
             {
@@ -286,19 +286,19 @@ namespace WixToolset.Core
                     case "SkipAssignment":
                         if (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib))
                         {
-                            optimizeCA |= OptimizeCA.SkipAssignment;
+                            optimizeCA |= OptimizeCAFlags.SkipAssignment;
                         }
                         break;
                     case "SkipImmediate":
                         if (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib))
                         {
-                            optimizeCA |= OptimizeCA.SkipImmediate;
+                            optimizeCA |= OptimizeCAFlags.SkipImmediate;
                         }
                         break;
                     case "SkipDeferred":
                         if (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib))
                         {
-                            optimizeCA |= OptimizeCA.SkipDeferred;
+                            optimizeCA |= OptimizeCAFlags.SkipDeferred;
                         }
                         break;
                     default:
-- 
cgit v1.2.3-55-g6feb