diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
new file mode 100644
index 0000000..66158eb
--- /dev/null
+++ b/.nuget/NuGet.Config
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
new file mode 100644
index 0000000..6bb79fe
Binary files /dev/null and b/.nuget/NuGet.exe differ
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
new file mode 100644
index 0000000..3f8c37b
--- /dev/null
+++ b/.nuget/NuGet.targets
@@ -0,0 +1,144 @@
+
+
+
+ $(MSBuildProjectDirectory)\..\
+
+
+ false
+
+
+ false
+
+
+ true
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+ $([System.IO.Path]::Combine($(SolutionDir), ".nuget"))
+
+
+
+
+ $(SolutionDir).nuget
+
+
+
+ $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config
+ $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config
+
+
+
+ $(MSBuildProjectDirectory)\packages.config
+ $(PackagesProjectConfig)
+
+
+
+
+ $(NuGetToolsPath)\NuGet.exe
+ @(PackageSource)
+
+ "$(NuGetExePath)"
+ mono --runtime=v4.0.30319 "$(NuGetExePath)"
+
+ $(TargetDir.Trim('\\'))
+
+ -RequireConsent
+ -NonInteractive
+
+ "$(SolutionDir) "
+ "$(SolutionDir)"
+
+
+ $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)
+ $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols
+
+
+
+ RestorePackages;
+ $(BuildDependsOn);
+
+
+
+
+ $(BuildDependsOn);
+ BuildPackage;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SitecorePackageDeployer.TDS/Hhogdev.SitecorePackageDeployer.TDS.scproj b/SitecorePackageDeployer.TDS/Hhogdev.SitecorePackageDeployer.TDS.scproj
index 21c4f20..f4c7d52 100644
--- a/SitecorePackageDeployer.TDS/Hhogdev.SitecorePackageDeployer.TDS.scproj
+++ b/SitecorePackageDeployer.TDS/Hhogdev.SitecorePackageDeployer.TDS.scproj
@@ -37,8 +37,9 @@
Charles Turano
Hedgehog Development
Installs packages using a folder
- 1.8
- ..\packages\SitecoreKernel.7.0.0.131127\lib
+ 1.9
+
+
false
diff --git a/SitecorePackageDeployer.Web/Hhogdev.SitecorePackageDeployer.Web.csproj b/SitecorePackageDeployer.Web/Hhogdev.SitecorePackageDeployer.Web.csproj
index 6eed4cb..a6fd732 100644
--- a/SitecorePackageDeployer.Web/Hhogdev.SitecorePackageDeployer.Web.csproj
+++ b/SitecorePackageDeployer.Web/Hhogdev.SitecorePackageDeployer.Web.csproj
@@ -13,7 +13,7 @@
Properties
Hhogdev.SitecorePackageDeployer.Web
Hhogdev.SitecorePackageDeployer.Web
- v4.5
+ v4.6
true
@@ -22,6 +22,8 @@
+
+
true
@@ -42,22 +44,21 @@
+
-
-
-
+
@@ -81,10 +82,23 @@
Hhogdev.SitecorePackageDeployer
+
+
+
+
+
+
+ web.config
+
+
+ web.config
+
+
10.0
$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
diff --git a/SitecorePackageDeployer.Web/sitecore/admin/StartSitecorePackageDeployer.aspx.cs b/SitecorePackageDeployer.Web/sitecore/admin/StartSitecorePackageDeployer.aspx.cs
index 19f4fee..5e1b985 100644
--- a/SitecorePackageDeployer.Web/sitecore/admin/StartSitecorePackageDeployer.aspx.cs
+++ b/SitecorePackageDeployer.Web/sitecore/admin/StartSitecorePackageDeployer.aspx.cs
@@ -1,11 +1,7 @@
using Hhogdev.SitecorePackageDeployer.Tasks;
using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Threading;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
+using System.Threading.Tasks;
namespace Hhogdev.SitecorePackageDeployer.Web.sitecore.admin
{
@@ -18,11 +14,24 @@ protected void Page_Load(object sender, EventArgs e)
InstallPackage.ResetInstallState();
}
- ThreadPool.QueueUserWorkItem((ctx) =>
+ if (Request.QueryString["synchronous"] == "1")
{
- InstallPackage installer = new InstallPackage();
- installer.Run();
- });
+ var task = Task.Factory.StartNew(Runner);
+ Task.WaitAll(task);
+ }
+ else
+ {
+ ThreadPool.QueueUserWorkItem((ctx) =>
+ {
+ Runner();
+ });
+ }
+ }
+
+ private static void Runner()
+ {
+ var installer = new InstallPackage();
+ installer.Run();
}
}
}
\ No newline at end of file
diff --git a/SitecorePackageDeployer.Web/web.config b/SitecorePackageDeployer.Web/web.config
index 43cd16b..c9e8158 100644
--- a/SitecorePackageDeployer.Web/web.config
+++ b/SitecorePackageDeployer.Web/web.config
@@ -1,11 +1,10 @@
-
+
-
-
+
+
@@ -13,9 +12,20 @@
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SitecorePackageDeployer.sln b/SitecorePackageDeployer.sln
index cf7f380..f7a5fe1 100644
--- a/SitecorePackageDeployer.sln
+++ b/SitecorePackageDeployer.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2005
MinimumVisualStudioVersion = 10.0.40219.1
Project("{CAA73BB0-EF22-4D79-A57E-DF67B3BA9C80}") = "TestUpdatePackage", "TestUpdatePackage\TestUpdatePackage.scproj", "{7C1509F1-8FF7-4B05-8261-06D61B319030}"
EndProject
@@ -18,6 +18,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.md = README.md
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{079B238D-9ABF-4D49-880A-3D56BC834086}"
+ ProjectSection(SolutionItems) = preProject
+ .nuget\NuGet.Config = .nuget\NuGet.Config
+ .nuget\NuGet.exe = .nuget\NuGet.exe
+ .nuget\NuGet.targets = .nuget\NuGet.targets
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -52,4 +59,10 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {079B238D-9ABF-4D49-880A-3D56BC834086} = {41090F22-ABDF-4BAA-95A5-524520A4C1D1}
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {EBA5DA4F-3074-45DA-8CFC-A2810907331E}
+ EndGlobalSection
EndGlobal
diff --git a/SitecorePackageDeployer/Hhogdev.SitecorePackageDeployer.csproj b/SitecorePackageDeployer/Hhogdev.SitecorePackageDeployer.csproj
index 9f6429b..1324919 100644
--- a/SitecorePackageDeployer/Hhogdev.SitecorePackageDeployer.csproj
+++ b/SitecorePackageDeployer/Hhogdev.SitecorePackageDeployer.csproj
@@ -9,8 +9,9 @@
Properties
Hhogdev.SitecorePackageDeployer
Hhogdev.SitecorePackageDeployer
- v4.5
+ v4.6
512
+
true
@@ -30,33 +31,30 @@
4
+
+ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
+
- ..\packages\SitecoreKernel.7.0.0.131127\lib\Lucene.Net.dll
- False
+ ..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll
..\packages\Newtonsoft.Json.4.5.9\lib\net40\Newtonsoft.Json.dll
True
-
- ..\packages\SitecoreKernel.7.0.0.131127\lib\Sitecore.Kernel.dll
- False
+
+ ..\packages\Sitecore.Kernel.NoReferences.8.2.170407\lib\NET452\Sitecore.Kernel.dll
-
- ..\packages\SitecoreKernel.7.0.0.131127\lib\Sitecore.Logging.dll
- False
+
+ ..\packages\Sitecore.Logging.NoReferences.8.2.170407\lib\NET452\Sitecore.Logging.dll
-
- ..\packages\SitecoreKernel.7.0.0.131127\lib\Sitecore.Mvc.dll
- False
+
+ ..\packages\Sitecore.Mvc.NoReferences.8.2.170407\lib\NET452\Sitecore.Mvc.dll
-
- ..\packages\SitecoreKernel.7.0.0.131127\lib\Sitecore.Update.dll
- False
+
+ ..\packages\Sitecore.Update.NoReferences.8.2.170407\lib\NET452\Sitecore.Update.dll
-
- ..\packages\SitecoreKernel.7.0.0.131127\lib\Sitecore.Zip.dll
- False
+
+ ..\packages\Sitecore.Zip.NoReferences.8.2.170407\lib\NET452\Sitecore.Zip.dll
@@ -81,6 +79,7 @@
+