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

Author: Caitlin Bales (MSFT)

Templates/TypeScript/src/entity_types.ts.tt

@@ -16,6 +16,7 @@
 
 <#= writer.WriteHeader() #>
 
+export as namespace microsoftgraph;
 
 <# foreach(var enumType in enumTypes) { #>
 export type <#= enumType.Name.UpperCaseFirstChar() #> = <#= enumType.GetEnumValues() #>
@@ -39,7 +40,7 @@ export interface <#= entityType.Name.UpperCaseFirstChar() #><# if (entityType.Ba
   {
 #>
 
-export interface <#= complexType.Name.UpperCaseFirstChar()#> {
+export interface <#= complexType.Name.UpperCaseFirstChar()#><# if (complexType.Base != null) { #> extends <#=  complexType.Base.Name.UpperCaseFirstChar() #><# }#> {
 <# foreach(var prop in complexType.Properties) { #>
       <#= prop.Name #>?: <#= prop.GetTypeString() #>
 <# } #>

src/GraphODataTemplateWriter/CodeHelpers/TypeScript/TypeHelperTypeScript.cs

@@ -29,11 +29,12 @@ public static string GetTypeString(this OdcmProperty prop)
                 case "Int32":
                 case "Int64":
                 case "Double":
+                case "Single":
                 case "Binary": // let binary: number = 0b1010;
-                case "Duration": //Edm.Duration
                     typeStr = "number";
                     break;
                 case "Guid":
+                case "Duration":
                 case "String":
                     typeStr = "string"; //lowercase
                     break;
@@ -46,6 +47,9 @@ public static string GetTypeString(this OdcmProperty prop)
                 case "Boolean":
                     typeStr = "boolean";
                     break;
+                case "Byte": //https://graph.microsoft.io/en-us/docs/api-reference/beta/resources/intune_onboarding_rgbcolor
+                    typeStr = "number";
+                    break;
 
             }
             return (prop.IsCollection) ? "[" + typeStr + "]" : typeStr;
@@ -58,4 +62,4 @@ public static String UpperCaseFirstChar(this String s)
 
 
     }
-}
+}