Merge remote-tracking branch 'refs/remotes/origin/feature/independent-container' into develop

JimBobSquarePants · JimBobSquarePants · commit 0337fb5ca0e2 · 2016-03-21T22:41:22.000+11:00
diff --git a/build/transforms/FileSystemProviders.config.install.xdt b/build/transforms/FileSystemProviders.config.install.xdt
@@ -17,6 +17,11 @@
         Defaults to 365 days.
       -->
       <add key="maxDays" value="365" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+      <!--
+        When true this allows the VirtualPathProvider to use the deafult "media" route prefix regardless 
+        of the container name.
+      -->
+      <add key="useDefaultRoute" value="true" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
     </Parameters>
   </Provider>
   <!--
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Controllers/Configure.js b/src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Controllers/Configure.js
@@ -36,4 +36,8 @@ configApp.controller("Loader", function ($scope, $http, $log) {
     $scope.capitalizeFirstLetter = function (string) {
         return string.charAt(0).toUpperCase() + string.slice(1);
     }
+
+    $scope.getInputType = function (param) {
+        return param.toUpperCase() === "USEDEFAULTROUTE" ? "checkbox" : "text";
+    }
 });
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Views/Configure.ascx b/src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Views/Configure.ascx
@@ -37,13 +37,8 @@
                             <ng-form name="form">
                             <label class="control-label" for="param.Key">{{ capitalizeFirstLetter(param.Key) }}</label>
                                 <div class="controls">
-                                    <input 
-                                        class ="input-block-level"
-                                        dynamic-name="param.Key"
-                                        type="text"
-                                        ng-model="param.Value"                            
-                                        required
-                                    >
+                                    <span ng-if="getInputType(param.Key) === 'checkbox'" ng-include="'/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Views/checkbox.htm'"></span>
+                                    <span ng-if="getInputType(param.Key) === 'text'" ng-include="'/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Views/textfield.htm'"></span>
                                 </div>
                                 <span data-ng-show=" {{'form.'+param.Key+'.$dirty && form.'+param.Key+'.$error.required'}}">Required!</span>
                             </ng-form>
@@ -78,4 +73,5 @@
         </div>
            
     </div>
-</div>
+</div>
+
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Views/checkbox.htm b/src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Views/checkbox.htm
@@ -0,0 +1,6 @@
+﻿<input class="input-block-level"
+	   dynamic-name="param.Key"
+	   type="checkbox"
+	   ng-model="param.Value"
+	   ng-true-value="true"
+	   ng-false-value="false">
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Views/textfield.htm b/src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Views/textfield.htm
@@ -0,0 +1,5 @@
+﻿<input class="input-block-level"
+	   dynamic-name="param.Key"
+	   type="text"
+	   ng-model="param.Value"
+	   required>
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/InstallerController.cs b/src/UmbracoFileSystemProviders.Azure.Installer/InstallerController.cs
@@ -62,16 +62,20 @@ public IEnumerable<Parameter> GetParameters()
         [HttpPost]
         public InstallerStatus PostParameters(IEnumerable<Parameter> parameters)
         {
-            var connection = parameters.SingleOrDefault(k => k.Key == "connectionString").Value;
-            var containerName = parameters.SingleOrDefault(k => k.Key == "containerName").Value;
-            var rootUrl = parameters.SingleOrDefault(k => k.Key == "rootUrl").Value;
+            var newParameters = parameters as IList<Parameter> ?? parameters.ToList();
+            var connection = newParameters.SingleOrDefault(k => k.Key == "connectionString").Value;
+            var containerName = newParameters.SingleOrDefault(k => k.Key == "containerName").Value;
+            bool useDefaultRoute = bool.Parse(newParameters.SingleOrDefault(k => k.Key == "useDefaultRoute").Value);
+            var rootUrl = newParameters.SingleOrDefault(k => k.Key == "rootUrl").Value;
 
             if (!TestAzureCredentials(connection, containerName))
             {
                 return InstallerStatus.ConnectionError;
             }
 
-            if (SaveParametersToFileSystemProvidersXdt(this.fileSystemProvidersConfigInstallXdtPath, parameters) && SaveContainerNameToWebConfigXdt(this.webConfigXdtPath, containerName))
+            var routePrefix = useDefaultRoute ? Azure.Constants.DefaultMediaRoute : containerName;
+
+            if (SaveParametersToFileSystemProvidersXdt(this.fileSystemProvidersConfigInstallXdtPath, newParameters) && SaveContainerNameToWebConfigXdt(this.webConfigXdtPath, routePrefix))
             {
                 if (!ExecuteFileSystemConfigTransform() || !ExecuteWebConfigTransform())
                 {
@@ -85,7 +89,7 @@ public InstallerStatus PostParameters(IEnumerable<Parameter> parameters)
                 else
                 {
                     // merge in storage url to ImageProcessor security.config xdt
-                    SaveBlobPathToImageProcessorSecurityXdt(ImageProcessorSecurityInstallXdtPath, rootUrl, containerName);
+                    SaveBlobPathToImageProcessorSecurityXdt(ImageProcessorSecurityInstallXdtPath, rootUrl, routePrefix, containerName);
 
                     // transform ImageProcessor security.config
                     if (ExecuteImageProcessorSecurityConfigTransform())
@@ -180,7 +184,10 @@ internal static bool SaveContainerNameToWebConfigXdt(string xdtPath, string cont
             nsMgr.AddNamespace("xdt", strNamespace);
 
             var locationElement = document.SelectSingleNode(string.Format("//location"));
-            if (locationElement != null) locationElement.Attributes["path"].Value = containerName;
+            if (locationElement != null)
+            {
+                locationElement.Attributes["path"].Value = containerName;
+            }
 
             try
             {
@@ -199,7 +206,7 @@ internal static bool SaveContainerNameToWebConfigXdt(string xdtPath, string cont
             return result;
         }
 
-        internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, string rootUrl, string containerName)
+        internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, string rootUrl, string prefix, string containerName)
         {
             var result = false;
 
@@ -214,11 +221,11 @@ internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, str
 
             foreach (XmlElement service in rawServices)
             {
-                service.SetAttribute("prefix", $"{containerName}/");
+                service.SetAttribute("prefix", $"{prefix}/");
             }
 
             // Set the settings within the InsertIfMissing action
-            var rawSettings = document.SelectNodes($"//services/service[@prefix = '{containerName}/' and @name = '{ImageProcessorSecurityServiceName}' and @type = '{ImageProcessorSecurityServiceType}']/settings/setting");
+            var rawSettings = document.SelectNodes($"//services/service[@prefix = '{prefix}/' and @name = '{ImageProcessorSecurityServiceName}' and @type = '{ImageProcessorSecurityServiceType}']/settings/setting");
             if (rawSettings == null)
             {
                 return false;
@@ -249,14 +256,14 @@ internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, str
         internal static IEnumerable<Parameter> GetParametersFromXdt(string xdtPath, string configPath)
         {
             // For package upgrades check for configured values in existing FileSystemProviders.config and merge with the Parameters from the XDT file (there could be new ones)
-            var xdtParameters = GetParametersFromXml(xdtPath);
-            var currentConfigParameters = GetParametersFromXml(configPath);
+            List<Parameter> xdtParameters = GetParametersFromXml(xdtPath).ToList();
+            List<Parameter> currentConfigParameters = GetParametersFromXml(configPath).ToList();
 
-            foreach (var parameter in xdtParameters)
+            foreach (Parameter parameter in xdtParameters)
             {
                 if (currentConfigParameters.Select(k => k.Key).Contains(parameter.Key))
                 {
-                    var currentParameter = currentConfigParameters.SingleOrDefault(k => k.Key == parameter.Key);
+                    Parameter currentParameter = currentConfigParameters.SingleOrDefault(k => k.Key == parameter.Key);
                     if (currentParameter != null)
                     {
                         parameter.Value = currentParameter.Value;
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj b/src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj
@@ -271,9 +271,11 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Configurator\Controllers\Configure.js" />
+    <Content Include="Configurator\Views\checkbox.htm" />
     <Content Include="Configurator\Views\Configure.ascx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
+    <Content Include="Configurator\Views\textfield.htm" />
   </ItemGroup>
   <ItemGroup>
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta014\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/AzureBlobFileSystemTestsBase.cs b/src/UmbracoFileSystemProviders.Azure.Tests/AzureBlobFileSystemTestsBase.cs
@@ -41,11 +41,12 @@ public AzureBlobFileSystem CreateAzureBlobFileSystem(bool disableVirtualPathProv
             string rootUrl = "http://127.0.0.1:10000/devstoreaccount1/";
             string connectionString = "UseDevelopmentStorage=true";
             string maxDays = "30";
+            string useDefaultRoute = "true";
 
             Mock<ILogHelper> logHelper = new Mock<ILogHelper>();
             Mock<IMimeTypeResolver> mimeTypeHelper = new Mock<IMimeTypeResolver>();
 
-            return new AzureBlobFileSystem(containerName, rootUrl, connectionString, maxDays)
+            return new AzureBlobFileSystem(containerName, rootUrl, connectionString, maxDays, useDefaultRoute)
             {
                 FileSystem =
                 {
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/FileSystemProviders.config.install.xdt b/src/UmbracoFileSystemProviders.Azure.Tests/FileSystemProviders.config.install.xdt
@@ -8,7 +8,7 @@
   </Provider>
 
   <Provider alias="media" type="Our.Umbraco.FileSystemProviders.Azure.AzureBlobFileSystem, Our.Umbraco.FileSystemProviders.Azure" xdt:Locator="Match(type)" xdt:Transform="InsertIfMissing">
-      <Parameters xdt:Transform="InsertIfMissing">
+    <Parameters xdt:Transform="InsertIfMissing">
       <add key="containerName" value="media" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
       <add key="rootUrl" value="http://[myAccountName].blob.core.windows.net/" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
       <add key="connectionString" value="DefaultEndpointsProtocol=https;AccountName=[myAccountName];AccountKey=[myAccountKey]" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
@@ -17,6 +17,11 @@
         Defaults to 365 days.
       -->
       <add key="maxDays" value="365" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+      <!--
+        When true this allows the VirtualPathProvider to use the deafult "media" route prefix regardless 
+        of the container name.
+      -->
+      <add key="useDefaultRoute" value="true" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
     </Parameters>
   </Provider>
   <!--
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/FileSystemProviders.upgrade.config b/src/UmbracoFileSystemProviders.Azure.Tests/FileSystemProviders.upgrade.config
@@ -1,19 +1,24 @@
 ﻿<?xml version="1.0"?>
 <FileSystemProviders>
-  
+
   <!-- Media -->
   <Provider alias="media" type="Our.Umbraco.FileSystemProviders.Azure.AzureBlobFileSystem, Our.Umbraco.FileSystemProviders.Azure">
-  	<Parameters>
-  		<add key="containerName" value="media"/>
-  		<add key="rootUrl" value="http://existing123456789.blob.core.windows.net/"/>
-  		<add key="connectionString"
+    <Parameters>
+      <add key="containerName" value="media"/>
+      <add key="rootUrl" value="http://existing123456789.blob.core.windows.net/"/>
+      <add key="connectionString"
   			value="DefaultEndpointsProtocol=https;AccountName=existing123456789;AccountKey=existingKey"/>
-  		<!--
+      <!--
         Optional configuration value determining the maximum number of days to cache items in the browser.
         Defaults to 365 days.
       -->
-  		<add key="maxDays" value="365"/>
-  	</Parameters>
+      <add key="maxDays" value="365"/>
+      <!--
+        When true this allows the VirtualPathProvider to use the deafult "media" route prefix regardless 
+        of the container name.
+      -->
+      <add key="useDefaultRoute" value="true"/>
+    </Parameters>
   </Provider>
-   
+
 </FileSystemProviders>
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/FileSystemVirtualPathProviderTests.cs b/src/UmbracoFileSystemProviders.Azure.Tests/FileSystemVirtualPathProviderTests.cs
@@ -36,8 +36,8 @@ public void FilePathPrefixFormatted()
         {
             // Arrange/Act
             Mock<IFileSystem> fileProvider = new Mock<IFileSystem>();
-            FileSystemVirtualPathProvider provider = new FileSystemVirtualPathProvider("media", new Lazy<IFileSystem>(() => fileProvider.Object));
-            
+            FileSystemVirtualPathProvider provider = new FileSystemVirtualPathProvider(Constants.DefaultMediaRoute, new Lazy<IFileSystem>(() => fileProvider.Object));
+
             // Assert
             Assert.AreEqual(provider.PathPrefix, "/media/");
         }
@@ -54,7 +54,7 @@ public void FilePathShouldBeExecuted()
 
             // Act
             VirtualFile result = provider.GetFile("~/media/1010/media.jpg");
-            
+
             // Assert
             Assert.IsNotNull(result);
         }
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/InstallerTests.cs b/src/UmbracoFileSystemProviders.Azure.Tests/InstallerTests.cs
@@ -25,7 +25,7 @@ public void CheckXdtFirstParameterKey()
         public void CheckXdtNumberOfParameters()
         {
             var parameters = InstallerController.GetParametersFromXml("FileSystemProviders.config.install.xdt");
-            Assert.AreEqual(4, parameters.Count());
+            Assert.AreEqual(5, parameters.Count());
         }
 
         [Test]
@@ -41,6 +41,5 @@ public void CheckNewInstallDefaultConfig()
             var parameters = InstallerController.GetParametersFromXdt("FileSystemProviders.config.install.xdt", "FileSystemProviders.default.config");
             Assert.AreEqual("http://[myAccountName].blob.core.windows.net/", parameters.Single(k => k.Key == "rootUrl").Value);
         }
-
     }
 }
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/stylecop.json b/src/UmbracoFileSystemProviders.Azure.Tests/stylecop.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
   "settings": {
     "documentationRules": {
-      "companyName": "James Jackson-South",
+      "companyName": "James Jackson-South and contributors",
       "copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the Apache License, Version 2.0."
     }    
   }
diff --git a/src/UmbracoFileSystemProviders.Azure/AzureBlobFileSystem.cs b/src/UmbracoFileSystemProviders.Azure/AzureBlobFileSystem.cs
@@ -24,8 +24,8 @@ public class AzureBlobFileSystem : IFileSystem
         /// <param name="containerName">The container name.</param>
         /// <param name="rootUrl">The root url.</param>
         /// <param name="connectionString">The connection string.</param>
-        public AzureBlobFileSystem(string containerName, string rootUrl, string connectionString) :
-            this(containerName, rootUrl, connectionString, "365")
+        public AzureBlobFileSystem(string containerName, string rootUrl, string connectionString)
+            : this(containerName, rootUrl, connectionString, "365", "true")
         {
         }
 
@@ -36,9 +36,10 @@ public AzureBlobFileSystem(string containerName, string rootUrl, string connecti
         /// <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)
+        /// <param name="useDefaultRoute">Whether to use the default "media" route in the url independent of the blob container.</param>
+        public AzureBlobFileSystem(string containerName, string rootUrl, string connectionString, string maxDays, string useDefaultRoute)
         {
-            this.FileSystem = AzureFileSystem.GetInstance(containerName, rootUrl, connectionString, maxDays);
+            this.FileSystem = AzureFileSystem.GetInstance(containerName, rootUrl, connectionString, maxDays, useDefaultRoute);
         }
 
         /// <summary>
diff --git a/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs b/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs
diff --git a/src/UmbracoFileSystemProviders.Azure/Constants.cs b/src/UmbracoFileSystemProviders.Azure/Constants.cs
diff --git a/src/UmbracoFileSystemProviders.Azure/FileSystemVirtualFile.cs b/src/UmbracoFileSystemProviders.Azure/FileSystemVirtualFile.cs
diff --git a/src/UmbracoFileSystemProviders.Azure/FileSystemVirtualPathProvider.cs b/src/UmbracoFileSystemProviders.Azure/FileSystemVirtualPathProvider.cs
diff --git a/src/UmbracoFileSystemProviders.Azure/VirtualPathProviderController.cs b/src/UmbracoFileSystemProviders.Azure/VirtualPathProviderController.cs

Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,8 @@ configApp.controller("Loader", function ($scope, $http, $log) {`
`36`	`36`	`$scope.capitalizeFirstLetter = function (string) {`
`37`	`37`	`return string.charAt(0).toUpperCase() + string.slice(1);`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+ $scope.getInputType = function (param) {`
	`41`	`+ return param.toUpperCase() === "USEDEFAULTROUTE" ? "checkbox" : "text";`
	`42`	`+ }`
`39`	`43`	`});`
Original file line number	Diff line number	Diff line change
`@@ -62,16 +62,20 @@ public IEnumerable<Parameter> GetParameters()`
`62`	`62`	`[HttpPost]`
`63`	`63`	`public InstallerStatus PostParameters(IEnumerable<Parameter> parameters)`
`64`	`64`	`{`
`65`		`- var connection = parameters.SingleOrDefault(k => k.Key == "connectionString").Value;`
`66`		`- var containerName = parameters.SingleOrDefault(k => k.Key == "containerName").Value;`
`67`		`- var rootUrl = parameters.SingleOrDefault(k => k.Key == "rootUrl").Value;`
	`65`	`+ var newParameters = parameters as IList<Parameter> ?? parameters.ToList();`
	`66`	`+ var connection = newParameters.SingleOrDefault(k => k.Key == "connectionString").Value;`
	`67`	`+ var containerName = newParameters.SingleOrDefault(k => k.Key == "containerName").Value;`
	`68`	`+ bool useDefaultRoute = bool.Parse(newParameters.SingleOrDefault(k => k.Key == "useDefaultRoute").Value);`
	`69`	`+ var rootUrl = newParameters.SingleOrDefault(k => k.Key == "rootUrl").Value;`
`68`	`70`
`69`	`71`	`if (!TestAzureCredentials(connection, containerName))`
`70`	`72`	`{`
`71`	`73`	`return InstallerStatus.ConnectionError;`
`72`	`74`	`}`
`73`	`75`
`74`		`- if (SaveParametersToFileSystemProvidersXdt(this.fileSystemProvidersConfigInstallXdtPath, parameters) && SaveContainerNameToWebConfigXdt(this.webConfigXdtPath, containerName))`
	`76`	`+ var routePrefix = useDefaultRoute ? Azure.Constants.DefaultMediaRoute : containerName;`
	`77`	`+`
	`78`	`+ if (SaveParametersToFileSystemProvidersXdt(this.fileSystemProvidersConfigInstallXdtPath, newParameters) && SaveContainerNameToWebConfigXdt(this.webConfigXdtPath, routePrefix))`
`75`	`79`	`{`
`76`	`80`	`if (!ExecuteFileSystemConfigTransform() \|\| !ExecuteWebConfigTransform())`
`77`	`81`	`{`
`@@ -85,7 +89,7 @@ public InstallerStatus PostParameters(IEnumerable<Parameter> parameters)`
`85`	`89`	`else`
`86`	`90`	`{`
`87`	`91`	`// merge in storage url to ImageProcessor security.config xdt`
`88`		`- SaveBlobPathToImageProcessorSecurityXdt(ImageProcessorSecurityInstallXdtPath, rootUrl, containerName);`
	`92`	`+ SaveBlobPathToImageProcessorSecurityXdt(ImageProcessorSecurityInstallXdtPath, rootUrl, routePrefix, containerName);`
`89`	`93`
`90`	`94`	`// transform ImageProcessor security.config`
`91`	`95`	`if (ExecuteImageProcessorSecurityConfigTransform())`
`@@ -180,7 +184,10 @@ internal static bool SaveContainerNameToWebConfigXdt(string xdtPath, string cont`
`180`	`184`	`nsMgr.AddNamespace("xdt", strNamespace);`
`181`	`185`
`182`	`186`	`var locationElement = document.SelectSingleNode(string.Format("//location"));`
`183`		`- if (locationElement != null) locationElement.Attributes["path"].Value = containerName;`
	`187`	`+ if (locationElement != null)`
	`188`	`+ {`
	`189`	`+ locationElement.Attributes["path"].Value = containerName;`
	`190`	`+ }`
`184`	`191`
`185`	`192`	`try`
`186`	`193`	`{`
`@@ -199,7 +206,7 @@ internal static bool SaveContainerNameToWebConfigXdt(string xdtPath, string cont`
`199`	`206`	`return result;`
`200`	`207`	`}`
`201`	`208`
`202`		`- internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, string rootUrl, string containerName)`
	`209`	`+ internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, string rootUrl, string prefix, string containerName)`
`203`	`210`	`{`
`204`	`211`	`var result = false;`
`205`	`212`
`@@ -214,11 +221,11 @@ internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, str`
`214`	`221`
`215`	`222`	`foreach (XmlElement service in rawServices)`
`216`	`223`	`{`
`217`		`- service.SetAttribute("prefix", $"{containerName}/");`
	`224`	`+ service.SetAttribute("prefix", $"{prefix}/");`
`218`	`225`	`}`
`219`	`226`
`220`	`227`	`// Set the settings within the InsertIfMissing action`
`221`		`- var rawSettings = document.SelectNodes($"//services/service[@prefix = '{containerName}/' and @name = '{ImageProcessorSecurityServiceName}' and @type = '{ImageProcessorSecurityServiceType}']/settings/setting");`
	`228`	`+ var rawSettings = document.SelectNodes($"//services/service[@prefix = '{prefix}/' and @name = '{ImageProcessorSecurityServiceName}' and @type = '{ImageProcessorSecurityServiceType}']/settings/setting");`
`222`	`229`	`if (rawSettings == null)`
`223`	`230`	`{`
`224`	`231`	`return false;`
`@@ -249,14 +256,14 @@ internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, str`
`249`	`256`	`internal static IEnumerable<Parameter> GetParametersFromXdt(string xdtPath, string configPath)`
`250`	`257`	`{`
`251`	`258`	`// For package upgrades check for configured values in existing FileSystemProviders.config and merge with the Parameters from the XDT file (there could be new ones)`
`252`		`- var xdtParameters = GetParametersFromXml(xdtPath);`
`253`		`- var currentConfigParameters = GetParametersFromXml(configPath);`
	`259`	`+ List<Parameter> xdtParameters = GetParametersFromXml(xdtPath).ToList();`
	`260`	`+ List<Parameter> currentConfigParameters = GetParametersFromXml(configPath).ToList();`
`254`	`261`
`255`		`- foreach (var parameter in xdtParameters)`
	`262`	`+ foreach (Parameter parameter in xdtParameters)`
`256`	`263`	`{`
`257`	`264`	`if (currentConfigParameters.Select(k => k.Key).Contains(parameter.Key))`
`258`	`265`	`{`
`259`		`- var currentParameter = currentConfigParameters.SingleOrDefault(k => k.Key == parameter.Key);`
	`266`	`+ Parameter currentParameter = currentConfigParameters.SingleOrDefault(k => k.Key == parameter.Key);`
`260`	`267`	`if (currentParameter != null)`
`261`	`268`	`{`
`262`	`269`	`parameter.Value = currentParameter.Value;`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,12 @@ public AzureBlobFileSystem CreateAzureBlobFileSystem(bool disableVirtualPathProv`
`41`	`41`	`string rootUrl = "http://127.0.0.1:10000/devstoreaccount1/";`
`42`	`42`	`string connectionString = "UseDevelopmentStorage=true";`
`43`	`43`	`string maxDays = "30";`
	`44`	`+ string useDefaultRoute = "true";`
`44`	`45`
`45`	`46`	`Mock<ILogHelper> logHelper = new Mock<ILogHelper>();`
`46`	`47`	`Mock<IMimeTypeResolver> mimeTypeHelper = new Mock<IMimeTypeResolver>();`
`47`	`48`
`48`		`- return new AzureBlobFileSystem(containerName, rootUrl, connectionString, maxDays)`
	`49`	`+ return new AzureBlobFileSystem(containerName, rootUrl, connectionString, maxDays, useDefaultRoute)`
`49`	`50`	`{`
`50`	`51`	`FileSystem =`
`51`	`52`	`{`