Skip to content

Commit 4f526b8

Browse files
authored
Merge pull request #579 from Lanayx/master
Don't emit DataType for DateOnly and TimeOny types
2 parents 4160214 + d22a300 commit 4f526b8

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

XmlSchemaClassGenerator.Tests/DateOnlyTimeOnlyTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public void WhenUseDateOnlyIsTrue_DateOnlyAndTimeOnlyAreGenerated()
7272

7373
Assert.Contains("public System.DateOnly SomeDate", code);
7474
Assert.Contains("public System.TimeOnly SomeTime", code);
75-
Assert.Contains("DataType=\"date\"", code);
76-
Assert.Contains("DataType=\"time\"", code);
75+
Assert.DoesNotContain("DataType=\"date\"", code);
76+
Assert.DoesNotContain("DataType=\"time\"", code);
7777
}
7878

7979
[Fact]
@@ -191,7 +191,7 @@ public void WhenUseDateOnlyIsFalse_AndDateTimeWithTimeZoneIsTrue_DateTimeOffsetI
191191
Assert.DoesNotContain("DataType=\"date\"", code);
192192
}
193193
[Fact]
194-
public void WhenUseDateOnlyIsTrue_AndDateTimeWithTimeZoneIsTrue_DateOnlyAndTimeOnlyAreGenerated_WithDataTypeAttribute()
194+
public void WhenUseDateOnlyIsTrue_AndDateTimeWithTimeZoneIsTrue_DateOnlyAndTimeOnlyAreGenerated()
195195
{
196196
var xsd = @$"<?xml version=""1.0"" encoding=""UTF-8""?>
197197
<xs:schema elementFormDefault=""qualified"" xmlns:xs=""http://www.w3.org/2001/XMLSchema"">
@@ -218,7 +218,7 @@ public void WhenUseDateOnlyIsTrue_AndDateTimeWithTimeZoneIsTrue_DateOnlyAndTimeO
218218

219219
Assert.Contains("public System.DateOnly SomeDate", code);
220220
Assert.Contains("public System.TimeOnly SomeTime", code);
221-
Assert.Contains("DataType=\"date\"", code);
222-
Assert.Contains("DataType=\"time\"", code);
221+
Assert.DoesNotContain("DataType=\"date\"", code);
222+
Assert.DoesNotContain("DataType=\"time\"", code);
223223
}
224224
}

XmlSchemaClassGenerator/CodeUtilities.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static string ToBackingField(this string propertyName, string privateFiel
7878
public static bool? IsDataTypeAttributeAllowed(this XmlSchemaDatatype type, GeneratorConfiguration configuration) => type.TypeCode switch
7979
{
8080
XmlTypeCode.AnyAtomicType => false,// union
81-
XmlTypeCode.Date or XmlTypeCode.Time when configuration.UseDateOnly => true,
81+
XmlTypeCode.Date or XmlTypeCode.Time when configuration.UseDateOnly => false,
8282
XmlTypeCode.DateTime or XmlTypeCode.Date or XmlTypeCode.Time => !configuration.DateTimeWithTimeZone,
8383
XmlTypeCode.Base64Binary or XmlTypeCode.HexBinary => true,
8484
_ => false,

0 commit comments

Comments
 (0)