Skip to content

Commit cfa74d3

Browse files
radekdoulikjonpryor
authored andcommitted
[Xamarin.Android.Cecil] Do not patch external/cecil (#132)
- just use override instead - rest of renaming from the patch is now fixed in cecil
1 parent b55fa21 commit cfa74d3

File tree

6 files changed

+7
-64
lines changed

6 files changed

+7
-64
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
using System.Runtime.CompilerServices;
2+
3+
[assembly: InternalsVisibleTo ("Xamarin.Android.Cecil.Pdb, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
4+
[assembly: InternalsVisibleTo ("Xamarin.Android.Cecil.Mdb, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]

src/Xamarin.Android.Cecil/Mono.Cecil.overrides renamed to external/Mono.Cecil.overrides

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<AssemblyName>$(AssemblyName.Replace('Mono', 'Xamarin.Android'))</AssemblyName>
4+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\product.snk</AssemblyOriginatorKeyFile>
45
</PropertyGroup>
56
<ItemGroup>
67
<Compile Include="$(MSBuildThisFileDirectory)Mono.Cecil.AssemblyInfo.cs" />

external/cecil

Submodule cecil updated from d0cb2b7 to d4bc3e7

src/Xamarin.Android.Cecil/AssemblyInfo.cs

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.targets

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,16 @@
88
<CecilOutputPath>$([System.IO.Path]::GetFullPath ($(CecilOutputPath)))</CecilOutputPath>
99
<CecilAssemblies>$(OutputPath)\Xamarin.Android.Cecil.dll;$(OutputPath)\Xamarin.Android.Cecil.Mdb.dll</CecilAssemblies>
1010
</PropertyGroup>
11-
<Target Name="PrepareCecil"
12-
Inputs="$(CecilDirectory)\Mono.Cecil.sln;AssemblyInfo.cs;Mono.Cecil.overrides;Xamarin.Android.Cecil.targets"
13-
Outputs="$(CecilPreparedFlag)">
14-
<Copy SourceFiles="AssemblyInfo.cs" DestinationFiles="$(CecilDirectory)\Mono.Cecil.AssemblyInfo.cs" />
15-
<Copy SourceFiles="Mono.Cecil.overrides" DestinationFolder="$(CecilDirectory)" />
16-
<Touch Files="$(CecilPreparedFlag)" AlwaysCreate="True" />
17-
</Target>
1811
<Target Name="BuildCecil"
19-
Inputs="$(CecilPreparedFlag)"
20-
Outputs="$(CecilAssemblies)" DependsOnTargets="PrepareCecil">
21-
<Exec
22-
Command="patch -Ep1 &lt; &quot;$(MSBuildThisFileDirectory)\assembly-rename.patch&quot;"
23-
WorkingDirectory="$(CecilDirectory)"
24-
/>
12+
Outputs="$(CecilAssemblies)">
2513
<MSBuild
2614
Projects="$(CecilDirectory)\Mono.Cecil.csproj;$(CecilDirectory)\symbols\mdb\Mono.Cecil.Mdb.csproj"
2715
Targets="Clean;Build"
2816
StopOnFirstFailure="True"
2917
Properties="Configuration=net_4_0_Debug;OutputPath=$(CecilOutputPath);BuildingSolutionFile=false" />
30-
<Exec
31-
Command="patch -REp1 &lt; &quot;$(MSBuildThisFileDirectory)\assembly-rename.patch&quot;"
32-
WorkingDirectory="$(CecilDirectory)"
33-
/>
3418
<Touch Files="$(CecilAssemblies)" />
3519
</Target>
3620
<Target Name="Build" DependsOnTargets="BuildCecil" Returns="$(CecilOutputPath)\$(AssemblyName).dll">
3721
<MakeDir Directories="obj\$(Configuration)" />
3822
</Target>
39-
<Target Name="AfterClean">
40-
<Delete Files="$(CecilPreparedFlag)" />
41-
</Target>
4223
</Project>

src/Xamarin.Android.Cecil/assembly-rename.patch

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)