Merge commit '0a10d642167b49670d1fcb2bb12365aed9bbcecc'

Author: Jeavon

appveyor.yml

@@ -1,7 +1,7 @@
 os: Visual Studio 2017
 
 # Version format
-version: 1.0.2.{build}
+version: 1.0.3.{build}
 
 cache:
   - src\packages -> **\packages.config   # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified

src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs

@@ -16,6 +16,7 @@ namespace Our.Umbraco.FileSystemProviders.Azure
     using System.Linq;
     using System.Text.RegularExpressions;
     using System.Web;
+    using global::Umbraco.Core.Configuration;
     using global::Umbraco.Core.IO;
     using Microsoft.WindowsAzure.Storage;
     using Microsoft.WindowsAzure.Storage.Blob;
@@ -540,8 +541,19 @@ public DateTimeOffset GetLastModified(string path)
         /// <returns>
         /// The <see cref="string"/> representing the relative path.
         /// </returns>
+        /// <remarks>
+        /// Umbraco 7.5.15 changed the way that relative paths are used for media upload. 
+        /// This is the fixing issue where uploading file to replace creates new folder.
+        /// </remarks>
         public string GetRelativePath(string fullPathOrUrl)
         {
+            var lastSafeVersion = new Version(7, 5, 14);
+  
+            if (UmbracoVersion.Current.CompareTo(lastSafeVersion) > 0)
+            {
+                return this.FixPath(fullPathOrUrl);
+            }
+
             return this.ResolveUrl(fullPathOrUrl, true);
         }