chore: updated to Umbraco v8.0.1 release packages and refactor code to build and all tests pass

Author: Jeavon

build/UmbracoFileSystemProviders.Azure.proj

@@ -17,7 +17,7 @@
   <!-- SHARED PROPERTIES -->
   <PropertyGroup>
     <PackageName>UmbracoFileSystemProviders.Azure</PackageName>
-    <MinUmbracoVersion>8.0.0-alpha.58.1580</MinUmbracoVersion>
+    <MinUmbracoVersion>8.0.1</MinUmbracoVersion>
     <Readme>An Azure Blob Storage IFileSystem provider for Umbraco.</Readme>
     <AuthorName>James Jackson-South, Dirk Seefeld, Lars-Erik Aabech, Jeavon Leopold</AuthorName>
     <AuthorUrl>https://github.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure/graphs/contributors</AuthorUrl>
@@ -213,7 +213,6 @@
       Description="$(Description)"
       Summary="$(Readme)"
       Version="$(ProductVersion)"
-      MinimumRequiredUmbracoVersion ="$(MinUmbracoVersion)"
       Authors="$(AuthorName)"
       Owners="$(Owners)"
       Copyright="$(Copyright)"

build/package.nuspec

@@ -16,7 +16,8 @@
         <language></language>
         <tags></tags>
         <dependencies>
-            <dependency id="UmbracoCms.Core" version="0.0.0" />
+            <dependency id="UmbracoCms.Core" version="8.0.1" />
+            <dependency id="UmbracoCms.Web" version="8.0.1" />
             <dependency id="WindowsAzure.Storage" version="8.7.0" />
             <dependency id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.3" />
             <dependency id="Microsoft.Azure.KeyVault.Core" version="2.0.4" />

src/UmbracoFileSystemProviders.Azure.Installer/InstallerController.cs

@@ -20,17 +20,19 @@ namespace Our.Umbraco.FileSystemProviders.Azure.Installer
     using global::Umbraco.Core.Composing;
     using global::Umbraco.Core.Logging;
     using global::Umbraco.Core.Xml;
-    using global::Umbraco.Web._Legacy.PackageActions;
     using global::Umbraco.Web.Mvc;
     using global::Umbraco.Web.WebApi;
     using Microsoft.WindowsAzure.Storage;
     using Microsoft.WindowsAzure.Storage.Blob;
     using Models;
+    using System.Runtime.CompilerServices;
+    using Our.Umbraco.FileSystemProviders.Azure.Helpers;
 
     /// <summary>
     /// The installer controller for managing installer logic.
     /// </summary>
     [PluginController("FileSystemProviders")]
+
     public class InstallerController : UmbracoAuthorizedApiController
     {
         private static readonly string ImageProcessorWebAssemblyPath = HostingEnvironment.MapPath(Constants.ImageProcessor.WebAssemblyPath);

src/UmbracoFileSystemProviders.Azure.Installer/PackageActions.cs

@@ -2,15 +2,19 @@
 // Copyright (c) James Jackson-South, Jeavon Leopold, and contributors. All rights reserved.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
+
 namespace Our.Umbraco.FileSystemProviders.Azure.Installer
 {
     using System;
     using System.Web;
     using System.Xml;
-    using global::Umbraco.Core._Legacy.PackageActions;
+    using System.Xml.Linq;
+
     using global::Umbraco.Core.Composing;
     using global::Umbraco.Core.Logging;
-    using global::Umbraco.Web._Legacy.PackageActions;
+    using global::Umbraco.Core.PackageActions;
+    using global::Umbraco.Core;
+
     using Microsoft.Web.XmlTransform;
 
     /// <summary>
@@ -30,7 +34,7 @@ public string Alias()
             }
 
             /// <inheritdoc/>
-            public bool Execute(string packageName, XmlNode xmlData)
+            public bool Execute(string packageName, XElement xmlData)
             {
                 return this.Transform(packageName, xmlData);
             }
@@ -47,7 +51,7 @@ public XmlNode SampleXml()
             }
 
             /// <inheritdoc/>
-            public bool Undo(string packageName, XmlNode xmlData)
+            public bool Undo(string packageName, XElement xmlData)
             {
                 return this.Transform(packageName, xmlData, true);
             }
@@ -59,12 +63,12 @@ public bool Undo(string packageName, XmlNode xmlData)
             /// <param name="xmlData">The XML data</param>
             /// <param name="uninstall">Whether to uninstall.</param>
             /// <returns><c>true</c> if the transform is sucessful.</returns>
-            private bool Transform(string packageName, XmlNode xmlData, bool uninstall = false)
+            private bool Transform(string packageName, XElement xmlData, bool uninstall = false)
             {
                 // The config file we want to modify
-                if (xmlData.Attributes != null)
+                if (xmlData.Attributes() != null)
                 {
-                    string file = xmlData.Attributes.GetNamedItem("file").Value;
+                    var file = AttributeValue<string>(xmlData, "file");
 
                     string sourceDocFileName = VirtualPathUtility.ToAbsolute(file);
 
@@ -74,8 +78,8 @@ private bool Transform(string packageName, XmlNode xmlData, bool uninstall = fal
                     {
                         fileEnd = $"un{fileEnd}";
                     }
-
-                    string xdtfile = $"{xmlData.Attributes.GetNamedItem("xdtfile").Value}.{fileEnd}";
+                    
+                    string xdtfile = $"{AttributeValue<string>(xmlData, "xdtfile")}.{fileEnd}";
                     string xdtFileName = VirtualPathUtility.ToAbsolute(xdtfile);
 
                     // The translation at-hand
@@ -108,6 +112,22 @@ private bool Transform(string packageName, XmlNode xmlData, bool uninstall = fal
 
                 return true;
             }
+
+            public static T AttributeValue<T>(XElement xml, string attributeName)
+            {
+                if (xml == null) throw new ArgumentNullException("xml");
+                if (xml.HasAttributes == false) return default(T);
+
+                if (xml.Attribute(attributeName) == null)
+                    return default(T);
+
+                var val = xml.Attribute(attributeName).Value;
+                var result = val.TryConvertTo<T>();
+                if (result.Success)
+                    return result.Result;
+
+                return default(T);
+            }
         }
     }
 }