Merge pull request #26241 from dotnet/merges/dev15.7.x-to-dev15.7.x-vs-deps

Merge dev15.7.x to dev15.7.x-vs-deps

src/ExpressionEvaluator/Core/Source/ResultProvider/Formatter.Values.cs

@@ -383,10 +383,10 @@ private string FormatPrimitive(DkmClrValue value, ObjectDisplayOptions options,
             object obj;
             if (value.Type.GetLmrType().IsDateTime())
             {
-                DkmClrValue dateDataValue = value.GetFieldValue(DateTimeUtilities.DateTimeDateDataFieldName, inspectionContext);
+                DkmClrValue dateDataValue = value.GetPropertyValue("Ticks", inspectionContext);
                 Debug.Assert(dateDataValue.HostObjectValue != null);
 
-                obj = DateTimeUtilities.ToDateTime((ulong)dateDataValue.HostObjectValue);
+                obj = new DateTime((long)dateDataValue.HostObjectValue);
             }
             else
             {

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

@@ -330,6 +330,11 @@ internal static DkmClrValue GetFieldValue(this DkmClrValue value, string name, D
             return value.GetMemberValue(name, (int)MemberTypes.Field, ParentTypeName: null, InspectionContext: inspectionContext);
         }
 
+        internal static DkmClrValue GetPropertyValue(this DkmClrValue value, string name, DkmInspectionContext inspectionContext)
+        {
+            return value.GetMemberValue(name, (int)MemberTypes.Property, ParentTypeName: null, InspectionContext: inspectionContext);
+        }
+
         internal static DkmClrValue GetNullableValue(this DkmClrValue value, Type nullableTypeArg, DkmInspectionContext inspectionContext)
         {
             var valueType = value.Type.GetLmrType();

src/Test/PdbUtilities/Shared/DateTimeUtilities.cs

@@ -6,8 +6,6 @@ namespace Roslyn.Utilities
 {
     internal static class DateTimeUtilities
     {
-        internal const string DateTimeDateDataFieldName = "dateData";
-
         // From DateTime.cs.
         private const long TicksMask = 0x3FFFFFFFFFFFFFFF;
 
@@ -18,13 +16,5 @@ internal static DateTime ToDateTime(double raw)
             var tickCount = BitConverter.DoubleToInt64Bits(raw) & TicksMask;
             return new DateTime(tickCount);
         }
-
-        internal static DateTime ToDateTime(ulong raw)
-        {
-            // This mechanism for getting the tick count from the underlying ulong field is copied
-            // from System.DateTime.InternalTicks (ndp\clr\src\BCL\System\DateTime.cs).
-            var tickCount = unchecked((long)raw) & TicksMask;
-            return new DateTime(tickCount);
-        }
     }
 }