Skip to content
This repository was archived by the owner on Jun 14, 2024. It is now read-only.

Commit 786c521

Browse files
author
John Kordich
committed
Fixes for Linux
1 parent b313e3b commit 786c521

File tree

1 file changed

+14
-16
lines changed
  • src/Microsoft.Management.Infrastructure/Native/Structures

1 file changed

+14
-16
lines changed

src/Microsoft.Management.Infrastructure/Native/Structures/MI_Datetime.cs

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,16 @@ internal object ConvertToNativeLayer()
7272
CultureInfo.InvariantCulture.Calendar,
7373
DateTimeKind.Utc);
7474
#else
75-
Calendar myCalendar = CultureInfo.InvariantCulture.Calendar;
76-
DateTime myDateTime = new DateTime();
77-
DateTime managedDateTime = myCalendar.ToDateTime(
78-
(int)datetime.timestamp.year,
79-
(int)datetime.timestamp.month,
80-
(int)datetime.timestamp.day,
81-
(int)datetime.timestamp.hour,
82-
(int)datetime.timestamp.minute,
83-
(int)datetime.timestamp.second,
84-
(int)datetime.timestamp.microseconds / 1000);
85-
DateTime managedUtcDateTime = myDateTime.SpecifyKind(managedDateTime, DateTimeKind.Utc);
75+
Calendar myCalendar = CultureInfo.InvariantCulture.Calendar;
76+
DateTime managedDateTime = myCalendar.ToDateTime(
77+
(int)datetime.timestamp.year,
78+
(int)datetime.timestamp.month,
79+
(int)datetime.timestamp.day,
80+
(int)datetime.timestamp.hour,
81+
(int)datetime.timestamp.minute,
82+
(int)datetime.timestamp.second,
83+
(int)datetime.timestamp.microseconds / 1000);
84+
DateTime managedUtcDateTime = DateTime.SpecifyKind(managedDateTime, DateTimeKind.Utc);
8685

8786
#endif
8887
long microsecondsUnaccounted = datetime.timestamp.microseconds % 1000;
@@ -93,18 +92,17 @@ internal object ConvertToNativeLayer()
9392
#if !_CORECLR
9493
DateTime managedLocalDateTime = TimeZoneInfo.ConvertTimeFromUtc(managedUtcDateTime, TimeZoneInfo.Local);
9594
#else
96-
//
97-
// TODO: USE THIS FOR BOTH CORECLR AND FULLOS
98-
//
99-
DateTime managedLocalDateTime = TimeZoneInfo::ConvertTime(*managedUtcDateTime, TimeZoneInfo::Local);
95+
//
96+
// TODO: USE THIS FOR BOTH CORECLR AND FULLOS
97+
//
98+
DateTime managedLocalDateTime = TimeZoneInfo.ConvertTime(managedUtcDateTime, TimeZoneInfo.Local);
10099
#endif
101100

102101
return managedLocalDateTime;
103102
}
104103
}
105104
else
106105
{
107-
#pragma warning (suppress: 4395) // ok that member function will be invoked on a copy of the initonly data member 'System::TimeSpan::MaxValue'
108106
if (TimeSpan.MaxValue.TotalDays < datetime.interval.days)
109107
{
110108
return TimeSpan.MaxValue;

0 commit comments

Comments
 (0)