Fixed issues with not correctly writing .json file in older versions …

…of Sitecore
HedgehogDevelopment · Jan 9, 2017 · 49732be · 49732be
1 parent b076260
commit 49732be
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/SitecorePackageDeployer/Hhogdev.SitecorePackageDeployer.csproj b/SitecorePackageDeployer/Hhogdev.SitecorePackageDeployer.csproj
@@ -34,10 +34,9 @@
       <HintPath>..\packages\SitecoreKernel.7.0.0.131127\lib\Lucene.Net.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
+    <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>
     <Reference Include="Sitecore.Kernel, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\SitecoreKernel.7.0.0.131127\lib\Sitecore.Kernel.dll</HintPath>

diff --git a/SitecorePackageDeployer/Tasks/InstallPackage.cs b/SitecorePackageDeployer/Tasks/InstallPackage.cs
@@ -127,6 +127,11 @@ private void InstallPackages()
                     {
                         Log.Info("Install packages aborting due to shutdown", this);
 
+                        if (GetInstallerState() != InstallerState.WaitingForPostSteps)
+                        {
+                            SetInstallerState(InstallerState.Ready);
+                        }
+
                         break;
                     }
 
@@ -135,7 +140,6 @@ private void InstallPackages()
                     {
                         Log.Info(String.Format("Begin Installation: {0}", updatePackageFilenameStripped), this);
 
-
                         string installationHistoryRoot = null;
                         List<ContingencyEntry> logMessages = new List<ContingencyEntry>();
 

diff --git a/SitecorePackageDeployer/packages.config b/SitecorePackageDeployer/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="4.5.9" targetFramework="net45" />
   <package id="SitecoreKernel" version="7.0.0.131127" targetFramework="net45" />
 </packages>