Merge pull request #7 from kevklam/master

Add Edm.Date support

Author: Peter Nied

Templates/ObjC/Base/SharedObjC.template.tt

@@ -97,9 +97,12 @@ private string GetJsonToObjCExpressionConversion(string expr,OdcmProperty prop)
 {
     // This generates a wrapper around a provided JSON-typed expression (i.e. types obtained from NSJSONSerialization)
     //   that converts it to a user-friendly ObjC type i.e. generated Entity/enum class etc.
-    if(GetObjCTypeIdentifier(prop,true)=="NSDate")
+    if(GetObjCTypeIdentifier(prop,true)=="NSDate" ||
+       GetObjCTypeIdentifier(prop,true)=="MSDate")
     {
-        return String.Format(@"[NSDate ms_dateFromString: {0}]",expr);
+        return String.Format(@"[{0} ms_dateFromString: {1}]",
+            GetObjCTypeIdentifier(prop,true),
+            expr);
     }
 
     if(prop.IsEnum())

Templates/ObjC/Models/Models.h.tt

@@ -1,39 +1,31 @@
 <# // Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information. #>
 <#@ template debug="true" hostspecific="true" language="C#" #>
 <#@ include file="SharedObjC.template.tt"#>
-<#
-		
-var enums = model.GetEnumTypes();
 
+#import "MSDate.h"
+<#		
+var enums = model.GetEnumTypes();
 foreach(var e in enums)
 {
-
 #>
 #import "<#=writer.GetPrefix() + e.Name.ToUpperFirstChar()#>.h"
 <#
-
 }
 
 var complexTypes = model.GetComplexTypes().Where(complexType => !complexType.LongDescriptionContains("methodResponse"));
-
 foreach(var c in complexTypes)
 {
-
 #>
 #import "<#=writer.GetPrefix() + c.Name.ToUpperFirstChar()#>.h"
 <#
-
 }
 
 var entityTypes = model.GetEntityTypes();
-
 foreach(var et in entityTypes)
-{
-		 
+{	 
 #>
 #import "<#=writer.GetPrefix() + et.Name.ToUpperFirstChar()#>.h"
 <#
-
 }
 
 #>

src/GraphODataTemplateWriter/CodeHelpers/ObjC/TypeHelperObjC.cs

@@ -105,8 +105,9 @@ public static string GetTypeString(this OdcmType type)
                 case "Float":
                     return "CGFloat";
                 case "DateTimeOffset":
-                case "Date":
                     return "NSDate";
+                case "Date":
+                    return "MSDate";
                 case "Binary":
                     return "NSString";
                 case "Boolean":