Add support for System.DateOnly and System.TimeOnly types

azure-pipelines.yml

@@ -42,6 +42,12 @@ stages:
   - job: Build
     steps:
 
+    - task: UseDotNet@2
+      displayName: 'Use .NET SDK 8.0.x'
+      inputs:
+        packageType: 'sdk'
+        version: '8.0.x'
+
     - task: NuGetToolInstaller@0
       inputs:
         versionSpec: '>=5.2.0'
@@ -57,6 +63,7 @@ stages:
         solution: '$(sln)'
         platform: '$(buildPlatform)'
         configuration: '$(buildConfiguration)'
+        msbuildArgs: '/p:DeployExtension=false'
 
     - task: DotNetCoreCLI@2
       displayName: 'Pack Microsoft.OData.Cli package'

src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.cs

@@ -1690,10 +1690,10 @@ public override int GetHashCode()
     internal abstract string GeometryMultiPolygonTypeName { get; }
     internal abstract string GeometryMultiLineStringTypeName { get; }
     internal abstract string GeometryMultiPointTypeName { get; }
-    internal abstract string DateTypeName { get; }
+    internal abstract string DateOnlyTypeName { get; }
     internal abstract string DateTimeOffsetTypeName { get; }
     internal abstract string DurationTypeName { get; }
-    internal abstract string TimeOfDayTypeName { get; }
+    internal abstract string TimeOnlyTypeName { get; }
     internal abstract string XmlConvertClassName { get; }
     internal abstract string EnumTypeName { get; }
     internal abstract string DictionaryInterfaceName { get; }
@@ -4038,8 +4038,8 @@ internal static string GetPropertyInitializationValue(IEdmProperty property, boo
             }
             else if (valueClrType.Equals(clientTemplate.GuidTypeName)
                 | valueClrType.Equals(clientTemplate.DateTimeOffsetTypeName)
-                | valueClrType.Equals(clientTemplate.DateTypeName)
-                | valueClrType.Equals(clientTemplate.TimeOfDayTypeName))
+                | valueClrType.Equals(clientTemplate.DateOnlyTypeName)
+                | valueClrType.Equals(clientTemplate.TimeOnlyTypeName))
             {
                 defaultValue = valueClrType + ".Parse(\"" + defaultValue + "\")";
             }
@@ -4219,11 +4219,11 @@ internal static string GetClrTypeName(IEdmPrimitiveType edmPrimitiveType, ODataC
         }
         else if (kind== EdmPrimitiveTypeKind.Date)
         {
-            type= clientTemplate.DateTypeName;
+            type= clientTemplate.DateOnlyTypeName;
         }
         else if (kind== EdmPrimitiveTypeKind.TimeOfDay)
         {
-            type= clientTemplate.TimeOfDayTypeName;
+            type= clientTemplate.TimeOnlyTypeName;
         }
         else
         {
@@ -4298,10 +4298,10 @@ public ODataClientCSharpTemplate(CodeGenerationContext context)
     internal override string GeometryMultiPolygonTypeName { get { return "global::Microsoft.Spatial.GeometryMultiPolygon"; } }
     internal override string GeometryMultiLineStringTypeName { get { return "global::Microsoft.Spatial.GeometryMultiLineString"; } }
     internal override string GeometryMultiPointTypeName { get { return "global::Microsoft.Spatial.GeometryMultiPoint"; } }
-    internal override string DateTypeName { get { return "global::Microsoft.OData.Edm.Date"; } }
+    internal override string DateOnlyTypeName { get { return "global::System.DateOnly"; } }
     internal override string DateTimeOffsetTypeName { get { return "global::System.DateTimeOffset"; } }
     internal override string DurationTypeName { get { return "global::System.TimeSpan"; } }
-    internal override string TimeOfDayTypeName { get { return "global::Microsoft.OData.Edm.TimeOfDay"; } }
+    internal override string TimeOnlyTypeName { get { return "global::System.TimeOnly"; } }
     internal override string XmlConvertClassName { get { return "global::System.Xml.XmlConvert"; } }
     internal override string EnumTypeName { get { return "global::System.Enum"; } }
     internal override string DictionaryInterfaceName { get { return "global::System.Collections.Generic.IDictionary<{0}, {1}>"; } }
@@ -6441,10 +6441,10 @@ public ODataClientVBTemplate(CodeGenerationContext context)
     internal override string GeometryMultiPolygonTypeName { get { return "Global.Microsoft.Spatial.GeometryMultiPolygon"; } }
     internal override string GeometryMultiLineStringTypeName { get { return "Global.Microsoft.Spatial.GeometryMultiLineString"; } }
     internal override string GeometryMultiPointTypeName { get { return "Global.Microsoft.Spatial.GeometryMultiPoint"; } }
-    internal override string DateTypeName { get { return "Global.Microsoft.OData.Edm.Date"; } }
+    internal override string DateOnlyTypeName { get { return "Global.System.DateOnly"; } }
     internal override string DateTimeOffsetTypeName { get { return "Global.System.DateTimeOffset"; } }
     internal override string DurationTypeName { get { return "Global.System.TimeSpan"; } }
-    internal override string TimeOfDayTypeName { get { return "Global.Microsoft.OData.Edm.TimeOfDay"; } }
+    internal override string TimeOnlyTypeName { get { return "Global.System.TimeOnly"; } }
     internal override string XmlConvertClassName { get { return "Global.System.Xml.XmlConvert"; } }
     internal override string EnumTypeName { get { return "Global.System.Enum"; } }
     internal override string DictionaryInterfaceName { get { return "Global.System.Collections.Generic.IDictionary(Of {0}, {1})"; } }

src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.ttinclude

@@ -1547,10 +1547,10 @@ public abstract class ODataClientTemplate : TemplateBase
     internal abstract string GeometryMultiPolygonTypeName { get; }
     internal abstract string GeometryMultiLineStringTypeName { get; }
     internal abstract string GeometryMultiPointTypeName { get; }
-    internal abstract string DateTypeName { get; }
+    internal abstract string DateOnlyTypeName { get; }
     internal abstract string DateTimeOffsetTypeName { get; }
     internal abstract string DurationTypeName { get; }
-    internal abstract string TimeOfDayTypeName { get; }
+    internal abstract string TimeOnlyTypeName { get; }
     internal abstract string XmlConvertClassName { get; }
     internal abstract string EnumTypeName { get; }
     internal abstract string DictionaryInterfaceName { get; }
@@ -3895,8 +3895,8 @@ internal static class Utils
             }
             else if (valueClrType.Equals(clientTemplate.GuidTypeName)
                 | valueClrType.Equals(clientTemplate.DateTimeOffsetTypeName)
-                | valueClrType.Equals(clientTemplate.DateTypeName)
-                | valueClrType.Equals(clientTemplate.TimeOfDayTypeName))
+                | valueClrType.Equals(clientTemplate.DateOnlyTypeName)
+                | valueClrType.Equals(clientTemplate.TimeOnlyTypeName))
             {
                 defaultValue = valueClrType + ".Parse(\"" + defaultValue + "\")";
             }
@@ -4076,11 +4076,11 @@ internal static class Utils
         }
         else if (kind== EdmPrimitiveTypeKind.Date)
         {
-            type= clientTemplate.DateTypeName;
+            type= clientTemplate.DateOnlyTypeName;
         }
         else if (kind== EdmPrimitiveTypeKind.TimeOfDay)
         {
-            type= clientTemplate.TimeOfDayTypeName;
+            type= clientTemplate.TimeOnlyTypeName;
         }
         else
         {
@@ -4155,10 +4155,10 @@ public sealed class ODataClientCSharpTemplate : ODataClientTemplate
     internal override string GeometryMultiPolygonTypeName { get { return "global::Microsoft.Spatial.GeometryMultiPolygon"; } }
     internal override string GeometryMultiLineStringTypeName { get { return "global::Microsoft.Spatial.GeometryMultiLineString"; } }
     internal override string GeometryMultiPointTypeName { get { return "global::Microsoft.Spatial.GeometryMultiPoint"; } }
-    internal override string DateTypeName { get { return "global::Microsoft.OData.Edm.Date"; } }
+    internal override string DateOnlyTypeName { get { return "global::System.DateOnly"; } }
     internal override string DateTimeOffsetTypeName { get { return "global::System.DateTimeOffset"; } }
     internal override string DurationTypeName { get { return "global::System.TimeSpan"; } }
-    internal override string TimeOfDayTypeName { get { return "global::Microsoft.OData.Edm.TimeOfDay"; } }
+    internal override string TimeOnlyTypeName { get { return "global::System.TimeOnly"; } }
     internal override string XmlConvertClassName { get { return "global::System.Xml.XmlConvert"; } }
     internal override string EnumTypeName { get { return "global::System.Enum"; } }
     internal override string DictionaryInterfaceName { get { return "global::System.Collections.Generic.IDictionary<{0}, {1}>"; } }
@@ -5355,10 +5355,10 @@ public sealed class ODataClientVBTemplate : ODataClientTemplate
     internal override string GeometryMultiPolygonTypeName { get { return "Global.Microsoft.Spatial.GeometryMultiPolygon"; } }
     internal override string GeometryMultiLineStringTypeName { get { return "Global.Microsoft.Spatial.GeometryMultiLineString"; } }
     internal override string GeometryMultiPointTypeName { get { return "Global.Microsoft.Spatial.GeometryMultiPoint"; } }
-    internal override string DateTypeName { get { return "Global.Microsoft.OData.Edm.Date"; } }
+    internal override string DateOnlyTypeName { get { return "Global.System.DateOnly"; } }
     internal override string DateTimeOffsetTypeName { get { return "Global.System.DateTimeOffset"; } }
     internal override string DurationTypeName { get { return "Global.System.TimeSpan"; } }
-    internal override string TimeOfDayTypeName { get { return "Global.Microsoft.OData.Edm.TimeOfDay"; } }
+    internal override string TimeOnlyTypeName { get { return "Global.System.TimeOnly"; } }
     internal override string XmlConvertClassName { get { return "Global.System.Xml.XmlConvert"; } }
     internal override string EnumTypeName { get { return "Global.System.Enum"; } }
     internal override string DictionaryInterfaceName { get { return "Global.System.Collections.Generic.IDictionary(Of {0}, {1})"; } }

src/ODataConnectedService/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="ODataConnectedService.e30335d6-f9c7-4d08-b66a-f011f3f18477" Version="1.1.1" Language="en-US" Publisher="OData Labs" />
+        <Identity Id="ODataConnectedService.e30335d6-f9c7-4d08-b66a-f011f3f18477" Version="1.1.2" Language="en-US" Publisher="OData Labs" />
         <DisplayName>OData Connected Service</DisplayName>
         <Description xml:space="preserve">OData Connected Service for V1-V4</Description>
         <MoreInfo>https://github.com/odata/ODataConnectedService</MoreInfo>

src/ODataConnectedService_VS2022Plus/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="ODataConnectedService2022plus.5b4f5787-7c18-4eb4-bf4a-5d2fcd66278a" Version="1.1.1" Language="en-US" Publisher="OData Labs" />
+    <Identity Id="ODataConnectedService2022plus.5b4f5787-7c18-4eb4-bf4a-5d2fcd66278a" Version="1.1.2" Language="en-US" Publisher="OData Labs" />
     <DisplayName>OData Connected Service 2022+</DisplayName>
     <Description xml:space="preserve">OData Connected Service for V1-V4</Description>
     <MoreInfo>https://github.com/odata/ODataConnectedService</MoreInfo>

test/ODataConnectedService.Tests/CodeGenReferences/EntityPropertiesWithDefaultValues.cs

@@ -594,7 +594,7 @@ public virtual decimal DecimalPropWithLetter
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "#VersionNumber#")]
 
         [global::System.ComponentModel.DataAnnotations.RequiredAttribute(ErrorMessage = "DateProp is required.")]
-        public virtual global::Microsoft.OData.Edm.Date DateProp
+        public virtual global::System.DateOnly DateProp
         {
             get
             {
@@ -608,15 +608,15 @@ public virtual decimal DecimalPropWithLetter
             }
         }
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "#VersionNumber#")]
-        private global::Microsoft.OData.Edm.Date _DateProp = global::Microsoft.OData.Edm.Date.Parse("2020-02-02");
-        partial void OnDatePropChanging(global::Microsoft.OData.Edm.Date value);
+        private global::System.DateOnly _DateProp = global::System.DateOnly.Parse("2020-02-02");
+        partial void OnDatePropChanging(global::System.DateOnly value);
         partial void OnDatePropChanged();
         /// <summary>
         /// There are no comments for Property NullableDateProp in the schema.
         /// </summary>
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "#VersionNumber#")]
 
-        public virtual global::System.Nullable<global::Microsoft.OData.Edm.Date> NullableDateProp
+        public virtual global::System.Nullable<global::System.DateOnly> NullableDateProp
         {
             get
             {
@@ -630,8 +630,8 @@ public virtual decimal DecimalPropWithLetter
             }
         }
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "#VersionNumber#")]
-        private global::System.Nullable<global::Microsoft.OData.Edm.Date> _NullableDateProp = global::Microsoft.OData.Edm.Date.Parse("2020-02-02");
-        partial void OnNullableDatePropChanging(global::System.Nullable<global::Microsoft.OData.Edm.Date> value);
+        private global::System.Nullable<global::System.DateOnly> _NullableDateProp = global::System.DateOnly.Parse("2020-02-02");
+        partial void OnNullableDatePropChanging(global::System.Nullable<global::System.DateOnly> value);
         partial void OnNullableDatePropChanged();
         /// <summary>
         /// There are no comments for Property DateTimeOffsetProp in the schema.
@@ -684,7 +684,7 @@ public virtual decimal DecimalPropWithLetter
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "#VersionNumber#")]
 
         [global::System.ComponentModel.DataAnnotations.RequiredAttribute(ErrorMessage = "TimeOfDayProp is required.")]
-        public virtual global::Microsoft.OData.Edm.TimeOfDay TimeOfDayProp
+        public virtual global::System.TimeOnly TimeOfDayProp
         {
             get
             {
@@ -698,15 +698,15 @@ public virtual decimal DecimalPropWithLetter
             }
         }
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "#VersionNumber#")]
-        private global::Microsoft.OData.Edm.TimeOfDay _TimeOfDayProp = global::Microsoft.OData.Edm.TimeOfDay.Parse("22:44");
-        partial void OnTimeOfDayPropChanging(global::Microsoft.OData.Edm.TimeOfDay value);
+        private global::System.TimeOnly _TimeOfDayProp = global::System.TimeOnly.Parse("22:44");
+        partial void OnTimeOfDayPropChanging(global::System.TimeOnly value);
         partial void OnTimeOfDayPropChanged();
         /// <summary>
         /// There are no comments for Property NullableTimeOfDayProp in the schema.
         /// </summary>
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "#VersionNumber#")]
 
-        public virtual global::System.Nullable<global::Microsoft.OData.Edm.TimeOfDay> NullableTimeOfDayProp
+        public virtual global::System.Nullable<global::System.TimeOnly> NullableTimeOfDayProp
         {
             get
             {
@@ -720,8 +720,8 @@ public virtual decimal DecimalPropWithLetter
             }
         }
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "#VersionNumber#")]
-        private global::System.Nullable<global::Microsoft.OData.Edm.TimeOfDay> _NullableTimeOfDayProp = global::Microsoft.OData.Edm.TimeOfDay.Parse("22:44");
-        partial void OnNullableTimeOfDayPropChanging(global::System.Nullable<global::Microsoft.OData.Edm.TimeOfDay> value);
+        private global::System.Nullable<global::System.TimeOnly> _NullableTimeOfDayProp = global::System.TimeOnly.Parse("22:44");
+        partial void OnNullableTimeOfDayPropChanging(global::System.Nullable<global::System.TimeOnly> value);
         partial void OnNullableTimeOfDayPropChanged();
         /// <summary>
         /// There are no comments for Property DurationProp in the schema.