Implement a better approach than ILMerge for tasks

Instead of ILMerge, use embedded resources for the dependent assemblies,
so that on AppDomain.AssembylResolve, we'll fetch those assemblies from
the embedded resources. This guarantees that if the right binding redirects
are in place (i.e. for nuget, json.net, etc.), we'll "just work" with those
newer version, and if they are not and assembly loading fails, we'll use the
version we built against. So it's the best of both worlds.

The Fody.Costura nuget package will perform both, automatically embed the
resources, and while this makes the nuget package a bit larger, it guarantees
that it will work in MSBuild 14 as well as 15, even if the tooling for VS
only supports VS2017.

Author: kzu

src/Build/NuGet.Build.Packaging.Tasks/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers>
+	<Costura />
+</Weavers>

src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.Tasks.csproj

@@ -11,6 +11,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
     <Content Include="NuGet.Build.Packaging.props">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>

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

@@ -118,42 +118,4 @@ namespace $(RootNamespace)
 		</ItemGroup>
 	</Target>
 
-	<PropertyGroup>
-		<ILMerge>$(NuGetPackageRoot)ILRepack\2.0.12\tools\ILRepack.exe</ILMerge>
-	</PropertyGroup>
-
-	<Target Name="ILMerge"
-			AfterTargets="CoreCompile"
-			DependsOnTargets="CoreCompile"
-			Returns="@(MergedAssemblies)"
-			Condition="'$(Configuration)' == 'Release' And '$(ILMerge)' != 'false'">
-		<GetReferenceAssemblyPaths BypassFrameworkInstallChecks="False" TargetFrameworkMoniker="$(TargetFrameworkMoniker)">
-			<Output TaskParameter="FullFrameworkReferenceAssemblyPaths" PropertyName="FullFrameworkReferenceAssemblyPaths" />
-		</GetReferenceAssemblyPaths>
-		<ItemGroup>
-			<MergedAssemblies Include="@(ReferenceCopyLocalPaths)" Condition="$([System.String]::new('%(FileName)').StartsWith('Newtonsoft'))" />
-			<MergedAssemblies Include="@(ReferenceCopyLocalPaths)" Condition="$([System.String]::new('%(FileName)').StartsWith('NuGet'))" />
-			<!--<UnmergedAssemblies Include="@(ReferenceCopyLocalPaths)" Exclude="@(MergedAssemblies)" />
-			<UnmergedAssembliesDir Include="@(UnmergedAssemblies -> '%(RootDir)%(Directory)')" />-->
-			<ReferenceCopyLocalDirs Include="@(ReferenceCopyLocalPaths -> '%(RootDir)%(Directory)')" />
-			<ReferenceCopyLocalPaths Remove="@(MergedAssemblies)" />
-			<LibDir Include="@(ReferenceCopyLocalDirs->Distinct())" />
-		</ItemGroup>
-		<PropertyGroup>
-			<ILMergeArgs Condition="'$(AssemblyOriginatorKeyFile)' != ''">/keyfile:&quot;$(AssemblyOriginatorKeyFile)&quot;</ILMergeArgs>
-		</PropertyGroup>
-		<Exec Command="&quot;$(ILMerge)&quot; @(LibDir->'/lib:&quot;%(Identity).&quot;', ' ') $(ILMergeArgs) /targetplatform:&quot;v4,$(FullFrameworkReferenceAssemblyPaths.TrimEnd(\\))&quot; /out:&quot;@(IntermediateAssembly->'%(FullPath)')&quot; &quot;@(IntermediateAssembly->'%(FullPath)')&quot; @(MergedAssemblies->'&quot;%(FullPath)&quot;', ' ')"
-			  WorkingDirectory="$(MSBuildProjectDirectory)\$(OutputPath)"
-			  StandardErrorImportance="high"
-			  StandardOutputImportance="low"
-			  ConsoleToMSBuild="true"
-			  ContinueOnError="true">
-			<Output TaskParameter="ConsoleOutput" PropertyName="ILMergeOutput"/>
-			<Output TaskParameter="ExitCode" PropertyName="ExitCode"/>
-		</Exec>
-		<Message Importance="high" Text="$(ILMergeOutput)" Condition="'$(ExitCode)' != '0'" />
-		<Error Text="$(ILMergeOutput)" Condition="'$(ExitCode)' != '0' And '$(ContinueOnError)' != 'true'" />
-		<Delete Files="@(MergedAssemblies -> '$(MSBuildProjectDirectory)\$(OutputPath)%(Filename)%(Extension)')" Condition="Exists('$(MSBuildProjectDirectory)\$(OutputPath)%(Filename)%(Extension)')" />
-	</Target>
-
 </Project>

src/Build/NuGet.Build.Packaging.Tasks/project.json

@@ -1,7 +1,8 @@
 {
   "dependencies": {
+    "Costura.Fody": "1.3.3",
+    "Fody": "1.29.4",
     "GitInfo": "1.1.32",
-    "ILRepack": "2.0.12",
     "Microsoft.Build": "14.3.0",
     "Microsoft.Build.Tasks.Core": "14.3.0",
     "MSBuilder.ThisAssembly.Project": "0.3.1",

src/Build/NuGet.Build.Packaging.Tests/NuGet.Build.Packaging.Tests.targets

@@ -5,14 +5,6 @@
 		<!-- Prevents Fody.VerifyTask from running -->
 		<NCrunch>1</NCrunch>
 	</PropertyGroup>
-
-	<Target Name="RemoveMergedAssemblies" Condition="'$(Configuration)' == 'Release'" AfterTargets="ResolveNuGetPackageAssets">
-		<ItemGroup>
-			<MergedAssemblies Include="@(ReferenceCopyLocalPaths)" Condition="$([System.String]::new('%(FileName)').StartsWith('Newtonsoft'))" />
-			<MergedAssemblies Include="@(ReferenceCopyLocalPaths)" Condition="$([System.String]::new('%(FileName)').StartsWith('NuGet'))" />
-			<Reference Remove="@(MergedAssemblies)" />
-		</ItemGroup>
-	</Target>
 
 	<Target Name="AfterBuild">
 		<ItemGroup>

src/Build/msbuild.rsp

@@ -0,0 +1,2 @@
+/p:PackOnBuild=true
+/p:PackageOutputPath=..\..\..\out

src/NuGet.Build.Packaging.Shared.props

@@ -7,6 +7,7 @@
 		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 		<AssemblyName>$(MSBuildProjectName)</AssemblyName>
 		<RootNamespace>NuGet.Build.Packaging</RootNamespace>
+		
 		<OutputPath Condition=" '$(OutputPath)' == '' ">bin\$(Configuration)\</OutputPath>
 		<OutputType>Library</OutputType>
 		<AppDesignerFolder>Properties</AppDesignerFolder>

src/NuGet.Build.Packaging.Shared.targets

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), NuGet.Restore.targets))\NuGet.Restore.targets"
-          Condition=" '$(NuGetRestoreImported)' != 'true' " />
-		  
 	<Import Project="NuGet.Build.Packaging.props" Condition=" '$(NuGetPackagingPropsImported)' != 'true' " />
 
 	<PropertyGroup Condition=" '$(Language)' == 'C#' ">