Merge branch 'master' into iambmelt/working

Author: Brian Melton

Templates/CSharp/Base/CollectionRequest.Base.template.tt

@@ -58,7 +58,7 @@ public void AppendMethodHeaderToPostAsyncMethod(string propertyType, string sani
     stringBuilder.Append("        /// </summary>");
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.AppendFormat("        /// <param name=\"{0}\">The {1} to add.</param>", sanitizedPropertyName, propertyType);
-    
+
     if (includeSendParameters)
     {
         stringBuilder.Append(Environment.NewLine);
@@ -72,93 +72,93 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty, string requestBody =
     {
         var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
         var propertyType = this.GetPropertyTypeName(odcmProperty);
-        
+
         var templateWriterHost = (CustomT4Host)Host;
         var templateWriter = (CodeWriterCSharp)templateWriterHost.CodeWriter;
 
         var stringBuilder = new StringBuilder();
-        
+
         stringBuilder.Append(Environment.NewLine);
         this.AppendMethodHeaderToPostAsyncMethod(propertyType, sanitizedPropertyName, stringBuilder, false);
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.AppendFormat("        /// <returns>The created {0}.</returns>", propertyType);
         stringBuilder.Append(Environment.NewLine);
-        stringBuilder.AppendFormat("        public Task<{0}> AddAsync({0} {1})", propertyType, sanitizedPropertyName);
+        stringBuilder.AppendFormat("        public System.Threading.Tasks.Task<{0}> AddAsync({0} {1})", propertyType, sanitizedPropertyName);
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.Append("        {");
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.AppendFormat("            return this.AddAsync({0}, CancellationToken.None);", sanitizedPropertyName);
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.Append("        }");
-        
+
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.Append(Environment.NewLine);
-        
+
         this.AppendMethodHeaderToPostAsyncMethod(propertyType, sanitizedPropertyName, stringBuilder, true);
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.AppendFormat("        /// <returns>The created {0}.</returns>", propertyType);
         stringBuilder.Append(Environment.NewLine);
-        stringBuilder.AppendFormat("        public Task<{0}> AddAsync({0} {1}, CancellationToken cancellationToken)", propertyType, sanitizedPropertyName);
+        stringBuilder.AppendFormat("        public System.Threading.Tasks.Task<{0}> AddAsync({0} {1}, CancellationToken cancellationToken)", propertyType, sanitizedPropertyName);
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.Append("        {");
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.AppendFormat("            this.ContentType = \"{0}\";", templateWriter.jsonContentType);
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.Append("            this.Method = \"POST\";");
-        
+
         var entity = odcmProperty.Projection.Type.AsOdcmClass();
 
         if (entity != null && entity.IsAbstract)
         {
             stringBuilder.Append(Environment.NewLine);
             stringBuilder.AppendFormat("            {0}.ODataType = string.Concat(\"#\", StringHelper.ConvertTypeToLowerCamelCase({0}.GetType().FullName));", sanitizedPropertyName);
         }
-        
+
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.AppendFormat("            return this.SendAsync<{0}>({1}, cancellationToken);", propertyType, sanitizedPropertyName);
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.Append("        }");
         stringBuilder.Append(Environment.NewLine);
-        
+
         return stringBuilder.ToString();
     }
-    
+
     return string.Empty;
 }
 
 public string GetPostAsyncMethodForReferencesRequest(OdcmProperty odcmProperty)
 {
     var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
     var propertyType = this.GetPropertyTypeName(odcmProperty);
-        
+
     var templateWriterHost = (CustomT4Host)Host;
     var templateWriter = (CodeWriterCSharp)templateWriterHost.CodeWriter;
-    
+
     var serviceNavigationProperty = odcmProperty.GetServiceCollectionNavigationPropertyForPropertyType();
 
     var stringBuilder = new StringBuilder();
-    
+
     stringBuilder.Append(Environment.NewLine);
     this.AppendMethodHeaderToPostAsyncMethod(propertyType, sanitizedPropertyName, stringBuilder, false);
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.AppendFormat("        /// <returns>The task to await.</returns>", propertyType);
     stringBuilder.Append(Environment.NewLine);
-    stringBuilder.AppendFormat("        public Task AddAsync({0} {1})", propertyType, sanitizedPropertyName);
+    stringBuilder.AppendFormat("        public System.Threading.Tasks.Task AddAsync({0} {1})", propertyType, sanitizedPropertyName);
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.Append("        {");
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.AppendFormat("            return this.AddAsync({0}, CancellationToken.None);", sanitizedPropertyName);
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.Append("        }");
-    
+
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.Append(Environment.NewLine);
-    
+
     this.AppendMethodHeaderToPostAsyncMethod(propertyType, sanitizedPropertyName, stringBuilder, true);
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.AppendFormat("        /// <returns>The task to await.</returns>", propertyType);
     stringBuilder.Append(Environment.NewLine);
-    stringBuilder.AppendFormat("        public Task AddAsync({0} {1}, CancellationToken cancellationToken)", propertyType, sanitizedPropertyName);
+    stringBuilder.AppendFormat("        public System.Threading.Tasks.Task AddAsync({0} {1}, CancellationToken cancellationToken)", propertyType, sanitizedPropertyName);
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.Append("        {");
     stringBuilder.Append(Environment.NewLine);
@@ -182,7 +182,7 @@ public string GetPostAsyncMethodForReferencesRequest(OdcmProperty odcmProperty)
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.Append("        }");
     stringBuilder.Append(Environment.NewLine);
-        
+
     return stringBuilder.ToString();
 }
 

Templates/CSharp/Base/CollectionRequestBuilder.Base.template.tt

@@ -82,7 +82,7 @@ public string GetCollectionReferencesRequestBuilder(OdcmProperty odcmProperty)
     {
         var stringBuilder = new StringBuilder();
         var entityReferencesRequestBuilder = this.GetPropertyCollectionReferencesRequestBuilderName(odcmProperty);
-        
+
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.Append("        /// <summary>");
         stringBuilder.Append(Environment.NewLine);
@@ -108,7 +108,7 @@ public string GetCollectionReferencesRequestBuilder(OdcmProperty odcmProperty)
 
         return stringBuilder.ToString();
     }
-    
+
     return string.Empty;
 }
 
@@ -122,7 +122,7 @@ public string GetCollectionIndexRequestBuilder(OdcmProperty odcmProperty)
     var stringBuilder = new StringBuilder();
     var propTypeName = string.Concat(this.GetEntityNameString(odcmProperty.Class), this.GetPropertyTypeName(odcmProperty));
     var entityRequestBuilder = this.GetPropertyTypeRequestBuilderName(odcmProperty);
-        
+
     stringBuilder.Append("/// <summary>");
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.AppendFormat("        /// Gets an <see cref=\"I{0}\"/> for the specified {1}.", entityRequestBuilder, propTypeName);
@@ -140,12 +140,12 @@ public string GetCollectionIndexRequestBuilder(OdcmProperty odcmProperty)
             get
             {
 ");
-        
+
     stringBuilder.AppendFormat("                return new {0}(this.AppendSegmentToRequestUrl(id), this.Client);", entityRequestBuilder);
     stringBuilder.Append(@"
             }
         }");
-        
+
     return stringBuilder.ToString();
 }
 
@@ -156,7 +156,7 @@ public string GetCollectionWithReferencesIndexRequestBuilder(OdcmProperty odcmPr
 
     var propTypeName = string.Concat(this.GetEntityNameString(odcmProperty.Class), this.GetPropertyTypeName(odcmProperty));
     var entityRequestBuilder = this.GetPropertyTypeWithReferenceRequestBuilderName(odcmProperty);
-    
+
     stringBuilder.Append("/// <summary>");
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.AppendFormat("        /// Gets an <see cref=\"I{0}\"/> for the specified {1}.", entityRequestBuilder, propTypeName);
@@ -179,7 +179,7 @@ public string GetCollectionWithReferencesIndexRequestBuilder(OdcmProperty odcmPr
             }
         }
 ");
-    
+
     return stringBuilder.ToString();
 }