WIP - Initial help/work to get this working for V8.0.0

.editorconfig

@@ -0,0 +1,16 @@
+# top-most EditorConfig file
+root = true
+
+[*.cs]
+indent_style = space
+indent_size = 4
+csharp_style_var_for_built_in_types = false:warning
+csharp_style_var_elsewhere = false:warning
+csharp_style_var_when_type_is_apparent = true:warning
+end_of_line = crlf
+dotnet_sort_system_directives_first = true
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+dotnet_style_qualification_for_field = true:warning
+dotnet_style_qualification_for_method = true:warning
+dotnet_style_qualification_for_property = true:warning

.gitignore

@@ -4,7 +4,7 @@
 #VS 2015 hidden folder
 src/.vs/*
 
-build/tools/vswhere.2.0.2
+build/tools/vswhere*
 build/tools/vswhere.exe
 
 artifacts/*
@@ -237,3 +237,4 @@ $RECYCLE.BIN/
 
 # Windows shortcuts
 *.lnk
+.vs/

NuGet.Config

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <!--
+    this is Umbraco's NuGet configuration,
+    content of this file is merged with the system-wide configuration,
+    at %APPDATA%\NuGet\NuGet.config
+  -->
+  <packageSources>
+    <add key="UmbracoCoreMyGet" value="https://www.myget.org/F/umbracocore/api/v3/index.json" />
+    <add key="ExamineAppVeyor" value="https://ci.appveyor.com/nuget/examine-f73l6qv0oqfh/" />
+  </packageSources>
+</configuration>

appveyor.yml

@@ -1,7 +1,7 @@
 os: Visual Studio 2017
 
 # Version format
-version: 1.0.3.{build}
+version: 2.0.0.{build}
 
 cache:
   - src\packages -> **\packages.config   # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified

build-appveyor.cmd

@@ -14,7 +14,7 @@ IF NOT EXIST "%toolsFolder%" (
 
 IF NOT EXIST "%toolsFolder%vswhere.exe" (
 	ECHO vswhere not found - fetching now
-	nuget install vswhere -Version 2.0.2 -Source nuget.org -OutputDirectory tools
+	tools\nuget.exe install vswhere -Version 2.5.9 -Source nuget.org -OutputDirectory tools
 )
 
 FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A\"

build/UmbracoFileSystemProviders.Azure.proj

@@ -17,7 +17,7 @@
   <!-- SHARED PROPERTIES -->
   <PropertyGroup>
     <PackageName>UmbracoFileSystemProviders.Azure</PackageName>
-    <MinUmbracoVersion>7.1.9</MinUmbracoVersion>
+    <MinUmbracoVersion>8.0.0-alpha.58.1580</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>

src/UmbracoFileSystemProviders.Azure.Installer/InstallerController.cs

@@ -17,14 +17,15 @@ namespace Our.Umbraco.FileSystemProviders.Azure.Installer
     using System.Xml;
     using Enums;
     using global::Umbraco.Core;
+    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 umbraco.cms.businesslogic.packager.standardPackageActions;
 
     /// <summary>
     /// The installer controller for managing installer logic.
@@ -191,8 +192,7 @@ internal static bool SaveParametersToFileSystemProvidersXdt(string xdtPath, ILis
             catch (Exception e)
             {
                 // Log error message
-                string message = "Error saving XDT Parameters: " + e.Message;
-                LogHelper.Error(typeof(InstallerController), message, e);
+                Current.Logger.Error<InstallerController>(e, "Error saving XDT Parameters");
             }
 
             return result;
@@ -230,8 +230,7 @@ internal static bool SaveContainerNameToWebConfigXdt(string xdtPath, string cont
             catch (Exception e)
             {
                 // Log error message
-                string message = "Error saving XDT Parameters: " + e.Message;
-                LogHelper.Error(typeof(InstallerController), message, e);
+                Current.Logger.Error<InstallerController>(e, "Error saving XDT Parameters");
             }
 
             return result;
@@ -292,8 +291,7 @@ internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, str
             catch (Exception e)
             {
                 // Log error message
-                string message = "Error saving XDT Settings: " + e.Message;
-                LogHelper.Error(typeof(InstallerController), message, e);
+                Current.Logger.Error<InstallerController>(e, "Error saving XDT Parameters");
             }
 
             return result;
@@ -361,46 +359,49 @@ internal static IEnumerable<Parameter> GetParametersFromXml(string xmlPath)
         /// <returns>True if the transform is successful, otherwise false.</returns>
         private static bool ExecuteFileSystemConfigTransform()
         {
-            XmlNode transFormConfigAction =
-                helper.parseStringToXmlNode("<Action runat=\"install\" "
-                                            + "undo=\"true\" "
-                                            + "alias=\"UmbracoFileSystemProviders.Azure.TransformConfig\" "
-                                            + "file=\"~/Config/FileSystemProviders.config\" "
-                                            + "xdtfile=\"~/app_plugins/UmbracoFileSystemProviders/Azure/install/FileSystemProviders.config\">"
-                                            + "</Action>").FirstChild;
-
-            PackageActions.TransformConfig transformConfig = new PackageActions.TransformConfig();
-            return transformConfig.Execute("UmbracoFileSystemProviders.Azure", transFormConfigAction);
+            //XmlNode transFormConfigAction =
+            //    PackageHelper.ParseStringToXmlNode("<Action runat=\"install\" "
+            //                                + "undo=\"true\" "
+            //                                + "alias=\"UmbracoFileSystemProviders.Azure.TransformConfig\" "
+            //                                + "file=\"~/Config/FileSystemProviders.config\" "
+            //                                + "xdtfile=\"~/app_plugins/UmbracoFileSystemProviders/Azure/install/FileSystemProviders.config\">"
+            //                                + "</Action>").FirstChild;
+
+            //PackageActions.TransformConfig transformConfig = new PackageActions.TransformConfig();
+            //return transformConfig.Execute("UmbracoFileSystemProviders.Azure", transFormConfigAction);
+            return true;
         }
 
         private static bool ExecuteWebConfigTransform()
         {
-            XmlNode transFormConfigAction =
-                helper.parseStringToXmlNode("<Action runat=\"install\" "
-                                            + "undo=\"true\" "
-                                            + "alias=\"UmbracoFileSystemProviders.Azure.TransformConfig\" "
-                                            + "file=\"~/web.config\" "
-                                            + "xdtfile=\"~/app_plugins/UmbracoFileSystemProviders/Azure/install/web.config\">"
-                                            + "</Action>").FirstChild;
-
-            PackageActions.TransformConfig transformConfig = new PackageActions.TransformConfig();
-            return transformConfig.Execute("UmbracoFileSystemProviders.Azure", transFormConfigAction);
+            //XmlNode transFormConfigAction =
+            //    PackageHelper.ParseStringToXmlNode("<Action runat=\"install\" "
+            //                                + "undo=\"true\" "
+            //                                + "alias=\"UmbracoFileSystemProviders.Azure.TransformConfig\" "
+            //                                + "file=\"~/web.config\" "
+            //                                + "xdtfile=\"~/app_plugins/UmbracoFileSystemProviders/Azure/install/web.config\">"
+            //                                + "</Action>").FirstChild;
+
+            //PackageActions.TransformConfig transformConfig = new PackageActions.TransformConfig();
+            //return transformConfig.Execute("UmbracoFileSystemProviders.Azure", transFormConfigAction);
+            return true;
         }
 
         private static bool ExecuteMediaWebConfigTransform()
         {
             if (File.Exists(HttpContext.Current.Server.MapPath("~/Media/web.config")))
             {
-                XmlNode transFormConfigAction =
-    helper.parseStringToXmlNode("<Action runat=\"install\" "
-                                + "undo=\"true\" "
-                                + "alias=\"UmbracoFileSystemProviders.Azure.TransformConfig\" "
-                                + "file=\"~/Media/web.config\" "
-                                + "xdtfile=\"~/app_plugins/UmbracoFileSystemProviders/Azure/install/media-web.config\">"
-                                + "</Action>").FirstChild;
-
-                PackageActions.TransformConfig transformConfig = new PackageActions.TransformConfig();
-                return transformConfig.Execute("UmbracoFileSystemProviders.Azure", transFormConfigAction);
+                //XmlNode transFormConfigAction =
+                //    PackageHelper.ParseStringToXmlNode("<Action runat=\"install\" "
+                //                + "undo=\"true\" "
+                //                + "alias=\"UmbracoFileSystemProviders.Azure.TransformConfig\" "
+                //                + "file=\"~/Media/web.config\" "
+                //                + "xdtfile=\"~/app_plugins/UmbracoFileSystemProviders/Azure/install/media-web.config\">"
+                //                + "</Action>").FirstChild;
+
+                //PackageActions.TransformConfig transformConfig = new PackageActions.TransformConfig();
+                //return transformConfig.Execute("UmbracoFileSystemProviders.Azure", transFormConfigAction);
+                return true;
             }
 
             return true;
@@ -419,30 +420,32 @@ private static bool ExecuteImageProcessorSecurityConfigTransform()
                 File.Copy(ImageProcessorSecurityDefaultConfigPath, ImageProcessorSecurityConfigPath);
             }
 
-            XmlNode transFormConfigAction =
-                helper.parseStringToXmlNode("<Action runat=\"install\" "
-                                            + "undo=\"false\" "
-                                            + "alias=\"UmbracoFileSystemProviders.Azure.TransformConfig\" "
-                                            + "file=\"~/config/imageprocessor/security.config\" "
-                                            + "xdtfile=\"~/app_plugins/UmbracoFileSystemProviders/Azure/install/security.config\">"
-                                            + "</Action>").FirstChild;
+            //XmlNode transFormConfigAction =
+            //    PackageHelper.ParseStringToXmlNode("<Action runat=\"install\" "
+            //                                + "undo=\"false\" "
+            //                                + "alias=\"UmbracoFileSystemProviders.Azure.TransformConfig\" "
+            //                                + "file=\"~/config/imageprocessor/security.config\" "
+            //                                + "xdtfile=\"~/app_plugins/UmbracoFileSystemProviders/Azure/install/security.config\">"
+            //                                + "</Action>").FirstChild;
 
-            PackageActions.TransformConfig transformConfig = new PackageActions.TransformConfig();
-            return transformConfig.Execute("UmbracoFileSystemProviders.Azure", transFormConfigAction);
+            //PackageActions.TransformConfig transformConfig = new PackageActions.TransformConfig();
+            //return transformConfig.Execute("UmbracoFileSystemProviders.Azure", transFormConfigAction);
+            return true;
         }
 
         private static bool ExecuteImageProcessorWebConfigTransform()
         {
-            XmlNode transFormConfigAction =
-                helper.parseStringToXmlNode("<Action runat=\"install\" "
-                                            + "undo=\"false\" "
-                                            + "alias=\"UmbracoFileSystemProviders.Azure.TransformConfig\" "
-                                            + "file=\"~/web.config\" "
-                                            + "xdtfile=\"~/app_plugins/UmbracoFileSystemProviders/Azure/install/imageprocessor.web.config\">"
-                                            + "</Action>").FirstChild;
-
-            PackageActions.TransformConfig transformConfig = new PackageActions.TransformConfig();
-            return transformConfig.Execute("UmbracoFileSystemProviders.Azure", transFormConfigAction);
+            //XmlNode transFormConfigAction =
+            //    PackageHelper.ParseStringToXmlNode("<Action runat=\"install\" "
+            //                                + "undo=\"false\" "
+            //                                + "alias=\"UmbracoFileSystemProviders.Azure.TransformConfig\" "
+            //                                + "file=\"~/web.config\" "
+            //                                + "xdtfile=\"~/app_plugins/UmbracoFileSystemProviders/Azure/install/imageprocessor.web.config\">"
+            //                                + "</Action>").FirstChild;
+
+            //PackageActions.TransformConfig transformConfig = new PackageActions.TransformConfig();
+            //return transformConfig.Execute("UmbracoFileSystemProviders.Azure", transFormConfigAction);
+            return true;
         }
 
         private static bool TestAzureCredentials(string connectionString, string containerName)
@@ -463,7 +466,7 @@ private static bool TestAzureCredentials(string connectionString, string contain
             }
             catch (Exception e)
             {
-                LogHelper.Error<InstallerController>($"Error validating Azure storage connection: {e.Message}", e);
+                Current.Logger.Error<InstallerController>(e, "Error validating Azure storage connection");
                 return false;
             }
         }

src/UmbracoFileSystemProviders.Azure.Installer/PackageActions.cs

@@ -7,11 +7,11 @@ namespace Our.Umbraco.FileSystemProviders.Azure.Installer
     using System;
     using System.Web;
     using System.Xml;
-
+    using global::Umbraco.Core._Legacy.PackageActions;
+    using global::Umbraco.Core.Composing;
     using global::Umbraco.Core.Logging;
+    using global::Umbraco.Web._Legacy.PackageActions;
     using Microsoft.Web.XmlTransform;
-    using umbraco.cms.businesslogic.packager.standardPackageActions;
-    using umbraco.interfaces;
 
     /// <summary>
     /// Handles installer package actions.
@@ -42,7 +42,8 @@ public XmlNode SampleXml()
                           + "undo=\"true\" alias=\"UmbracoFileSystemProviders.Azure.TransformConfig\" "
                           + "file=\"~/web.config\" xdtfile=\"~/app_plugins/UmbracoFileSystemProviders/Azure/install/web.config\">"
                           + "</Action>";
-                return helper.parseStringToXmlNode(xml);
+                //return PackageHelper.ParseStringToXmlNode(xml);
+                return null;
             }
 
             /// <inheritdoc/>
@@ -97,8 +98,7 @@ private bool Transform(string packageName, XmlNode xmlData, bool uninstall = fal
                                 catch (Exception e)
                                 {
                                     // Log error message
-                                    string message = "Error executing TransformConfig package action (check file write permissions): " + e.Message;
-                                    LogHelper.Error(typeof(TransformConfig), message, e);
+                                    Current.Logger.Error<TransformConfig>(e, "Error executing TransformConfig package action (check file write permissions)");
                                     return false;
                                 }
                             }