Merge branch 'petrce-master'

Author: Michael Hallett

.nuget/RestSharp.Build.dll

@@ -240,7 +240,7 @@ private void AddSharedHeaderActions()
 #endif
 
 #if FRAMEWORK
-            restrictedHeaderActions.Add("Range", (r, v) => { AddRange(r, v); });
+            restrictedHeaderActions.Add("Range", AddRange);
 #endif
         }
 

RestSharp/Http.cs

@@ -136,27 +136,29 @@ public interface IRestRequest
         /// </summary>
         /// <param name="name">The parameter name to use in the request</param>
         /// <param name="path">Full path to file to upload</param>
+        /// <param name="contentType">The MIME type of the file to upload</param>
         /// <returns>This request</returns>
-        IRestRequest AddFile(string name, string path);
+        IRestRequest AddFile(string name, string path, string contentType = null);
 
         /// <summary>
-        /// Adds the bytes to the Files collection with the specified file name
+        /// Adds the bytes to the Files collection with the specified file name and content type
         /// </summary>
         /// <param name="name">The parameter name to use in the request</param>
         /// <param name="bytes">The file data</param>
         /// <param name="fileName">The file name to use for the uploaded file</param>
+        /// <param name="contentType">The MIME type of the file to upload</param>
         /// <returns>This request</returns>
-        IRestRequest AddFile(string name, byte[] bytes, string fileName);
+        IRestRequest AddFile(string name, byte[] bytes, string fileName, string contentType = null);
 
         /// <summary>
         /// Adds the bytes to the Files collection with the specified file name and content type
         /// </summary>
         /// <param name="name">The parameter name to use in the request</param>
-        /// <param name="bytes">The file data</param>
+        /// <param name="writer">A function that writes directly to the stream.  Should NOT close the stream.</param>
         /// <param name="fileName">The file name to use for the uploaded file</param>
         /// <param name="contentType">The MIME type of the file to upload</param>
         /// <returns>This request</returns>
-        IRestRequest AddFile(string name, byte[] bytes, string fileName, string contentType);
+        IRestRequest AddFile(string name, Action<Stream> writer, string fileName, string contentType = null);
 #endif
 
         /// <summary>

RestSharp/IRestRequest.cs

@@ -120,8 +120,9 @@ public RestRequest(Uri resource, Method method)
         /// </summary>
         /// <param name="name">The parameter name to use in the request</param>
         /// <param name="path">Full path to file to upload</param>
+        /// <param name="contentType">The MIME type of the file to upload</param>
         /// <returns>This request</returns>
-        public IRestRequest AddFile(string name, string path)
+        public IRestRequest AddFile(string name, string path, string contentType = null)
         {
             FileInfo f = new FileInfo(path);
             long fileLength = f.Length;
@@ -137,7 +138,8 @@ public IRestRequest AddFile(string name, string path)
                                             {
                                                 file.BaseStream.CopyTo(s);
                                             }
-                                        }
+                                        },
+                                ContentType = contentType
                            });
         }
 
@@ -147,37 +149,13 @@ public IRestRequest AddFile(string name, string path)
         /// <param name="name">The parameter name to use in the request</param>
         /// <param name="bytes">The file data</param>
         /// <param name="fileName">The file name to use for the uploaded file</param>
-        /// <returns>This request</returns>
-        public IRestRequest AddFile(string name, byte[] bytes, string fileName)
-        {
-            return this.AddFile(FileParameter.Create(name, bytes, fileName));
-        }
-
-        /// <summary>
-        /// Adds the bytes to the Files collection with the specified file name and content type
-        /// </summary>
-        /// <param name="name">The parameter name to use in the request</param>
-        /// <param name="bytes">The file data</param>
-        /// <param name="fileName">The file name to use for the uploaded file</param>
         /// <param name="contentType">The MIME type of the file to upload</param>
         /// <returns>This request</returns>
-        public IRestRequest AddFile(string name, byte[] bytes, string fileName, string contentType)
+        public IRestRequest AddFile(string name, byte[] bytes, string fileName, string contentType = null)
         {
             return this.AddFile(FileParameter.Create(name, bytes, fileName, contentType));
         }
 
-        /// <summary>
-        /// Adds the bytes to the Files collection with the specified file name and content type
-        /// </summary>
-        /// <param name="name">The parameter name to use in the request</param>
-        /// <param name="writer">A function that writes directly to the stream.  Should NOT close the stream.</param>
-        /// <param name="fileName">The file name to use for the uploaded file</param>
-        /// <returns>This request</returns>
-        public IRestRequest AddFile(string name, Action<Stream> writer, string fileName)
-        {
-            return this.AddFile(name, writer, fileName, null);
-        }
-
         /// <summary>
         /// Adds the bytes to the Files collection with the specified file name and content type
         /// </summary>
@@ -186,7 +164,7 @@ public IRestRequest AddFile(string name, Action<Stream> writer, string fileName)
         /// <param name="fileName">The file name to use for the uploaded file</param>
         /// <param name="contentType">The MIME type of the file to upload</param>
         /// <returns>This request</returns>
-        public IRestRequest AddFile(string name, Action<Stream> writer, string fileName, string contentType)
+        public IRestRequest AddFile(string name, Action<Stream> writer, string fileName, string contentType = null)
         {
             return AddFile(new FileParameter
                            {