Code coverage for DateTimeWithTimeZone configuration

Author: Lanayx

XmlSchemaClassGenerator.Tests/DateOnlyTimeOnlyTests.cs

@@ -134,4 +134,60 @@ public void WhenDefaultValueIsPresent_CodeIsGenerated()
         Assert.Contains("System.DateOnly.Parse(\"2023-10-27\")", code);
         Assert.Contains("System.TimeOnly.Parse(\"12:34:56\")", code);
     }
+    [Fact]
+    public void WhenUseDateOnlyIsFalse_AndDateTimeWithTimeZoneIsTrue_DateTimeOffsetIsGeneratedForTime()
+    {
+        var xsd = @$"<?xml version=""1.0"" encoding=""UTF-8""?>
+<xs:schema elementFormDefault=""qualified"" xmlns:xs=""http://www.w3.org/2001/XMLSchema"">
+	<xs:complexType name=""document"">
+		<xs:sequence>
+            <xs:element name=""someTime"" type=""xs:time"" />
+		</xs:sequence>
+	</xs:complexType>
+</xs:schema>";
+
+        var generatedType = ConvertXml(
+            xsd, new()
+            {
+                NamespaceProvider = new()
+                {
+                    GenerateNamespace = _ => "Test"
+                },
+                UseDateOnly = false,
+                DateTimeWithTimeZone = true
+            });
+
+        var code = string.Join(Environment.NewLine, generatedType);
+
+        Assert.Contains("public System.DateTimeOffset SomeTime", code);
+        Assert.Contains("DataType=\"time\"", code);
+    }
+    [Fact]
+    public void WhenUseDateOnlyIsFalse_AndDateTimeWithTimeZoneIsTrue_DateTimeOffsetIsGeneratedForDate()
+    {
+        var xsd = @$"<?xml version=""1.0"" encoding=""UTF-8""?>
+<xs:schema elementFormDefault=""qualified"" xmlns:xs=""http://www.w3.org/2001/XMLSchema"">
+	<xs:complexType name=""document"">
+		<xs:sequence>
+            <xs:element name=""someDate"" type=""xs:date"" />
+		</xs:sequence>
+	</xs:complexType>
+</xs:schema>";
+
+        var generatedType = ConvertXml(
+            xsd, new()
+            {
+                NamespaceProvider = new()
+                {
+                    GenerateNamespace = _ => "Test"
+                },
+                UseDateOnly = false,
+                DateTimeWithTimeZone = true
+            });
+
+        var code = string.Join(Environment.NewLine, generatedType);
+
+        Assert.Contains("public System.DateTimeOffset SomeDate", code);
+        Assert.Contains("DataType=\"date\"", code);
+    }
 }

XmlSchemaClassGenerator/CodeUtilities.cs

@@ -170,7 +170,7 @@ public static Type GetEffectiveType(this XmlSchemaDatatype type, GeneratorConfig
                 XmlTypeCode.AnyUri or XmlTypeCode.GDay or XmlTypeCode.GMonth or XmlTypeCode.GMonthDay or XmlTypeCode.GYear or XmlTypeCode.GYearMonth => typeof(string),
                 XmlTypeCode.Duration => configuration.NetCoreSpecificCode ? type.ValueType : typeof(string),
                 XmlTypeCode.Time => configuration.UseDateOnly ? typeof(TimeOnly) : (configuration.DateTimeWithTimeZone ? typeof(DateTimeOffset) : typeof(DateTime)),
-                XmlTypeCode.Date => configuration.UseDateOnly ? typeof(DateOnly) : typeof(DateTime),
+                XmlTypeCode.Date => configuration.UseDateOnly ? typeof(DateOnly) : (configuration.DateTimeWithTimeZone ? typeof(DateTimeOffset) : typeof(DateTime)),
                 XmlTypeCode.DateTime => configuration.DateTimeWithTimeZone ? typeof(DateTimeOffset) : typeof(DateTime),
                 XmlTypeCode.Idref => typeof(string),
                 XmlTypeCode.Integer or XmlTypeCode.NegativeInteger or XmlTypeCode.NonNegativeInteger or XmlTypeCode.NonPositiveInteger or XmlTypeCode.PositiveInteger => GetIntegerDerivedType(type, configuration, restrictions),