Skip to content

[cecil] do not patch cecil anymore #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2017
Merged

[cecil] do not patch cecil anymore #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions external/Mono.Cecil.AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo ("Xamarin.Android.Cecil.Pdb, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
[assembly: InternalsVisibleTo ("Xamarin.Android.Cecil.Mdb, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
1 change: 1 addition & 0 deletions ...amarin.Android.Cecil/Mono.Cecil.overrides → external/Mono.Cecil.overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AssemblyName>$(AssemblyName.Replace('Mono', 'Xamarin.Android'))</AssemblyName>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\product.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)Mono.Cecil.AssemblyInfo.cs" />
Expand Down
2 changes: 1 addition & 1 deletion external/cecil
Open in desktop
Submodule cecil updated from d0cb2b to d4bc3e
4 changes: 0 additions & 4 deletions src/Xamarin.Android.Cecil/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

21 changes: 1 addition & 20 deletions src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,16 @@
<CecilOutputPath>$([System.IO.Path]::GetFullPath ($(CecilOutputPath)))</CecilOutputPath>
<CecilAssemblies>$(OutputPath)\Xamarin.Android.Cecil.dll;$(OutputPath)\Xamarin.Android.Cecil.Mdb.dll</CecilAssemblies>
</PropertyGroup>
<Target Name="PrepareCecil"
Inputs="$(CecilDirectory)\Mono.Cecil.sln;AssemblyInfo.cs;Mono.Cecil.overrides;Xamarin.Android.Cecil.targets"
Outputs="$(CecilPreparedFlag)">
<Copy SourceFiles="AssemblyInfo.cs" DestinationFiles="$(CecilDirectory)\Mono.Cecil.AssemblyInfo.cs" />
<Copy SourceFiles="Mono.Cecil.overrides" DestinationFolder="$(CecilDirectory)" />
<Touch Files="$(CecilPreparedFlag)" AlwaysCreate="True" />
</Target>
<Target Name="BuildCecil"
Inputs="$(CecilPreparedFlag)"
Outputs="$(CecilAssemblies)" DependsOnTargets="PrepareCecil">
<Exec
Command="patch -Ep1 &lt; &quot;$(MSBuildThisFileDirectory)\assembly-rename.patch&quot;"
WorkingDirectory="$(CecilDirectory)"
/>
Outputs="$(CecilAssemblies)">
<MSBuild
Projects="$(CecilDirectory)\Mono.Cecil.csproj;$(CecilDirectory)\symbols\mdb\Mono.Cecil.Mdb.csproj"
Targets="Clean;Build"
StopOnFirstFailure="True"
Properties="Configuration=net_4_0_Debug;OutputPath=$(CecilOutputPath);BuildingSolutionFile=false" />
<Exec
Command="patch -REp1 &lt; &quot;$(MSBuildThisFileDirectory)\assembly-rename.patch&quot;"
WorkingDirectory="$(CecilDirectory)"
/>
<Touch Files="$(CecilAssemblies)" />
</Target>
<Target Name="Build" DependsOnTargets="BuildCecil" Returns="$(CecilOutputPath)\$(AssemblyName).dll">
<MakeDir Directories="obj\$(Configuration)" />
</Target>
<Target Name="AfterClean">
<Delete Files="$(CecilPreparedFlag)" />
</Target>
</Project>
39 changes: 0 additions & 39 deletions src/Xamarin.Android.Cecil/assembly-rename.patch
View file
Open in desktop

This file was deleted.