Merge branch 'release/0.42.3'

Jericho · Apr 27, 2022 · f458ccc · f458ccc
2 parents dd98c4f + fed3a49
commit f458ccc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/Source/ZoomNet/Json/DateTimeConverter.cs b/Source/ZoomNet/Json/DateTimeConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.Text.Json;
 
 namespace ZoomNet.Json
@@ -15,10 +14,9 @@ public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
 			switch (reader.TokenType)
 			{
 				case JsonTokenType.String:
-					var stringValue = reader.GetString();
-					return DateTime.Parse(stringValue, null, DateTimeStyles.AdjustToUniversal);
+					return reader.GetDateTime();
 				default:
-					throw new Exception("Unable to convert to DateTime");
+					throw new Exception($"Unable to convert {reader.TokenType.ToEnumString()} to DateTime");
 			}
 		}
 

diff --git a/Source/ZoomNet/Json/NullableDateTimeConverter.cs b/Source/ZoomNet/Json/NullableDateTimeConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using System.Text.Json;
 
 namespace ZoomNet.Json
@@ -16,13 +15,12 @@ internal class NullableDateTimeConverter : ZoomNetJsonConverter<DateTime?>
 			{
 				case JsonTokenType.None:
 				case JsonTokenType.Null:
+				case JsonTokenType.String when string.IsNullOrEmpty(reader.GetString()):
 					return null;
 				case JsonTokenType.String:
-					var stringValue = reader.GetString();
-					if (string.IsNullOrEmpty(stringValue)) return null;
-					return DateTime.Parse(stringValue, null, DateTimeStyles.AdjustToUniversal);
+					return reader.GetDateTime();
 				default:
-					throw new Exception("Unable to convert to nullable DateTime");
+					throw new Exception($"Unable to convert {reader.TokenType.ToEnumString()} to nullable DateTime");
 			}
 		}
 

diff --git a/Source/ZoomNet/ZoomNet.csproj b/Source/ZoomNet/ZoomNet.csproj
@@ -37,12 +37,12 @@
 
   <ItemGroup>
     <PackageReference Include="HttpMultipartParser" Version="5.1.0" />
-    <PackageReference Include="jose-jwt" Version="3.2.0" />
+    <PackageReference Include="jose-jwt" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="Pathoschild.Http.FluentClient" Version="4.1.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
-    <PackageReference Include="System.Text.Json" Version="6.0.2" />
+    <PackageReference Include="System.Text.Json" Version="6.0.3" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>