Use the Cecil included with the linker

This commit is contained in:
Frank A. Krueger 2018-03-13 13:46:34 -07:00
parent 7d70351418
commit a1dab5fc06
No known key found for this signature in database
GPG Key ID: 0471C67474FFE664
3 changed files with 11 additions and 9 deletions

View File

@ -4,12 +4,11 @@ using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Text;
using Microsoft.Build.Framework; using Microsoft.Build.Framework;
using Microsoft.Build.Utilities; using Microsoft.Build.Utilities;
using System.Text;
using Mono.Cecil; using Mono.Cecil;
using System.Diagnostics;
using Mono.Linker; using Mono.Linker;
using Mono.Linker.Steps; using Mono.Linker.Steps;

View File

@ -2,26 +2,29 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks> <TargetFrameworks>netstandard2.0</TargetFrameworks>
<DefineConstants>NET_CORE</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Mono.Cecil" Version="0.10.0-beta7" />
<PackageReference Include="Microsoft.Build" Version="15.3.409" /> <PackageReference Include="Microsoft.Build" Version="15.3.409" />
<PackageReference Include="Microsoft.Build.Framework" 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.Utilities.Core" Version="15.3.409" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" /> <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Ooui\Ooui.csproj" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="linker\**" /> <Compile Remove="linker\**" />
<Compile Include="linker\linker\Linker\**" /> <Compile Include="linker\linker\Linker\**" />
<Compile Remove="linker\linker\Linker\Driver.cs" />
<Compile Include="linker\linker\Linker.Steps\**" /> <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\linker\Linker\AssemblyInfo.cs" />
<Compile Remove="linker\cecil\Mono.Cecil\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
</Project> </Project>

@ -1 +1 @@
Subproject commit a4f1133b0b06ec3d152b41186732f485413bd1c9 Subproject commit 1dcc9afa256c8e94050b6a21f03b503508e47f05