Merge remote-tracking branch 'refs/remotes/origin/master' into cbales-working

Author: Caitlin Bales (MSFT)

Templates/ObjC/Requests/MethodRequestBuilder.h.tt

@@ -3,9 +3,9 @@
 <#@ include file="SharedObjC.template.tt"#>
 <#
 
-var func = host.CurrentType.AsOdcmMethod();
+OdcmMethod func = host.CurrentType.AsOdcmMethod();
 var entityName = writer.GetPrefix() + func.Class.Name.ToUpperFirstChar();
-var method = (func.IsFunction()) ? "GET" : "POST";
+var method = (func.IsFunction) ? "GET" : "POST";
 var methodName = "request"; 
 var requestType = entityName + func.Name.Substring(func.Name.IndexOf('.') + 1).ToUpperFirstChar() + "Request";
 var requestBuilderType = requestType + "Builder";

Templates/ObjC/Requests/MethodRequestBuilder.m.tt

@@ -4,7 +4,7 @@
 <#
 var func = host.CurrentType.AsOdcmMethod();
 var entityName = writer.GetPrefix() + func.Class.Name.ToUpperFirstChar();
-var method = (func.IsFunction()) ? "GET" : "POST";
+var method = (func.IsFunction) ? "GET" : "POST";
 var methodName = "request";
 var requestType = entityName + func.Name.Substring(func.Name.IndexOf('.') + 1).ToUpperFirstChar() + "Request";
 var requestBuilderType = requestType + "Builder";

Templates/TypeScript/src/entity_types.ts.tt

@@ -28,8 +28,13 @@ export type <#= enumType.Name.UpperCaseFirstChar() #> = <#= enumType.GetEnumValu
 #>
 
 export interface <#= entityType.Name.UpperCaseFirstChar() #><# if (entityType.Base != null) { #> extends <#=  entityType.Base.Name.UpperCaseFirstChar() #><# }#> {
+
 <# foreach(var prop in entityType.Properties.ToList()) { #>
+	<# if (prop.LongDescription != null) { #>
+    /** <#=prop.LongDescription#> */
+	<# } #>
     <#=  prop.Name #>?: <#= prop.GetTypeString() #>
+
 <# } #>
 }
 <#
@@ -39,10 +44,14 @@ export interface <#= entityType.Name.UpperCaseFirstChar() #><# if (entityType.Ba
   foreach(var complexType in complexTypes)
   {
 #>
-
 export interface <#= complexType.Name.UpperCaseFirstChar()#><# if (complexType.Base != null) { #> extends <#=  complexType.Base.Name.UpperCaseFirstChar() #><# }#> {
+
 <# foreach(var prop in complexType.Properties) { #>
-      <#= prop.Name #>?: <#= prop.GetTypeString() #>
+	<# if (prop.LongDescription != null) { #>
+    /** <#=prop.LongDescription#> */
+	<# } #>
+    <#= prop.Name #>?: <#= prop.GetTypeString() #>
+
 <# } #>
 }
 <# } #>

src/GraphODataTemplateWriter/CodeHelpers/TypeScript/TypeHelperTypeScript.cs

@@ -52,7 +52,7 @@ public static string GetTypeString(this OdcmProperty prop)
                     break;
 
             }
-            return (prop.IsCollection) ? "[" + typeStr + "]" : typeStr;
+            return (prop.IsCollection) ? typeStr + "[]" : typeStr;
 
         }
         public static String UpperCaseFirstChar(this String s)