Merge branch 'develop-umbraco-version-8' into master-umbraco-version-8

Jeavon · Jeavon · commit 0e8d1a58aead · 2021-03-23T14:27:54.000Z
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # UmbracoFileSystemProviders.Azure v2
 
-**This version is for Umbraco v8 only**. For the v1 package for **Umbraco v7** please visit the [main branch](https://github.com/umbraco-community/UmbracoFileSystemProviders.Azure/tree/develop)
+**This version is for Umbraco v8 only**. For the v1 package for **Umbraco v7** please visit the [develop branch](https://github.com/umbraco-community/UmbracoFileSystemProviders.Azure/tree/develop)
 
 ![Image Alt](build/assets/logo/azure-logo-256.png)
 
@@ -23,17 +23,17 @@ From **v2.0.0-alpha3** onwards this package was split into 2 NuGet packages and
 
 |NuGet Packages    |Version           |
 |:-----------------|:-----------------|
-|**Pre-Release Core**|[![NuGet download](http://img.shields.io/nuget/vpre/UmbracoFileSystemProviders.Azure.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure/)|[![NuGet count](https://img.shields.io/nuget/dt/UmbracoFileSystemProviders.Azure.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure/)|
-|**Pre-Release Media**|[![NuGet download](http://img.shields.io/nuget/vpre/UmbracoFileSystemProviders.Azure.Media.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure.Media/)|[![NuGet count](https://img.shields.io/nuget/dt/UmbracoFileSystemProviders.Azure.Media.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure.Media/)|
-|**Pre-Release Forms**|[![NuGet download](http://img.shields.io/nuget/vpre/UmbracoFileSystemProviders.Azure.Forms.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure.Forms/)|[![NuGet count](https://img.shields.io/nuget/dt/UmbracoFileSystemProviders.Azure.Forms.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure.Forms/)|
+|**Release Core**|[![NuGet download](http://img.shields.io/nuget/vpre/UmbracoFileSystemProviders.Azure.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure/)|[![NuGet count](https://img.shields.io/nuget/dt/UmbracoFileSystemProviders.Azure.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure/)|
+|**Release Media**|[![NuGet download](http://img.shields.io/nuget/vpre/UmbracoFileSystemProviders.Azure.Media.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure.Media/)|[![NuGet count](https://img.shields.io/nuget/dt/UmbracoFileSystemProviders.Azure.Media.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure.Media/)|
+|**Release Forms**|[![NuGet download](http://img.shields.io/nuget/vpre/UmbracoFileSystemProviders.Azure.Forms.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure.Forms/)|[![NuGet count](https://img.shields.io/nuget/dt/UmbracoFileSystemProviders.Azure.Forms.svg)](https://www.nuget.org/packages/UmbracoFileSystemProviders.Azure.Forms/)|
 |**Bleeding edge Core**|[![MyGet download](https://img.shields.io/myget/umbraco-packages/vpre/UmbracoFileSystemProviders.Azure.svg)](https://www.myget.org/feed/umbraco-packages/package/nuget/UmbracoFileSystemProviders.Azure)|[![MyGet count](https://img.shields.io/myget/umbraco-packages/dt/UmbracoFileSystemProviders.Azure.svg)](https://www.myget.org/feed/umbraco-packages/package/nuget/UmbracoFileSystemProviders.Azure)|
 |**Bleeding edge Media**|[![MyGet download](https://img.shields.io/myget/umbraco-packages/vpre/UmbracoFileSystemProviders.Azure.Media.svg)](https://www.myget.org/feed/umbraco-packages/package/nuget/UmbracoFileSystemProviders.Azure.Media)|[![MyGet count](https://img.shields.io/myget/umbraco-packages/dt/UmbracoFileSystemProviders.Azure.Media.svg)](https://www.myget.org/feed/umbraco-packages/package/nuget/UmbracoFileSystemProviders.Azure.Media)|
 |**Bleeding edge Forms**|[![MyGet download](https://img.shields.io/myget/umbraco-packages/vpre/UmbracoFileSystemProviders.Azure.Forms.svg)](https://www.myget.org/feed/umbraco-packages/package/nuget/UmbracoFileSystemProviders.Azure.Forms)|[![MyGet count](https://img.shields.io/myget/umbraco-packages/dt/UmbracoFileSystemProviders.Azure.Forms.svg)](https://www.myget.org/feed/umbraco-packages/package/nuget/UmbracoFileSystemProviders.Azure.Forms)|
 
 |Umbraco Packages  |                  |
 |:-----------------|:-----------------|
 |**Release**|[![Our Umbraco project page](https://img.shields.io/badge/our-umbraco-orange.svg)](https://our.umbraco.org/projects/collaboration/umbracofilesystemprovidersazure/) 
-|**Pre-release**| [![AppVeyor Artifacts](https://img.shields.io/badge/appveyor-umbraco-orange.svg)](https://ci.appveyor.com/project/Umbraco-Community/umbracofilesystemproviders-azure/build/artifacts)
+|**Bleeding edge**| [![AppVeyor Artifacts](https://img.shields.io/badge/appveyor-umbraco-orange.svg)](https://ci.appveyor.com/project/Umbraco-Community/umbracofilesystemproviders-azure/build/artifacts)
 
 ## Manual build
 
@@ -147,7 +147,7 @@ Optionally install the [AzureBlobCache](http://imageprocessor.org/imageprocessor
 
 Currently this package is available only via NuGet
 
-    Install-Package UmbracoFileSystemProviders.Azure.Forms -pre
+    Install-Package UmbracoFileSystemProviders.Azure.Forms
 
 ### Configuration via Web.Config
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.0.0.{build}
+version: 2.0.1.{build}
 
 os: Visual Studio 2019
 
@@ -9,7 +9,7 @@ configuration: Release
 
 environment:
   # Version Suffix
-  version_suffix: beta3
+  version_suffix: alpha
 
 install:
   - ps: .\build\appveyor-semver.ps1
diff --git a/build/package-lock.json b/build/package-lock.json
diff --git a/build/package.json b/build/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "jsonfile": "^2.2.3",
     "semver": "^5.0.3",
-    "xmldom": "^0.1.27",
+    "xmldom": "^0.5.0",
     "read-file": "^0.2.0",
     "write": "^0.3.2",
     "js-yaml": "^3.7.0"
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/InstallerController.cs b/src/UmbracoFileSystemProviders.Azure.Installer/InstallerController.cs
@@ -447,8 +447,8 @@ private static bool ExecuteImageProcessorSecurityConfigTransform()
 
         private static bool TestAzureCredentials(string connectionString, string containerName, BlobContainerPublicAccessType accessType)
         {
-            bool useEmulator = ConfigurationManager.AppSettings[Azure.Constants.Configuration.UseStorageEmulatorKey] != null
-                               && ConfigurationManager.AppSettings[Azure.Constants.Configuration.UseStorageEmulatorKey]
+            bool useEmulator = ConfigurationHelper.GetAppSetting(Azure.Constants.Configuration.UseStorageEmulatorKey) != null
+                               && ConfigurationHelper.GetAppSetting(Azure.Constants.Configuration.UseStorageEmulatorKey)
                                                       .Equals("true", StringComparison.InvariantCultureIgnoreCase);
             try
             {
diff --git a/src/UmbracoFileSystemProviders.Azure/AzureBlobFileSystem.cs b/src/UmbracoFileSystemProviders.Azure/AzureBlobFileSystem.cs
@@ -113,34 +113,34 @@ public AzureBlobFileSystem(string containerName, string rootUrl, string connecti
         /// <param name="alias">The alias of the provider</param>
         public AzureBlobFileSystem(string alias)
         {
-            string connectionString = ConfigurationManager.AppSettings[$"{ConnectionStringKey}:{alias}"];
+            string connectionString = ConfigurationHelper.GetAppSetting(ConnectionStringKey,alias);
             if (!string.IsNullOrWhiteSpace(connectionString))
             {
-                string rootUrl = ConfigurationManager.AppSettings[$"{RootUrlKey}:{alias}"];
+                string rootUrl = ConfigurationHelper.GetAppSetting(RootUrlKey,alias);
                 if (string.IsNullOrWhiteSpace(rootUrl))
                 {
                     throw new InvalidOperationException("Azure Storage Root URL is not defined in application settings. The " + RootUrlKey + " property was not defined or is empty.");
                 }
 
-                string containerName = ConfigurationManager.AppSettings[$"{ContainerNameKey}:{alias}"];
+                string containerName = ConfigurationHelper.GetAppSetting(ContainerNameKey,alias);
                 if (string.IsNullOrWhiteSpace(containerName))
                 {
                     containerName = "media";
                 }
 
-                string maxDays = ConfigurationManager.AppSettings[$"{MaxDaysKey}:{alias}"];
+                string maxDays = ConfigurationHelper.GetAppSetting(MaxDaysKey,alias);
                 if (string.IsNullOrWhiteSpace(maxDays))
                 {
                     maxDays = "365";
                 }
 
-                string useDefaultRoute = ConfigurationManager.AppSettings[$"{UseDefaultRootKey}:{alias}"];
+                string useDefaultRoute = ConfigurationHelper.GetAppSetting(UseDefaultRootKey,alias);
                 if (string.IsNullOrWhiteSpace(useDefaultRoute))
                 {
                     useDefaultRoute = "true";
                 }
 
-                string accessType = ConfigurationManager.AppSettings[$"{UsePrivateContainerKey}:{alias}"];
+                string accessType = ConfigurationHelper.GetAppSetting(UsePrivateContainerKey,alias);
                 if (string.IsNullOrWhiteSpace(accessType))
                 {
                     accessType = "true";
diff --git a/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs b/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs
@@ -96,12 +96,12 @@ internal AzureFileSystem(string containerName, string rootUrl, string connection
                 throw new ArgumentNullException(nameof(containerName));
             }
 
-            this.DisableVirtualPathProvider = ConfigurationManager.AppSettings[DisableVirtualPathProviderKey] != null
-                                              && ConfigurationManager.AppSettings[DisableVirtualPathProviderKey]
+            this.DisableVirtualPathProvider = ConfigurationHelper.GetAppSetting(DisableVirtualPathProviderKey) != null
+                                              && ConfigurationHelper.GetAppSetting(DisableVirtualPathProviderKey)
                                              .Equals("true", StringComparison.InvariantCultureIgnoreCase);
 
-            bool useEmulator = ConfigurationManager.AppSettings[UseStorageEmulatorKey] != null
-                               && ConfigurationManager.AppSettings[UseStorageEmulatorKey]
+            bool useEmulator = ConfigurationHelper.GetAppSetting(UseStorageEmulatorKey) != null
+                               && ConfigurationHelper.GetAppSetting(UseStorageEmulatorKey)
                                                       .Equals("true", StringComparison.InvariantCultureIgnoreCase);
 
             CloudStorageAccount cloudStorageAccount;
@@ -780,7 +780,7 @@ public static CloudBlobContainer CreateContainer(CloudBlobClient cloudBlobClient
         /// <returns>
         /// The <see cref="CloudBlockBlob"/> reference.
         /// </returns>
-        private CloudBlockBlob GetBlockBlobReference(string path)
+        public CloudBlockBlob GetBlockBlobReference(string path)
         {
             Current.Logger.Debug<AzureBlobFileSystem>($"GetBlockBlobReference(path) method executed with path:{path}");
 
diff --git a/src/UmbracoFileSystemProviders.Azure/Helpers/ConfigurationHelper.cs b/src/UmbracoFileSystemProviders.Azure/Helpers/ConfigurationHelper.cs
@@ -4,9 +4,27 @@
 
     public class ConfigurationHelper
     {
+        public static string GetAppSetting(string key)
+        {
+            var settings = ConfigurationManager.AppSettings[key];
+
+            if (!string.IsNullOrEmpty(settings))
+            {
+                return settings;
+            }
+
+            return ConfigurationManager.AppSettings[key.Replace(".", "-")];
+        }
         public static string GetAppSetting(string key, string providerAlias)
         {
-            return ConfigurationManager.AppSettings[$"{key}:{providerAlias}"];
+            var settings = ConfigurationManager.AppSettings[$"{key}:{providerAlias}"];
+
+            if (!string.IsNullOrEmpty(settings))
+            {
+                return settings;
+            }
+
+            return ConfigurationManager.AppSettings[$"{key.Replace(".", "-")}-{providerAlias}"];
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -447,8 +447,8 @@ private static bool ExecuteImageProcessorSecurityConfigTransform()`
`447`	`447`
`448`	`448`	`private static bool TestAzureCredentials(string connectionString, string containerName, BlobContainerPublicAccessType accessType)`
`449`	`449`	`{`
`450`		`- bool useEmulator = ConfigurationManager.AppSettings[Azure.Constants.Configuration.UseStorageEmulatorKey] != null`
`451`		`- && ConfigurationManager.AppSettings[Azure.Constants.Configuration.UseStorageEmulatorKey]`
	`450`	`+ bool useEmulator = ConfigurationHelper.GetAppSetting(Azure.Constants.Configuration.UseStorageEmulatorKey) != null`
	`451`	`+ && ConfigurationHelper.GetAppSetting(Azure.Constants.Configuration.UseStorageEmulatorKey)`
`452`	`452`	`.Equals("true", StringComparison.InvariantCultureIgnoreCase);`
`453`	`453`	`try`
`454`	`454`	`{`
Original file line number	Diff line number	Diff line change
`@@ -113,34 +113,34 @@ public AzureBlobFileSystem(string containerName, string rootUrl, string connecti`
`113`	`113`	`/// <param name="alias">The alias of the provider</param>`
`114`	`114`	`public AzureBlobFileSystem(string alias)`
`115`	`115`	`{`
`116`		`- string connectionString = ConfigurationManager.AppSettings[$"{ConnectionStringKey}:{alias}"];`
	`116`	`+ string connectionString = ConfigurationHelper.GetAppSetting(ConnectionStringKey,alias);`
`117`	`117`	`if (!string.IsNullOrWhiteSpace(connectionString))`
`118`	`118`	`{`
`119`		`- string rootUrl = ConfigurationManager.AppSettings[$"{RootUrlKey}:{alias}"];`
	`119`	`+ string rootUrl = ConfigurationHelper.GetAppSetting(RootUrlKey,alias);`
`120`	`120`	`if (string.IsNullOrWhiteSpace(rootUrl))`
`121`	`121`	`{`
`122`	`122`	`throw new InvalidOperationException("Azure Storage Root URL is not defined in application settings. The " + RootUrlKey + " property was not defined or is empty.");`
`123`	`123`	`}`
`124`	`124`
`125`		`- string containerName = ConfigurationManager.AppSettings[$"{ContainerNameKey}:{alias}"];`
	`125`	`+ string containerName = ConfigurationHelper.GetAppSetting(ContainerNameKey,alias);`
`126`	`126`	`if (string.IsNullOrWhiteSpace(containerName))`
`127`	`127`	`{`
`128`	`128`	`containerName = "media";`
`129`	`129`	`}`
`130`	`130`
`131`		`- string maxDays = ConfigurationManager.AppSettings[$"{MaxDaysKey}:{alias}"];`
	`131`	`+ string maxDays = ConfigurationHelper.GetAppSetting(MaxDaysKey,alias);`
`132`	`132`	`if (string.IsNullOrWhiteSpace(maxDays))`
`133`	`133`	`{`
`134`	`134`	`maxDays = "365";`
`135`	`135`	`}`
`136`	`136`
`137`		`- string useDefaultRoute = ConfigurationManager.AppSettings[$"{UseDefaultRootKey}:{alias}"];`
	`137`	`+ string useDefaultRoute = ConfigurationHelper.GetAppSetting(UseDefaultRootKey,alias);`
`138`	`138`	`if (string.IsNullOrWhiteSpace(useDefaultRoute))`
`139`	`139`	`{`
`140`	`140`	`useDefaultRoute = "true";`
`141`	`141`	`}`
`142`	`142`
`143`		`- string accessType = ConfigurationManager.AppSettings[$"{UsePrivateContainerKey}:{alias}"];`
	`143`	`+ string accessType = ConfigurationHelper.GetAppSetting(UsePrivateContainerKey,alias);`
`144`	`144`	`if (string.IsNullOrWhiteSpace(accessType))`
`145`	`145`	`{`
`146`	`146`	`accessType = "true";`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,27 @@`
`4`	`4`
`5`	`5`	`public class ConfigurationHelper`
`6`	`6`	`{`
	`7`	`+ public static string GetAppSetting(string key)`
	`8`	`+ {`
	`9`	`+ var settings = ConfigurationManager.AppSettings[key];`
	`10`	`+`
	`11`	`+ if (!string.IsNullOrEmpty(settings))`
	`12`	`+ {`
	`13`	`+ return settings;`
	`14`	`+ }`
	`15`	`+`
	`16`	`+ return ConfigurationManager.AppSettings[key.Replace(".", "-")];`
	`17`	`+ }`
`7`	`18`	`public static string GetAppSetting(string key, string providerAlias)`
`8`	`19`	`{`
`9`		`- return ConfigurationManager.AppSettings[$"{key}:{providerAlias}"];`
	`20`	`+ var settings = ConfigurationManager.AppSettings[$"{key}:{providerAlias}"];`
	`21`	`+`
	`22`	`+ if (!string.IsNullOrEmpty(settings))`
	`23`	`+ {`
	`24`	`+ return settings;`
	`25`	`+ }`
	`26`	`+`
	`27`	`+ return ConfigurationManager.AppSettings[$"{key.Replace(".", "-")}-{providerAlias}"];`
`10`	`28`	`}`
`11`	`29`	`}`
`12`	`30`	`}`