1 files changed, 8 insertions, 15 deletions
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackagingProject.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackagingProject.cs
index 184b2dee9f..6641fba97c 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackagingProject.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackagingProject.cs
@@ -5,10 +5,11 @@ using System.Collections.Generic;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Core.Serialization;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Deployment
 {
-	public class PackagingProject: SolutionEntityItem
+	public class PackagingProject: SolutionItem
 	{
 		PackageCollection packages;
 		
@@ -40,21 +41,19 @@ namespace MonoDevelop.Deployment
 			return conf;
 		}
 		
-		protected override void OnClean (IProgressMonitor monitor, ConfigurationSelector configuration)
+		protected override Task<BuildResult> OnClean (ProgressMonitor monitor, ConfigurationSelector configuration)
 		{
 			foreach (Package p in packages)
 				p.Clean (monitor);
+			return Task.FromResult (BuildResult.Success);
 		}
 		
-		protected override BuildResult OnBuild (IProgressMonitor monitor, ConfigurationSelector configuration)
+		protected async override Task<BuildResult> OnBuild (ProgressMonitor monitor, ConfigurationSelector configuration)
 		{
 			foreach (Package p in packages)
-				p.Build (monitor);
-			return null;
-		}
-		
-		protected override void OnExecute (IProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration)
-		{
+				if (!await p.Build (monitor))
+					break;
+			return BuildResult.Success;
 		}
 		
 		protected override bool OnGetNeedsBuilding (ConfigurationSelector configuration)
@@ -65,12 +64,6 @@ namespace MonoDevelop.Deployment
 			return false;
 		}
 		
-		protected override void OnSetNeedsBuilding (bool val, ConfigurationSelector configuration)
-		{
-			foreach (Package p in packages)
-				p.NeedsBuilding = val;
-		}
-		
 		internal void NotifyPackagesChanged ()
 		{
 			if (PackagesChanged != null)