Build fixes

src/ExpressionEvaluator/Core/Source/ResultProvider/Expansion/MemberExpansion.cs

@@ -120,7 +120,7 @@ internal sealed class MemberExpansion : Expansion
                 expansions.Add(favoritesExpansion);
 
                 // Check if we are only expanding favorites.
-                if (inspectionContext.EvaluationFlags.HasFlag(DkmEvaluationFlags.FilterToFavorites))
+                if ((inspectionContext.EvaluationFlags & DkmEvaluationFlags.FilterToFavorites) == DkmEvaluationFlags.FilterToFavorites)
                 {
                     instanceMembers.Free();
                     staticMembers.Free();

src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/DebuggerDisplayInfo.cs

@@ -26,7 +26,7 @@ public DebuggerDisplayInfo(DkmClrType targetType)
 
         public DebuggerDisplayItemInfo GetValue(DkmInspectionContext inspectionContext)
         {
-            if (m_simpleValue != null && inspectionContext.EvaluationFlags.HasFlag(DkmEvaluationFlags.UseSimpleDisplayString))
+            if (m_simpleValue != null && (inspectionContext.EvaluationFlags & DkmEvaluationFlags.UseSimpleDisplayString) == DkmEvaluationFlags.UseSimpleDisplayString)
             {
                 return m_simpleValue;
             }

src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/TypeHelpers.cs

@@ -66,10 +66,15 @@ internal static class TypeHelpers
                 }
 
                 // Get the favorites information if it is supported.
-                HashSet<string> favoritesMemberNames = null;
+                Dictionary<string, object> favoritesMemberNames = null;
                 if (supportsFavorites && favoritesInfo?.Favorites != null)
                 {
-                    favoritesMemberNames = new HashSet<string>(favoritesInfo.Favorites);
+                    favoritesMemberNames = new Dictionary<string, object>(favoritesInfo.Favorites.Count);
+
+                    foreach (var favorite in favoritesInfo.Favorites)
+                    {
+                        favoritesMemberNames.Add(favorite, null);
+                    }
                 }
 
                 // Hide non-public members if hideNonPublic is specified (intended to reflect the
@@ -166,7 +171,7 @@ internal static class TypeHelpers
                                 previousDeclaration,
                                 inheritanceLevel,
                                 canFavorite: supportsFavorites,
-                                isFavorite: (favoritesMemberNames?.Contains(memberName) == true)));
+                                isFavorite: (favoritesMemberNames?.ContainsKey(memberName) == true)));
                     }
                 }
 

src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrObjectFavoritesInfo.cs

+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+#region Assembly Microsoft.VisualStudio.Debugger.Engine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+// References\Debugger\v2.0\Microsoft.VisualStudio.Debugger.Engine.dll
+
+#endregion
+
+using System.Collections.ObjectModel;
+
+namespace Microsoft.VisualStudio.Debugger.Evaluation
+{
+    public class DkmClrObjectFavoritesInfo
+    {
+        public string DisplayString => null;
+        public string SimpleDisplayString => null;
+        public ReadOnlyCollection<string> Favorites => null;
+    }
+}

src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmClrType.cs

@@ -361,5 +361,7 @@ private static DkmClrDebuggerVisualizerAttribute[] GetDebuggerVisualizerAttribut
 
             return builder.ToArrayAndFree();
         }
+
+        public DkmClrObjectFavoritesInfo GetFavorites() => null;
     }
 }

src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmEvaluationFlags.cs

@@ -22,5 +22,7 @@ public enum DkmEvaluationFlags
         DynamicView = 16384,
         ResultsOnly = 32768,
         NoExpansion = 65536,
+        FilterToFavorites = 0x40000,
+        UseSimpleDisplayString = 0x80000,
     }
 }

src/ExpressionEvaluator/Core/Test/ResultProvider/Debugger/Engine/DkmEvaluationResultFlags.cs

@@ -28,5 +28,8 @@ public enum DkmEvaluationResultFlags
         Visualized = 8192,
         ExpandableError = 16384,
         ExceptionThrown = 32768,
+        CanFavorite = 0x1000000,
+        IsFavorite = 0x2000000,
+        HasFavorites = 0x4000000,
     }
 }