Merge pull request #8869 from mono/fix-950073

Add support to Pack .net std lib projects

Author: Rodrigo Moya

main/src/addins/MonoDevelop.AspNetCore/Properties/MonoDevelop.AspNetCore.addin.xml

@@ -884,7 +884,7 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/MainMenu/Build">
-		<CommandItem id = "MonoDevelop.AspNetCore.Commands.PublishToFolder" />
+		<CommandItem id = "MonoDevelop.AspNetCore.Commands.PublishToFolder" insertbefore="MonoDevelop.DotNetCore.Commands.PackSeparator" />
 		<SeparatorItem id = "ProfilesSeparator" />
 		<CommandItem id = "MonoDevelop.AspNetCore.Commands.PublishToFolderProfiles" />
 	</Extension>

main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Commands/PackCommandHandler.cs

@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.DotNetCore.Commands
+{
+	class PackCommandHandler : CommandHandler
+	{
+		protected override void Run (object dataItem)
+		{
+			var project = IdeApp.ProjectOperations.CurrentSelectedProject as DotNetProject;
+			if (project == null)
+				return;
+
+			var buildTarget = new PackProjectBuildTarget (project);
+			IdeApp.ProjectOperations.Build (buildTarget);
+		}
+
+		protected override void Update (CommandInfo info)
+		{
+			var project = IdeApp.ProjectOperations.CurrentSelectedProject as DotNetProject;
+			info.Enabled = info.Visible = project != null && IsDotNetCoreProject (project);
+		}
+
+		bool IsDotNetCoreProject (Project project)
+		{
+			return project.MSBuildProject.GetReferencedSDKs ().Any ();
+		}
+	}
+
+	class PackProjectBuildTarget : IBuildTarget
+	{
+		DotNetProject project;
+
+		public PackProjectBuildTarget (DotNetProject project)
+		{
+			this.project = project;
+		}
+
+		public string Name {
+			get { return project.Name; }
+		}
+
+		public async Task<BuildResult> Build (ProgressMonitor monitor, ConfigurationSelector configuration, bool buildReferencedTargets = false, OperationContext operationContext = null)
+		{
+			var result = await project.Build (monitor, configuration, buildReferencedTargets, operationContext);
+			if (result.Failed)
+				return result;
+
+			// Run the "Pack" target on the project
+			var packResult = (await project.RunTarget (monitor, "Pack", configuration, new TargetEvaluationContext (operationContext))).BuildResult;
+			return result.Append (packResult);
+		}
+
+		public bool CanBuild (ConfigurationSelector configuration)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public bool CanExecute (ExecutionContext context, ConfigurationSelector configuration)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public Task<BuildResult> Clean (ProgressMonitor monitor, ConfigurationSelector configuration, OperationContext operationContext = null)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public Task Execute (ProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public IEnumerable<IBuildTarget> GetExecutionDependencies ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public bool NeedsBuilding (ConfigurationSelector configuration)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public Task PrepareExecution (ProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+
+}

main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests.csproj

@@ -40,6 +40,7 @@
     <Compile Include="MonoDevelop.DotNetCore.Tests\TestableTargetFrameworkNodeBuilder.cs" />
     <Compile Include="MonoDevelop.DotNetCore.Tests\TestableFrameworkReferencesNodeBuilder.cs" />
     <Compile Include="MonoDevelop.DotNetCore.Tests\FakeUpdatedPackagesInWorkspace.cs" />
+    <Compile Include="MonoDevelop.DotNetCore.Tests\PackProjectTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\external\guiunit\src\framework\GuiUnit_NET_4_5.csproj">

main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/PackProjectTests.cs

@@ -0,0 +1,58 @@
+//
+// PackProjectTests.cs
+//
+// Author:
+//       Jason Imison <[email protected]>
+//
+// Copyright (c) 2019 Microsoft
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using MonoDevelop.Core;
+using MonoDevelop.DotNetCore.Commands;
+using MonoDevelop.Projects;
+using NUnit.Framework;
+using UnitTests;
+
+namespace MonoDevelop.DotNetCore.Tests
+{
+	[TestFixture]
+	public class PackProjectTests
+	{
+		[Test]
+		public async Task Should_pack_multi_target_project ()
+		{
+			FilePath solFile = Util.GetSampleProject ("DotNetCoreMultiTargetFrameworkProperty", "DotNetCoreMultiTargetFrameworkProperty.sln");
+
+			var sol = (Solution)await Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor (), solFile);
+			var p = (DotNetProject)sol.Items [0];
+
+			var packTarget = new PackProjectBuildTarget (p);
+			var monitor = Util.GetMonitor ();
+			var res = await p.RunTarget (monitor, "Restore", ConfigurationSelector.Default);
+			var result = await packTarget.Build (monitor, ConfigurationSelector.Default);
+			Assert.AreEqual (0, result.ErrorCount);
+			var nupkg = sol.FileName.ParentDirectory.Combine ("bin", "Debug", "DotNetCoreMultiTargetFrameworkProperty.1.0.0.nupkg");
+			Assert.IsTrue (File.Exists (nupkg));
+		}
+	}
+}
+	

main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj

@@ -96,6 +96,7 @@
     <Compile Include="MonoDevelop.DotNetCore.NodeBuilders\FrameworkReferencesNode.cs" />
     <Compile Include="MonoDevelop.DotNetCore.NodeBuilders\FrameworkReferencesNodeBuilder.cs" />
     <Compile Include="MonoDevelop.DotNetCore\DotNetCoreRuntimeSystemInformation.cs" />
+    <Compile Include="MonoDevelop.DotNetCore.Commands\PackCommandHandler.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">

main/src/addins/MonoDevelop.DotNetCore/Properties/MonoDevelop.DotNetCore.addin.xml

@@ -1599,4 +1599,20 @@
 	<Extension path="/MonoDevelop/DesignerSupport/PropertyProviders">
 		<Class class="MonoDevelop.DotNetCore.NodeBuilders.PackageDependencyNodePropertyProvider" />
 	</Extension>
+	
+	<!-- Pack command -->
+	<Extension path = "/MonoDevelop/Ide/Commands/Project">
+		<Command id = "MonoDevelop.DotNetCore.Commands.Pack" 
+				defaultHandler = "MonoDevelop.DotNetCore.Commands.PackCommandHandler"
+				_label = "Pack" />
+	</Extension>
+
+	<Extension path = "/MonoDevelop/Ide/MainMenu/Build">
+		<SeparatorItem id="MonoDevelop.DotNetCore.Commands.PackSeparator" />
+		<CommandItem id="MonoDevelop.DotNetCore.Commands.Pack" />
+	</Extension>
+
+	<Extension path="/MonoDevelop/Ide/ContextMenu/ProjectPad">
+		<CommandItem id="MonoDevelop.DotNetCore.Commands.Pack" insertbefore="Publish" />
+	</Extension>
 </ExtensionModel>

main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs

@@ -1592,7 +1592,7 @@ internal protected virtual Dictionary<string, string> CreateGlobalProperties (Co
 		{
 			var properties = new Dictionary<string, string> ();
 			string framework = activeTargetFramework;
-			if (framework != null && target != ProjectService.BuildTarget && target != ProjectService.CleanTarget)
+			if (framework != null && target != ProjectService.BuildTarget && target != ProjectService.CleanTarget && target != ProjectService.PackTarget)
 				properties ["TargetFramework"] = framework;
 
 			return properties;

main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs

@@ -58,7 +58,8 @@ public class ProjectService
 
 		public const string BuildTarget = "Build";
 		public const string CleanTarget = "Clean";
-		
+		public const string PackTarget = "Pack";
+
 		const string SerializableClassesExtensionPath = "/MonoDevelop/ProjectModel/SerializableClasses";
 		const string ProjectBindingsExtensionPath = "/MonoDevelop/ProjectModel/ProjectBindings";
 		const string WorkspaceObjectReadersPath = "/MonoDevelop/ProjectModel/WorkspaceObjectReaders";