[Xamarin.Android.Cecil] Do not patch external/cecil (dotnet#132)

- just use override instead - rest of renaming from the patch is now fixed in cecil
jonpryor · Mar 17, 2017 · cfa74d3 · cfa74d3
1 parent b55fa21
commit cfa74d3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 64 deletions.
diff --git a/external/Mono.Cecil.AssemblyInfo.cs b/external/Mono.Cecil.AssemblyInfo.cs
@@ -0,0 +1,4 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo ("Xamarin.Android.Cecil.Pdb, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
+[assembly: InternalsVisibleTo ("Xamarin.Android.Cecil.Mdb, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
diff --git a/...amarin.Android.Cecil/Mono.Cecil.overrides → external/Mono.Cecil.overrides b/...amarin.Android.Cecil/Mono.Cecil.overrides → external/Mono.Cecil.overrides
@@ -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" />

diff --git a/external/cecil b/external/cecil
diff --git a/src/Xamarin.Android.Cecil/AssemblyInfo.cs b/src/Xamarin.Android.Cecil/AssemblyInfo.cs
diff --git a/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.targets b/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.targets
@@ -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>
diff --git a/src/Xamarin.Android.Cecil/assembly-rename.patch b/src/Xamarin.Android.Cecil/assembly-rename.patch