diff --git a/SitecorePackageDeployer.Web/Properties/AssemblyInfo.cs b/SitecorePackageDeployer.Web/Properties/AssemblyInfo.cs index bdbc972..24a89f6 100644 --- a/SitecorePackageDeployer.Web/Properties/AssemblyInfo.cs +++ b/SitecorePackageDeployer.Web/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.0.0")] -[assembly: AssemblyFileVersion("1.8.0.0")] +[assembly: AssemblyVersion("1.9.0.0")] +[assembly: AssemblyFileVersion("1.9.0.0")] diff --git a/SitecorePackageDeployer.Web/packages.config b/SitecorePackageDeployer.Web/packages.config new file mode 100644 index 0000000..ab3029f --- /dev/null +++ b/SitecorePackageDeployer.Web/packages.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/SitecorePackageDeployer.Web/web.Debug.config b/SitecorePackageDeployer.Web/web.Debug.config new file mode 100644 index 0000000..fae9cfe --- /dev/null +++ b/SitecorePackageDeployer.Web/web.Debug.config @@ -0,0 +1,30 @@ + + + + + + + + + + \ No newline at end of file diff --git a/SitecorePackageDeployer.Web/web.Release.config b/SitecorePackageDeployer.Web/web.Release.config new file mode 100644 index 0000000..da6e960 --- /dev/null +++ b/SitecorePackageDeployer.Web/web.Release.config @@ -0,0 +1,31 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/SitecorePackageDeployer.Web/web.config b/SitecorePackageDeployer.Web/web.config new file mode 100644 index 0000000..43cd16b --- /dev/null +++ b/SitecorePackageDeployer.Web/web.config @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SitecorePackageDeployer.packagedef.xml b/SitecorePackageDeployer.packagedef.xml new file mode 100644 index 0000000..481ebda --- /dev/null +++ b/SitecorePackageDeployer.packagedef.xml @@ -0,0 +1,53 @@ + + + + SitecorePackageDeployer + Charles Turano + 1.8 + + + + + + Hedgehog Development + + + + + True + + + + /App_Config/Include/Hhogdev.SitecorePackageDeployer.config + /bin/Hhogdev.SitecorePackageDeployer.dll + /bin/Hhogdev.SitecorePackageDeployer.pdb + /bin/Hhogdev.SitecorePackageDeployer.Web.dll + /bin/Hhogdev.SitecorePackageDeployer.Web.pdb + /sitecore/admin/StartSitecorePackageDeployer.aspx + + + + / + + + + + + Package Deployer Files + + + + + + + + + + + + + + + + + diff --git a/SitecorePackageDeployer/Pipelines/Initialize/RunPostInstallSteps.cs b/SitecorePackageDeployer/Pipelines/Initialize/RunPostInstallSteps.cs index 929d9f4..7d53583 100644 --- a/SitecorePackageDeployer/Pipelines/Initialize/RunPostInstallSteps.cs +++ b/SitecorePackageDeployer/Pipelines/Initialize/RunPostInstallSteps.cs @@ -87,7 +87,7 @@ private void RunPostInitializeStepsIfNeeded() try { - InstallPackage.ExecutePostSteps(installLogger, details); + InstallPackage.ExecutePostSteps(installLogger, details, true); InstallPackage.NotifiyPackageComplete(InstallPackage.SUCCESS, details); } diff --git a/SitecorePackageDeployer/Properties/AssemblyInfo.cs b/SitecorePackageDeployer/Properties/AssemblyInfo.cs index c31ef79..7fd95f1 100644 --- a/SitecorePackageDeployer/Properties/AssemblyInfo.cs +++ b/SitecorePackageDeployer/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.0.0")] -[assembly: AssemblyFileVersion("1.8.0.0")] +[assembly: AssemblyVersion("1.9.0.0")] +[assembly: AssemblyFileVersion("1.9.0.0")] diff --git a/SitecorePackageDeployer/Tasks/InstallPackage.cs b/SitecorePackageDeployer/Tasks/InstallPackage.cs index fb8ec97..42550f5 100644 --- a/SitecorePackageDeployer/Tasks/InstallPackage.cs +++ b/SitecorePackageDeployer/Tasks/InstallPackage.cs @@ -195,11 +195,11 @@ private void InstallPackages() } else { - ExecutePostSteps(installLogger, postStepDetails); + ExecutePostSteps(installLogger, postStepDetails, false); installStatus = SUCCESS; Log.Info(String.Format("Installation Complete: {0}", updatePackageFilenameStripped), this); - SetInstallerState(InstallerState.Ready); + SetInstallerState(InstallerState.InstallingPackage); } } catch (PostStepInstallerException ex) @@ -363,7 +363,7 @@ private void RunPostStepsAtStartup(string updatePackageFilename, string historyP /// Executes the post install steps /// /// - internal static void ExecutePostSteps(InstallLogger installLogger, PostStepDetails postStepDetails) + internal static void ExecutePostSteps(InstallLogger installLogger, PostStepDetails postStepDetails, bool setReadyStateWhenDone) { try { @@ -391,11 +391,17 @@ internal static void ExecutePostSteps(InstallLogger installLogger, PostStepDetai installLogger.Fatal("Post step execution failed", ex); + //If the post step fails, we need to make the installer ready for the next package so it doesn't get stuck waiting for this one to finish. + SetInstallerState(InstallerState.Ready); + throw; } finally { - SetInstallerState(InstallerState.Ready); + if (setReadyStateWhenDone) + { + SetInstallerState(InstallerState.Ready); + } } }