new version

mattiasnordqvist · Jul 5, 2024 · 2fd86eb · 2fd86eb
1 parent 13d6593
commit 2fd86eb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/TimeKeeping/DotNetThoughts.TimeKeeping.App/packages.lock.json b/TimeKeeping/DotNetThoughts.TimeKeeping.App/packages.lock.json
@@ -23,9 +23,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[8.0.5, )",
-        "resolved": "8.0.5",
-        "contentHash": "4ISW1Ndgz86FkIbu5rVlMqhhtojdy5rUlxC/N+9kPh9qbYcvHiCvYbHKzAPVIx9OPYIjT9trXt7JI42Y5Ukq6A=="
+        "requested": "[8.0.6, )",
+        "resolved": "8.0.6",
+        "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ=="
       },
       "Microsoft.NET.Sdk.WebAssembly.Pack": {
         "type": "Direct",

diff --git a/TimeKeeping/DotNetThoughts.TimeKeeping.Tests/LocalDateTimeTests.cs b/TimeKeeping/DotNetThoughts.TimeKeeping.Tests/LocalDateTimeTests.cs
@@ -69,6 +69,18 @@ public void TestDateConstructor()
         ldt.DateTime.Should().Be(ldt2.DateTime);
     }
 
+    [Fact]
+    public void TestDateTimeOffsetConstructor()
+    {
+        var t = new DateTimeOffset(2024, 06, 06, 0, 0, 0, TimeSpan.FromHours(2));
+        var d = new DateOnly(2024, 06, 06);
+        var tz = TimeZoneInfo.FindSystemTimeZoneById("Central European Standard Time");
+        var ldt = new LocalDateTime(t, tz);
+        var ldt2 = new LocalDateTime(d, tz);
+
+        ldt.DateTime.Should().Be(ldt2.DateTime);
+    }
+
     [Fact]
     public void TestUtcDateTimeOffset()
     {

diff --git a/TimeKeeping/DotNetThoughts.TimeKeeping/DotNetThoughts.TimeKeeping.csproj b/TimeKeeping/DotNetThoughts.TimeKeeping/DotNetThoughts.TimeKeeping.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>1.0.0</Version>
+		<Version>1.1.0</Version>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 	</PropertyGroup>

diff --git a/TimeKeeping/DotNetThoughts.TimeKeeping/LocalDateTime.cs b/TimeKeeping/DotNetThoughts.TimeKeeping/LocalDateTime.cs
@@ -8,6 +8,9 @@ public readonly record struct LocalDateTime
     public LocalDateTime(DateOnly date, TimeZoneInfo timeZoneInfo)
         : this(date.ToDateTime(TimeOnly.MinValue), timeZoneInfo) { }
 
+    public LocalDateTime(DateTimeOffset dateTimeOffset, TimeZoneInfo timeZoneInfo)
+        : this(TimeZoneInfo.ConvertTime(dateTimeOffset, timeZoneInfo).DateTime, timeZoneInfo) { }
+
     public LocalDateTime(DateTime dateTime, TimeZoneInfo timeZoneInfo)
     {
         if (!((dateTime.Kind == DateTimeKind.Local && timeZoneInfo == TimeZoneInfo.Local)