Add missing primary output in package

Author: kzu

build.proj

@@ -125,9 +125,9 @@
 	<Import Project="src\PackageVersion.targets" />
 
 	<Target Name="Configure" DependsOnTargets="DownloadNuGet;GetPackageVersion">
-		<Message Importance="high" Text="************************************************************************************************************************" />
+		<Message Importance="high" Text="*********************************************************************************************************************" />
 		<Message Importance="high" Text="$([System.Environment]::CommandLine)" />
-		<Message Importance="high" Text="************************************************************************************************************************" />
+		<Message Importance="high" Text="*********************************************************************************************************************" />
 
 		<Exec Command='"$(NuGet)" Install "$(MSBuildThisFileDirectory)packages.config" -OutputDirectory "$(PackagesPath)" -ExcludeVersion -Verbosity quiet'
 			  StandardOutputImportance="low"

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

@@ -25,8 +25,8 @@
 
 	<Import Project="$(OutputPath)NuGet.Build.Packaging.targets" 
 			Condition="'$(PackOnBuild)' == 'true' and Exists('$(OutputPath)NuGet.Build.Packaging.targets')" />
-
-	<Target Name="AddBuiltOutput" BeforeTargets="GetPackageContents" Returns="@(PackageFile)">
+	
+	<Target Name="AddBuiltOutput" BeforeTargets="GetPackageContents" DependsOnTargets="AllProjectOutputGroups" Returns="@(PackageFile)">
 		<!-- Update packaging version targets -->
 		<PropertyGroup>
 			<XmlNs>&lt;Namespace Prefix='msb' Uri='http://schemas.microsoft.com/developer/msbuild/2003'/&gt;</XmlNs>
@@ -35,6 +35,7 @@
 				 XmlInputPath="$(OutputPath)NuGet.Build.Packaging.Version.props"
 				 Query="/msb:Project/msb:PropertyGroup/msb:PackagingTargetsVersion"
 				 Value="$(PackageVersion)"/>
+		
 		<ItemGroup>
 			<PackageFile Include="$(OutputPath)ApiIntersect.exe">
 				<PackagePath>build\ApiIntersect.exe</PackagePath>
@@ -142,8 +143,6 @@ namespace $(RootNamespace)
 	<Target Name="ILMerge"
 			AfterTargets="CoreCompile"
 			DependsOnTargets="CoreCompile"
-			Inputs="@(IntermediateAssembly)"
-			Outputs="$(TargetPath)"
 			Returns="@(MergedAssemblies)"
 			Condition="'$(Configuration)' == 'Release' And '$(ILMerge)' != 'false'">
 		<GetReferenceAssemblyPaths BypassFrameworkInstallChecks="False" TargetFrameworkMoniker="$(TargetFrameworkMoniker)">

src/Build/NuGet.Build.Packaging.Tests/given_a_library_with_non_nugetized_reference.cs

@@ -27,7 +27,7 @@ public void when_getting_contents_then_fails()
 			{
 				Configuration = "Release",
 				IncludeFrameworkReferences = "false",
-			}, projectName: "a", target: "GetPackageContents", output: output);
+			}, projectName: "a", target: "GetPackageContents");
 
 			Assert.Equal(TargetResultCode.Failure, result.ResultCode);
 			Assert.Contains(result.Logger.Errors, error => error.Code == "NG0011");