Update GetUtcNow to return DateTimeOffset

sebastienros · Dec 12, 2023 · 2aab2c8 · 2aab2c8
1 parent 1e0513e
commit 2aab2c8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -10,6 +10,7 @@
     <PackageVersion Include="Jurassic" Version="3.2.7" />
     <PackageVersion Include="Meziantou.Analyzer" Version="2.0.116" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="MongoDB.Bson.signed" Version="2.19.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/Jint.Tests.PublicInterface/Jint.Tests.PublicInterface.csproj b/Jint.Tests.PublicInterface/Jint.Tests.PublicInterface.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="MongoDB.Bson.signed" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="NodaTime" />
-    <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>

diff --git a/Jint.Tests.PublicInterface/TimeSystemTests.cs b/Jint.Tests.PublicInterface/TimeSystemTests.cs
@@ -86,8 +86,8 @@ public TimeProviderTimeSystem(TimeProvider timeProvider) : base(TimeZoneInfo.Utc
         _timeProvider = timeProvider;
     }
 
-    public override DateTime GetUtcNow()
+    public override DateTimeOffset GetUtcNow()
     {
-        return _timeProvider.GetUtcNow().DateTime;
+        return _timeProvider.GetUtcNow();
     }
 }
diff --git a/Jint/Native/Date/DateConstructor.cs b/Jint/Native/Date/DateConstructor.cs
@@ -100,7 +100,7 @@ private static JsValue Utc(JsValue thisObject, JsValue[] arguments)
 
     private JsValue Now(JsValue thisObject, JsValue[] arguments)
     {
-        return (long) (_timeSystem.GetUtcNow() - Epoch).TotalMilliseconds;
+        return (long) (_timeSystem.GetUtcNow().DateTime - Epoch).TotalMilliseconds;
     }
 
     protected internal override JsValue Call(JsValue thisObject, JsValue[] arguments)
@@ -120,7 +120,7 @@ public override ObjectInstance Construct(JsValue[] arguments, JsValue newTarget)
                 newTarget,
                 static intrinsics => intrinsics.Date.PrototypeObject,
                 static (engine, _, dateValue) => new JsDate(engine, dateValue),
-                (_timeSystem.GetUtcNow() - Epoch).TotalMilliseconds);
+                (_timeSystem.GetUtcNow().DateTime - Epoch).TotalMilliseconds);
         }
 
         return ConstructUnlikely(arguments, newTarget);

diff --git a/Jint/Runtime/DefaultTimeSystem.cs b/Jint/Runtime/DefaultTimeSystem.cs
@@ -51,9 +51,9 @@ public DefaultTimeSystem(TimeZoneInfo timeZoneInfo, CultureInfo parsingCulture)
         DefaultTimeZone = timeZoneInfo;
     }
 
-    public virtual DateTime GetUtcNow()
+    public virtual DateTimeOffset GetUtcNow()
     {
-        return DateTime.UtcNow;
+        return DateTimeOffset.UtcNow;
     }
 
     public TimeZoneInfo DefaultTimeZone { get; }

diff --git a/Jint/Runtime/ITimeSystem.cs b/Jint/Runtime/ITimeSystem.cs
@@ -14,7 +14,7 @@ public interface ITimeSystem
     /// Retrieves current UTC time.
     /// </summary>
     /// <returns>Current UTC time.</returns>
-    DateTime GetUtcNow();
+    DateTimeOffset GetUtcNow();
 
     /// <summary>
     /// Return the default time zone system is using. Usually <see cref="TimeZoneInfo.Local"/>, but can be altered via