From a1dab5fc060233a80070b944654685f2e96a0611 Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Tue, 13 Mar 2018 13:46:34 -0700
Subject: [PATCH] Use the Cecil included with the linker

---
 Ooui.Wasm.Build.Tasks/BuildDistTask.cs            |  3 +--
 .../Ooui.Wasm.Build.Tasks.csproj                  | 15 +++++++++------
 Ooui.Wasm.Build.Tasks/linker                      |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Ooui.Wasm.Build.Tasks/BuildDistTask.cs b/Ooui.Wasm.Build.Tasks/BuildDistTask.cs
index a8f1e5b..3770108 100644
--- a/Ooui.Wasm.Build.Tasks/BuildDistTask.cs
+++ b/Ooui.Wasm.Build.Tasks/BuildDistTask.cs
@@ -4,12 +4,11 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Net;
+using System.Text;
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
-using System.Text;
 using Mono.Cecil;
-using System.Diagnostics;
 using Mono.Linker;
 using Mono.Linker.Steps;
 
diff --git a/Ooui.Wasm.Build.Tasks/Ooui.Wasm.Build.Tasks.csproj b/Ooui.Wasm.Build.Tasks/Ooui.Wasm.Build.Tasks.csproj
index 6d090ab..37231a9 100644
--- a/Ooui.Wasm.Build.Tasks/Ooui.Wasm.Build.Tasks.csproj
+++ b/Ooui.Wasm.Build.Tasks/Ooui.Wasm.Build.Tasks.csproj
@@ -2,26 +2,29 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <DefineConstants>NET_CORE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Mono.Cecil" Version="0.10.0-beta7" />
     <PackageReference Include="Microsoft.Build" Version="15.3.409" />
     <PackageReference Include="Microsoft.Build.Framework" Version="15.3.409" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.3.409" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Ooui\Ooui.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Remove="linker\**" />
     <Compile Include="linker\linker\Linker\**" />
-    <Compile Remove="linker\linker\Linker\Driver.cs" />
     <Compile Include="linker\linker\Linker.Steps\**" />
+    <Compile Include="linker\cecil\Mono.Cecil\**" />
+    <Compile Include="linker\cecil\Mono.Cecil.Cil\**" />
+    <Compile Include="linker\cecil\Mono.Cecil.Metadata\**" />
+    <Compile Include="linker\cecil\Mono.Cecil.PE\**" />
+    <Compile Include="linker\cecil\Mono.Collections.Generic\**" />
+    <Compile Include="linker\cecil\Mono\**" />
+    <Compile Remove="linker\linker\Linker\Driver.cs" />
     <Compile Remove="linker\linker\Linker\AssemblyInfo.cs" />
+    <Compile Remove="linker\cecil\Mono.Cecil\AssemblyInfo.cs" />
   </ItemGroup>
 
 </Project>
diff --git a/Ooui.Wasm.Build.Tasks/linker b/Ooui.Wasm.Build.Tasks/linker
index a4f1133..1dcc9af 160000
--- a/Ooui.Wasm.Build.Tasks/linker
+++ b/Ooui.Wasm.Build.Tasks/linker
@@ -1 +1 @@
-Subproject commit a4f1133b0b06ec3d152b41186732f485413bd1c9
+Subproject commit 1dcc9afa256c8e94050b6a21f03b503508e47f05