Merge branch 'develop'

Author: Jeavon

README.md

@@ -133,7 +133,7 @@ In `Web.config` create the new application keys and post fix each key with the `
 <add key="AzureBlobFileSystem.RootUrl:media" value="http://[myAccountName].blob.core.windows.net/" />
 <add key="AzureBlobFileSystem.MaxDays:media" value="365" />
 <add key="AzureBlobFileSystem.UseDefaultRoute:media" value="true" />
-<add key="AzureBlobFileSystem.UsePrivateContainer" value="false" />
+<add key="AzureBlobFileSystem.UsePrivateContainer:media" value="false" />
 ```
 
 ## Virtual Path Provider

appveyor.yml

@@ -1,7 +1,7 @@
 os: Visual Studio 2015
 
 # Version format
-version: 0.5.8.{build}
+version: 0.5.9.{build}
 
 cache:
   - src\packages -> **\packages.config   # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
@@ -37,7 +37,7 @@ deploy:
      # GitHub Deployment for releases
   - provider: GitHub
     auth_token:
-      secure: RH8UIklPiSC24UnsDFEHx5AHsMbpyLcYOKA4/ZnTsSc=
+      secure: gnJNHw3btYiQ7G0GexIGpSyA3moAz/GuJvgGZvJmz63/+YVLFC+qew/xlniRLDSk
     artifact: /.*\.zip/            # upload all Zip packages to release assets
     draft: false
     prerelease: false

src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Views/Configure.ascx

@@ -1,13 +1,13 @@
 <%@ Control Language="c#" AutoEventWireup="True" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
 
-<script src="/umbraco/lib/angular/1.1.5/angular.min.js"></script>
-<script src="/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Controllers/Configure.js"></script>
+<script src="~/umbraco/lib/angular/1.1.5/angular.min.js"></script>
+<script src="~/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Controllers/Configure.js"></script>
 
 <div ng-app ="UFSPLoader">
     <div ng-controller="Loader">
         <div class="row">        
             <div class="span1">
-                <img src="/App_Plugins/UmbracoFileSystemProviders/Azure/Install/azure-logo-32.png"/>
+                <img src="~/App_Plugins/UmbracoFileSystemProviders/Azure/Install/azure-logo-32.png"/>
             </div>
             <div><h4>Umbraco Azure File System Provider</h4></div>
         </div>

src/UmbracoFileSystemProviders.Azure.Tests/AzureBlobFileSystemTestsBase.cs

@@ -24,10 +24,11 @@ public class AzureBlobFileSystemTestsBase
         /// Creates an instance of <see cref="AzureBlobFileSystem"/> set up for developmental testing.
         /// </summary>
         /// <param name="disableVirtualPathProvider">Whether to disable the virtual path provider.</param>
+        /// <param name="appVirtualPath">Mocked virtual path of application</param>
         /// <returns>
         /// The <see cref="AzureBlobFileSystem"/>.
         /// </returns>
-        public AzureBlobFileSystem CreateAzureBlobFileSystem(bool disableVirtualPathProvider = false)
+        public AzureBlobFileSystem CreateAzureBlobFileSystem(bool disableVirtualPathProvider = false, string appVirtualPath = "")
         {
             string containerName = "media";
             string rootUrl = "http://127.0.0.1:10000/devstoreaccount1/";
@@ -45,7 +46,8 @@ public AzureBlobFileSystem CreateAzureBlobFileSystem(bool disableVirtualPathProv
                 {
                     LogHelper = logHelper.Object,
                     MimeTypeResolver = mimeTypeHelper.Object,
-                    DisableVirtualPathProvider = disableVirtualPathProvider
+                    DisableVirtualPathProvider = disableVirtualPathProvider,
+                    ApplicationVirtualPath = appVirtualPath
                 }
             };
         }
@@ -99,6 +101,23 @@ public void ResolveRelativePath()
             Assert.AreEqual("/media/1010/media.jpg", actual);
         }
 
+
+        /// <summary>
+        /// Asserts that the file system correctly resolves the relative path when Umbraco is hosted in virtual path
+        /// </summary>
+        [Test]
+        public void ResolveRelativePathWithAppVirtualPath()
+        {
+            // Arrange
+            AzureBlobFileSystem provider = this.CreateAzureBlobFileSystem(false, "/test");
+
+            // Act
+            string actual = provider.GetRelativePath("1010/media.jpg");
+
+            // Assert
+            Assert.AreEqual("/test/media/1010/media.jpg", actual);
+        }
+
         /// <summary>
         /// Asserts that the file system correctly resolves the relative path
         /// when the input has been prefixed.

src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj

@@ -141,8 +141,8 @@
       <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="SQLCE4Umbraco, Version=1.0.5443.21810, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UmbracoCms.Core.7.1.9\lib\SQLCE4Umbraco.dll</HintPath>
@@ -280,6 +280,9 @@
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/UmbracoFileSystemProviders.Azure.Tests/packages.config

@@ -27,7 +27,8 @@
   <package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
   <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="NUnit" version="3.6.1" targetFramework="net45" />
+  <package id="NUnit3TestAdapter" version="3.7.0" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
   <package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net45" />

src/UmbracoFileSystemProviders.Azure/AzureBlobFileSystem.cs

@@ -58,6 +58,18 @@ public AzureBlobFileSystem(string containerName, string rootUrl, string connecti
         {
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AzureBlobFileSystem"/> class.
+        /// </summary>
+        /// <param name="containerName">The container name.</param>
+        /// <param name="rootUrl">The root url.</param>
+        /// <param name="connectionString">The connection string.</param>
+        /// <param name="maxDays">The maximum number of days to cache blob items for in the browser.</param>
+        public AzureBlobFileSystem(string containerName, string rootUrl, string connectionString, string maxDays)
+            : this(containerName, rootUrl, connectionString, maxDays, "true", "false")
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AzureBlobFileSystem"/> class.
         /// </summary>
@@ -334,4 +346,4 @@ public Stream OpenFile(string path)
             return this.FileSystem.OpenFile(path);
         }
     }
-}
+}