Reset Installer State via file

SitecorePackageDeployer.Web/App_Config/Include/Hhogdev.SitecorePackageDeployer.config

@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
-<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
-  <sitecore>
+<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/"
+               xmlns:env="http://www.sitecore.net/xmlconfig/env/"
+               xmlns:role="http://www.sitecore.net/xmlconfig/role/">
+
+    <sitecore role:require="Standalone OR ContentManagement AND !DedicatedDispatch">
     <pipelines>
       <initialize>
         <!-- Processor to execute post steps-->
@@ -18,11 +21,14 @@
     </scheduling>
     <settings>
       <!-- Folder where new updates packages will be found-->
-      <setting name="SitecorePackageDeployer.PackageSource" value="$(dataFolder)\SitecorePackageDeployer"/>
+      <setting name="SitecorePackageDeployer.PackageSource" value="$(dataFolder)/SitecorePackageDeployer"/>
 
       <!-- URL to hit to restart the server. If left blank, the server will be determined through -->
       <setting name="SitecorePackageDeployer.RestartUrl" value=""/>
 
+      <!-- File to look for to restart the server.  The RestartUrl might not work, or be harder to use so this is another option -->
+      <setting name="SitecorePackageDeployer.RestartFile" value="$(dataFolder)/RestartPackageDeployer.txt"/>
+
       <!-- Determines if the configuration files should replace the existing ones -->
       <setting name="SitecorePackageDeployer.UpdateConfigurationFiles" value="true"/>
     </settings>

SitecorePackageDeployer.Web/Hhogdev.SitecorePackageDeployer.Web.csproj

@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Hhogdev.SitecorePackageDeployer.Web</RootNamespace>
     <AssemblyName>Hhogdev.SitecorePackageDeployer.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
@@ -23,6 +23,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <Use64BitIISExpress />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,22 +44,24 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -84,6 +87,13 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <Content Include="web.config" />
+    <None Include="web.Debug.config">
+      <DependentUpon>web.config</DependentUpon>
+    </None>
+    <None Include="web.Release.config">
+      <DependentUpon>web.config</DependentUpon>
+    </None>
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

SitecorePackageDeployer.Web/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -32,4 +31,4 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.10.0.0")]
-[assembly: AssemblyFileVersion("1.10.0.0")]
+[assembly: AssemblyFileVersion("1.10.0.0")]

SitecorePackageDeployer.Web/packages.config

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net48" />
 </packages>

SitecorePackageDeployer.Web/sitecore/admin/StartSitecorePackageDeployer.aspx.cs

@@ -1,15 +1,11 @@
-using Hhogdev.SitecorePackageDeployer.Tasks;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.Threading;
-using System.Web;
 using System.Web.UI;
-using System.Web.UI.WebControls;
+using Hhogdev.SitecorePackageDeployer.Tasks;
 
 namespace Hhogdev.SitecorePackageDeployer.Web.sitecore.admin
 {
-    public partial class StartSitecorePackageDeployer : System.Web.UI.Page
+    public partial class StartSitecorePackageDeployer : Page
     {
         protected void Page_Load(object sender, EventArgs e)
         {
@@ -18,9 +14,9 @@ protected void Page_Load(object sender, EventArgs e)
                 InstallPackage.ResetInstallState();
             }
 
-            ThreadPool.QueueUserWorkItem((ctx) =>
+            ThreadPool.QueueUserWorkItem(ctx =>
             {
-                InstallPackage installer = new InstallPackage();
+                var installer = new InstallPackage();
                 installer.Run();
             });
         }

SitecorePackageDeployer.Web/web.config

@@ -3,8 +3,7 @@
   <system.diagnostics>
     <trace>
       <listeners>
-        <add type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-          name="AzureDiagnostics">
+        <add type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" name="AzureDiagnostics">
           <filter type="" />
         </add>
       </listeners>
@@ -14,8 +13,19 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <!--
+    For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
+
+    The following attributes can be set on the <httpRuntime> tag.
+      <system.Web>
+        <httpRuntime targetFramework="4.8" />
+      </system.Web>
+  -->
+  <system.web>
+    <compilation targetFramework="4.8" />
+  </system.web>
 </configuration>

SitecorePackageDeployer/Hhogdev.SitecorePackageDeployer.csproj

@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Hhogdev.SitecorePackageDeployer</RootNamespace>
     <AssemblyName>Hhogdev.SitecorePackageDeployer</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -30,28 +31,46 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.4.5.9\lib\net40\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sitecore.Kernel.NoReferences.7.2.140228\lib\NET45\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=17.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sitecore.Kernel.10.2.0\lib\net48\Sitecore.Kernel.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Logging, Version=1.2.0.30715, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sitecore.Logging.NoReferences.7.2.140228\lib\NET45\Sitecore.Logging.dll</HintPath>
+    <Reference Include="Sitecore.Logging, Version=14.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sitecore.Logging.10.2.0\lib\net48\Sitecore.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Mvc, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sitecore.Mvc.NoReferences.7.2.140228\lib\NET45\Sitecore.Mvc.dll</HintPath>
+    <Reference Include="Sitecore.Update, Version=9.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sitecore.Update.10.2.0\lib\net48\Sitecore.Update.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Update, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sitecore.Update.NoReferences.7.2.140228\lib\NET45\Sitecore.Update.dll</HintPath>
-    </Reference>
-    <Reference Include="Sitecore.Zip, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sitecore.Zip.NoReferences.7.2.140228\lib\NET45\Sitecore.Zip.dll</HintPath>
+    <Reference Include="Sitecore.Zip, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sitecore.Zip.10.1.2\lib\net48\Sitecore.Zip.dll</HintPath>
     </Reference>
+    <Reference Include="sysglobl" />
     <Reference Include="System" />
+    <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.DirectoryServices" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Linq" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.Caching" />
+    <Reference Include="System.Runtime.InteropServices" />
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceModel.Web" />
+    <Reference Include="System.Threading.Thread" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

SitecorePackageDeployer/Logging/InstallLogger.cs

@@ -1,76 +1,66 @@
-using log4net;
-using log4net.spi;
-using Sitecore.Diagnostics;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+using log4net;
+using log4net.spi;
+using Sitecore.Diagnostics;
 
 namespace Hhogdev.SitecorePackageDeployer.Logging
 {
     /// <summary>
-    /// Implements ILog to capture log messages during install
+    ///     Implements ILog to capture log messages during install
     /// </summary>
     internal class InstallLogger : ILog
     {
-        ILogger _logger;
-        List<string> _messages = new List<string>();
+        private readonly List<string> _messages = new List<string>();
 
         public InstallLogger(ILogger logger)
         {
-            _logger = logger;
+            Logger = logger;
         }
 
-        #region ILog implementation
-        public bool IsDebugEnabled
+        /// <summary>
+        ///     Adds a message to the list of messages strings
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="ex"></param>
+        /// <param name="dEBUG"></param>
+        private void WriteMessage(object message, Exception ex)
         {
-            get
-            {
-                return true;
-            }
-        }
+            var messageBuilder = new StringBuilder(message.ToString());
 
-        public bool IsErrorEnabled
-        {
-            get
+            if (ex != null)
             {
-                return true;
+                messageBuilder.Append("\n\t");
+                messageBuilder.Append(ex);
             }
-        }
 
-        public bool IsFatalEnabled
-        {
-            get
-            {
-                return true;
-            }
+            _messages.Add(messageBuilder.ToString());
         }
 
-        public bool IsInfoEnabled
+        /// <summary>
+        ///     Writes messages to a log file
+        /// </summary>
+        /// <param name="logFile"></param>
+        public void WriteMessages(string logFile)
         {
-            get
-            {
-                return true;
-            }
+            File.AppendAllLines(logFile, _messages);
         }
 
-        public bool IsWarnEnabled
-        {
-            get
-            {
-                return true;
-            }
-        }
+        #region ILog implementation
 
-        public ILogger Logger
-        {
-            get
-            {
-                return _logger;
-            }
-        }
+        public bool IsDebugEnabled => true;
+
+        public bool IsErrorEnabled => true;
+
+        public bool IsFatalEnabled => true;
+
+        public bool IsInfoEnabled => true;
+
+        public bool IsWarnEnabled => true;
+
+        public ILogger Logger { get; }
 
         public void Debug(object message)
         {
@@ -141,34 +131,7 @@ public void Warn(object message, Exception ex)
 
             WriteMessage(message, ex);
         }
-        #endregion
 
-        /// <summary>
-        /// Adds a message to the list of messages strings
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="ex"></param>
-        /// <param name="dEBUG"></param>
-        private void WriteMessage(object message, Exception ex)
-        {
-            StringBuilder messageBuilder = new StringBuilder(message.ToString());
-
-            if (ex!=null)
-            {
-                messageBuilder.Append("\n\t");
-                messageBuilder.Append(ex.ToString());
-            }
-
-            _messages.Add(messageBuilder.ToString());
-        }
-
-        /// <summary>
-        /// Writes messages to a log file
-        /// </summary>
-        /// <param name="logFile"></param>
-        public void WriteMessages(string logFile)
-        {
-            File.AppendAllLines(logFile, _messages);
-        }
+        #endregion
     }
-}
+}