Merge branch 'develop'

Author: Jeavon

appveyor.yml

@@ -1,7 +1,7 @@
 os: Visual Studio 2017
 
 # Version format
-version: 1.0.1.{build}
+version: 1.0.2.{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.Tests/AzureBlobFileSystemTestsBase.cs

@@ -365,7 +365,7 @@ public void TestGetFilesInvalidPath()
             IEnumerable<string> actual = provider.GetFiles("/somethingmissing", "*.jpg");
 
             // Assert
-            Assert.IsNull(actual);
+            Assert.IsEmpty(actual);
         }
 
         /// <summary>

src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs

@@ -466,7 +466,7 @@ public IEnumerable<string> GetFiles(string path, string filter)
             if (!blobList.Any())
             {
                 this.LogHelper.Error<AzureFileSystem>("Blob not found", new DirectoryNotFoundException($"Blob not found at '{path}'"));
-                return null;
+                return Enumerable.Empty<string>();
             }
 
             return blobList.OfType<CloudBlockBlob>().Select(cd =>
@@ -694,6 +694,8 @@ private string FixPath(string path)
                 return string.Empty;
             }
 
+            path = path.Replace("\\", Delimiter);
+
             string appVirtualPath = this.ApplicationVirtualPath;
             if (appVirtualPath != null && path.StartsWith(appVirtualPath))
             {
@@ -728,7 +730,7 @@ private string FixPath(string path)
                 path = path.Substring(1);
             }
 
-            return path.Replace("\\", Delimiter).TrimStart(Delimiter.ToCharArray()).TrimEnd(Delimiter.ToCharArray());
+            return path.TrimStart(Delimiter.ToCharArray()).TrimEnd(Delimiter.ToCharArray());
         }
     }
 }