diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.DotNetCore.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.DotNetCore.csproj index 35bf6da71b..56afc8180e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.DotNetCore.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.DotNetCore.csproj @@ -11,6 +11,5 @@ - \ No newline at end of file diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj index 0dfa773cb2..a13fd87ad5 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj @@ -48,9 +48,6 @@ - - ..\packages\NodaTime.1.4.7\lib\net35-Client\NodaTime.dll - @@ -586,7 +583,6 @@ - - - - + - diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs index 1b8179b065..445d42162f 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs @@ -29,8 +29,6 @@ namespace Apache.Ignite.Core.Impl.Binary using Apache.Ignite.Core.Binary; using Apache.Ignite.Core.Impl.Binary.IO; using Apache.Ignite.Core.Impl.Common; - using NodaTime; - using NodaTime.TimeZones; /// /// Utilities for binary serialization. @@ -83,16 +81,6 @@ namespace Apache.Ignite.Core.Impl.Binary RegistrationDisabled = true }; - /** - * We use NodaTime to ensure Java/.NET interoperability since adjustment rules - * are incomplete for some time zones. - */ - private static readonly DateTimeZone NodaZone = DateTimeZoneProviders.Tzdb.GetSystemDefault(); - - /** Ambiguous and skipped local time resolvers. */ - private static readonly ZoneLocalMappingResolver NodaZoneMappingResolver = - Resolvers.CreateMappingResolver(Resolvers.ReturnEarlier, Resolvers.ReturnStartOfIntervalAfter); - /** Method: ReadArray. */ public static readonly MethodInfo MtdhReadArray = typeof(BinaryUtils).GetMethod("ReadArray", BindFlagsStatic); @@ -418,20 +406,7 @@ namespace Apache.Ignite.Core.Impl.Binary long high = stream.ReadLong(); int low = stream.ReadInt(); - var utcDateTime = new DateTime( - JavaDateTicks + high * TimeSpan.TicksPerMillisecond + low / 100, - DateTimeKind.Utc); - var nodaTime = Instant.FromDateTimeUtc(utcDateTime).InZone(NodaZone); - - return new DateTime( - nodaTime.Year, - nodaTime.Month, - nodaTime.Day, - nodaTime.Hour, - nodaTime.Minute, - nodaTime.Second, - nodaTime.Millisecond, - DateTimeKind.Local); + return new DateTime(JavaDateTicks + high * TimeSpan.TicksPerMillisecond + low / 100, DateTimeKind.Utc); } /// @@ -1641,12 +1616,7 @@ namespace Apache.Ignite.Core.Impl.Binary "DateTime is not UTC. Only UTC DateTime can be used for interop with other platforms."); } - long diff = date.Kind == DateTimeKind.Utc - ? date.Ticks - JavaDateTicks - : LocalDateTime.FromDateTime(date) - .InZone(NodaZone, NodaZoneMappingResolver) - .ToInstant() - .ToUnixTimeTicks(); + long diff = date.Ticks - JavaDateTicks; high = diff / TimeSpan.TicksPerMillisecond; diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/packages.config b/modules/platforms/dotnet/Apache.Ignite.Core/packages.config deleted file mode 100644 index ad3bf662a3..0000000000 --- a/modules/platforms/dotnet/Apache.Ignite.Core/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - -