Merge pull request #87 from mrward/dev-api-intersect-reference-paths

Support all ApiIntersect parameters api

Author: kzu

src/Build/NuGet.Build.Packaging.Tasks/ApiIntersect.cs

@@ -15,6 +15,18 @@ public class ApiIntersect : ToolTask
 		[Required]
 		public ITaskItem[] IntersectionAssembly { get; set; }
 
+		public ITaskItem[] ReferencePath { get; set; }
+
+		public ITaskItem[] ExcludeType { get; set; }
+
+		public ITaskItem[] RemoveAbstractTypeMembers { get; set; }
+
+		public ITaskItem[] ExcludeAssembly { get; set; }
+
+		public string KeepInternalConstructors { get; set; }
+
+		public string KeepMarshalling { get; set; }
+
 		[Required]
 		public ITaskItem RootOutputDirectory { get; set; }
 
@@ -56,6 +68,38 @@ protected override string GenerateCommandLineCommands()
 				builder.AppendFileNameIfNotNull(assembly.ItemSpec);
 			}
 
+			foreach (var referencePath in ReferencePath.NullAsEmpty())
+			{
+				builder.AppendSwitch("-r");
+				builder.AppendFileNameIfNotNull(referencePath.ItemSpec);
+			}
+
+			foreach (var excludeType in ExcludeType.NullAsEmpty())
+			{
+				builder.AppendSwitch("-b");
+				builder.AppendTextUnquoted(" \"");
+				builder.AppendTextUnquoted(excludeType.ItemSpec);
+				builder.AppendTextUnquoted("\"");
+			}
+
+			foreach (var removeAbstractType in RemoveAbstractTypeMembers.NullAsEmpty())
+			{
+				builder.AppendSwitch("-a");
+				builder.AppendTextUnquoted(" \"");
+				builder.AppendTextUnquoted(removeAbstractType.ItemSpec);
+				builder.AppendTextUnquoted("\"");
+			}
+
+			foreach (var assembly in ExcludeAssembly.NullAsEmpty())
+			{
+				builder.AppendSwitch("-e");
+				builder.AppendFileNameIfNotNull(assembly.ItemSpec);
+			}
+
+			AppendSwitchIfTrue(builder, "-k", KeepInternalConstructors);
+
+			AppendSwitchIfTrue(builder, "-m", KeepMarshalling);
+
 			return builder.ToString();
 		}
 
@@ -102,5 +146,15 @@ static string GetPortableRootDirectory()
 				Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86, Environment.SpecialFolderOption.DoNotVerify),
 				@"Reference Assemblies\Microsoft\Framework\.NETPortable");
 		}
+
+		static void AppendSwitchIfTrue(CommandLineBuilder builder, string switchName, string value)
+		{
+			if (string.IsNullOrEmpty(value))
+				return;
+
+			bool result;
+			if (bool.TryParse(value, out result))
+				builder.AppendSwitch(switchName);
+		}
 	}
 }

src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.targets

@@ -517,10 +517,25 @@ Copyright (c) .NET Foundation. All rights reserved.
 		Inputs="@(IntersectionAssembly)"
 		Outputs="@(_ReferenceAssemblyTargetPath)">
 
+		<PropertyGroup>
+			<EnableDefaultIntersectionAssemblyReferencePath Condition="'$(EnableDefaultIntersectionAssemblyReferencePath)' == ''">true</EnableDefaultIntersectionAssemblyReferencePath>
+		</PropertyGroup>
+
+		<ItemGroup>
+			<_IntersectionReferencePath Include="@(IntersectionAssembly->'%(RootDir)%(Directory)')" Condition="'$(EnableDefaultIntersectionAssemblyReferencePath)' == 'true'" />
+			<_IntersectionReferencePath Include="$(IntersectionAssemblyReferencePath)" />
+		</ItemGroup>
+		
 		<ApiIntersect
 			Framework="%(ReferenceAssemblyFramework.Identity)"
 			RootOutputDirectory="$(IntermediateOutputPath)"
 			IntersectionAssembly="@(IntersectionAssembly)"
+			ReferencePath="@(_IntersectionReferencePath)"
+			ExcludeType="$(IntersectionExcludeType)"
+			RemoveAbstractTypeMembers="$(IntersectionRemoveAbstractTypeMembers)"
+			ExcludeAssembly="@(IntersectionExcludeAssembly)"
+			KeepInternalConstructors="$(IntersectionKeepInternalConstructors)"
+			KeepMarshalling="$(IntersectionKeepMarshalling)"
 			ToolPath="$(ApiIntersectToolPath)"
 			ToolExe="$(ApiIntersectToolExe)">
 			<Output TaskParameter="OutputDirectory" ItemName="_ReferenceAssemblyBuildInfo" />