diff --git a/.gitmodules b/.gitmodules index 759975258..7f630b214 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = lib/mono.linq.expressions url = https://github.com/jonpryor/mono.linq.expressions.git branch = master +[submodule "external/cecil"] + path = external/cecil + url = https://github.com/mono/cecil.git diff --git a/Java.Interop.sln b/Java.Interop.sln index a3ae34768..50e804c32 100644 --- a/Java.Interop.sln +++ b/Java.Interop.sln @@ -91,7 +91,11 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Java.Interop.Tools.TypeName EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jcw-gen", "tools\jcw-gen\jcw-gen.csproj", "{52C7D9B6-E8C8-47D0-9471-652D278D7D77}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaCallableWrappers-Tests.csproj", "src\Java.Interop.Tools.JavaCallableWrappers\Test\Java.Interop.Tools.JavaCallableWrappers-Tests.csproj", "{58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaCallableWrappers-Tests", "src\Java.Interop.Tools.JavaCallableWrappers\Test\Java.Interop.Tools.JavaCallableWrappers-Tests.csproj", "{58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Cecil", "src\Xamarin.Android.Cecil\Xamarin.Android.Cecil.csproj", "{15945D4B-FF56-4BCC-B598-2718D199DD08}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Cecil.Mdb", "src\Xamarin.Android.Cecil\Xamarin.Android.Cecil.Mdb.csproj", "{C0487169-8F81-497F-919E-EB42B1D0243F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -315,6 +319,22 @@ Global {58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU {58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU {58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU + {15945D4B-FF56-4BCC-B598-2718D199DD08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {15945D4B-FF56-4BCC-B598-2718D199DD08}.Debug|Any CPU.Build.0 = Debug|Any CPU + {15945D4B-FF56-4BCC-B598-2718D199DD08}.Release|Any CPU.ActiveCfg = Release|Any CPU + {15945D4B-FF56-4BCC-B598-2718D199DD08}.Release|Any CPU.Build.0 = Release|Any CPU + {15945D4B-FF56-4BCC-B598-2718D199DD08}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU + {15945D4B-FF56-4BCC-B598-2718D199DD08}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU + {15945D4B-FF56-4BCC-B598-2718D199DD08}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU + {15945D4B-FF56-4BCC-B598-2718D199DD08}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU + {C0487169-8F81-497F-919E-EB42B1D0243F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C0487169-8F81-497F-919E-EB42B1D0243F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C0487169-8F81-497F-919E-EB42B1D0243F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C0487169-8F81-497F-919E-EB42B1D0243F}.Release|Any CPU.Build.0 = Release|Any CPU + {C0487169-8F81-497F-919E-EB42B1D0243F}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU + {C0487169-8F81-497F-919E-EB42B1D0243F}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU + {C0487169-8F81-497F-919E-EB42B1D0243F}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU + {C0487169-8F81-497F-919E-EB42B1D0243F}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {0C001D50-4176-45AE-BDC8-BA626508B0CC} = {C8F58966-94BF-407F-914A-8654F8B8AE3B} @@ -355,5 +375,7 @@ Global {E706B6F2-5562-4765-8F07-8CF84A797B30} = {0998E45F-8BCE-4791-A944-962CD54E2D80} {52C7D9B6-E8C8-47D0-9471-652D278D7D77} = {C8F58966-94BF-407F-914A-8654F8B8AE3B} {58B564A1-570D-4DA2-B02D-25BDDB1A9F4F} = {271C9F30-F679-4793-942B-0D9527CB3E2F} + {15945D4B-FF56-4BCC-B598-2718D199DD08} = {C8F58966-94BF-407F-914A-8654F8B8AE3B} + {C0487169-8F81-497F-919E-EB42B1D0243F} = {C8F58966-94BF-407F-914A-8654F8B8AE3B} EndGlobalSection EndGlobal diff --git a/Makefile b/Makefile index 4f8b8f6ed..c964ecd68 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,11 @@ xa-all: $(PACKAGES) $(XA_INTEGRATION_OUTPUTS) run-all-tests: run-tests run-test-jnimarshal run-test-generator-core run-ptests +prepare:: prepare-external + +prepare-external: $(PACKAGES) $(NUNIT_CONSOLE) + git submodule update --init --recursive + clean: -$(XBUILD) /t:Clean -rm -Rf bin/$(CONFIGURATION) bin/Build$(CONFIGURATION) bin/Test$(CONFIGURATION) bin/XAIntegration$(CONFIGURATION) diff --git a/external/cecil b/external/cecil new file mode 160000 index 000000000..172c907cd --- /dev/null +++ b/external/cecil @@ -0,0 +1 @@ +Subproject commit 172c907cd79a2e3e48df95f3f7425d46593274cb diff --git a/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj b/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj index dc043c15d..9d74f3002 100644 --- a/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj +++ b/src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil.csproj @@ -30,18 +30,6 @@ - - $(MSBuildThisFileDirectory)\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.dll - - - $(MSBuildThisFileDirectory)\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Mdb.dll - - - $(MSBuildThisFileDirectory)\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Pdb.dll - - - $(MSBuildThisFileDirectory)\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Rocks.dll - @@ -55,9 +43,10 @@ {64CC4E44-CE3A-4319-BF3F-6CF8BD513870} Java.Interop.Tools.Diagnostics - - - + + {15945D4B-FF56-4BCC-B598-2718D199DD08} + Xamarin.Android.Cecil + diff --git a/src/Java.Interop.Tools.Cecil/packages.config b/src/Java.Interop.Tools.Cecil/packages.config deleted file mode 100644 index 463589934..000000000 --- a/src/Java.Interop.Tools.Cecil/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj b/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj index 9f45e490c..20d6acd7b 100644 --- a/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj +++ b/src/Java.Interop.Tools.Diagnostics/Java.Interop.Tools.Diagnostics.csproj @@ -30,18 +30,6 @@ - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.dll - - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Mdb.dll - - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Pdb.dll - - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Rocks.dll - @@ -49,7 +37,10 @@ - + + {15945D4B-FF56-4BCC-B598-2718D199DD08} + Xamarin.Android.Cecil + \ No newline at end of file diff --git a/src/Java.Interop.Tools.Diagnostics/packages.config b/src/Java.Interop.Tools.Diagnostics/packages.config deleted file mode 100644 index 463589934..000000000 --- a/src/Java.Interop.Tools.Diagnostics/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj index 78fee22f8..66f23ec16 100644 --- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj +++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj @@ -31,18 +31,6 @@ - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.dll - - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Mdb.dll - - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Pdb.dll - - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Rocks.dll - @@ -61,6 +49,10 @@ {D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD} Java.Interop.Tools.Cecil + + {15945D4B-FF56-4BCC-B598-2718D199DD08} + Xamarin.Android.Cecil + @@ -70,8 +62,5 @@ MonoRuntimeProvider.Shared.java - - - diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj index 3123b3634..b8ad38001 100644 --- a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj +++ b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj @@ -34,18 +34,6 @@ ..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll - - ..\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.dll - - - ..\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Mdb.dll - - - ..\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Pdb.dll - - - ..\..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Rocks.dll - @@ -68,6 +56,10 @@ {64CC4E44-CE3A-4319-BF3F-6CF8BD513870} Java.Interop.Tools.Diagnostics + + {15945D4B-FF56-4BCC-B598-2718D199DD08} + Xamarin.Android.Cecil + diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/packages.config b/src/Java.Interop.Tools.JavaCallableWrappers/Test/packages.config index 2328985dc..c714ef3a2 100644 --- a/src/Java.Interop.Tools.JavaCallableWrappers/Test/packages.config +++ b/src/Java.Interop.Tools.JavaCallableWrappers/Test/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/packages.config b/src/Java.Interop.Tools.JavaCallableWrappers/packages.config deleted file mode 100644 index 463589934..000000000 --- a/src/Java.Interop.Tools.JavaCallableWrappers/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Cecil/AssemblyInfo.cs b/src/Xamarin.Android.Cecil/AssemblyInfo.cs new file mode 100644 index 000000000..79ef103cd --- /dev/null +++ b/src/Xamarin.Android.Cecil/AssemblyInfo.cs @@ -0,0 +1,4 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo ("Xamarin.Android.Cecil.Pdb, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")] +[assembly: InternalsVisibleTo ("Xamarin.Android.Cecil.Mdb, PublicKey=002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df")] diff --git a/src/Xamarin.Android.Cecil/Mono.Cecil.overrides b/src/Xamarin.Android.Cecil/Mono.Cecil.overrides new file mode 100644 index 000000000..3d5468a17 --- /dev/null +++ b/src/Xamarin.Android.Cecil/Mono.Cecil.overrides @@ -0,0 +1,8 @@ + + + $(AssemblyName.Replace('Mono', 'Xamarin.Android')) + + + + + diff --git a/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.Mdb.csproj b/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.Mdb.csproj new file mode 100644 index 000000000..88b76701a --- /dev/null +++ b/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.Mdb.csproj @@ -0,0 +1,31 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {C0487169-8F81-497F-919E-EB42B1D0243F} + Library + Mono.Cecil.Mdb + Xamarin.Android.Cecil.Mdb + v4.0 + + + true + full + false + bin\Debug + DEBUG; + prompt + 4 + + + true + bin\Release + prompt + 4 + + + + diff --git a/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.csproj b/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.csproj new file mode 100644 index 000000000..15b0465dc --- /dev/null +++ b/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.csproj @@ -0,0 +1,31 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {15945D4B-FF56-4BCC-B598-2718D199DD08} + Library + Mono.Cecil + Xamarin.Android.Cecil + v4.0 + + + true + full + false + bin\Debug + DEBUG; + prompt + 4 + + + true + bin\Release + prompt + 4 + + + + diff --git a/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.targets b/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.targets new file mode 100644 index 000000000..1b46a0592 --- /dev/null +++ b/src/Xamarin.Android.Cecil/Xamarin.Android.Cecil.targets @@ -0,0 +1,36 @@ + + + + $(MSBuildThisFileDirectory)\..\..\external\cecil + prepared.flag + bin\$(Configuration) + $([System.IO.Path]::GetFullPath ('$(OutputPath)')) + $(OutputPath)\Xamarin.Android.Cecil.dll;$(OutputPath)\Xamarin.Android.Cecil.Mdb.dll + + + + + + + + + + + + + + + + + + + + diff --git a/src/Xamarin.Android.Cecil/assembly-rename.patch b/src/Xamarin.Android.Cecil/assembly-rename.patch new file mode 100644 index 000000000..ee98c4e5d --- /dev/null +++ b/src/Xamarin.Android.Cecil/assembly-rename.patch @@ -0,0 +1,39 @@ +diff --git a/Mono.Cecil.Cil/Symbols.cs b/Mono.Cecil.Cil/Symbols.cs +index 426c4a7..1bc138d 100644 +--- a/Mono.Cecil.Cil/Symbols.cs ++++ b/Mono.Cecil.Cil/Symbols.cs +@@ -186,7 +186,7 @@ namespace Mono.Cecil.Cil { + var cecil_name = typeof (SymbolProvider).Assembly.GetName (); + + var name = new SR.AssemblyName { +- Name = "Mono.Cecil." + symbol_kind, ++ Name = "Xamarin.Android.Cecil." + symbol_kind, + Version = cecil_name.Version, + }; + +diff --git a/ProjectInfo.cs b/ProjectInfo.cs +index 8d427a7..59bc253 100644 +--- a/ProjectInfo.cs ++++ b/ProjectInfo.cs +@@ -10,7 +10,7 @@ + using System.Reflection; + using System.Runtime.InteropServices; + +-[assembly: AssemblyProduct ("Mono.Cecil")] ++[assembly: AssemblyProduct ("Xamarin.Android.Cecil")] + [assembly: AssemblyCopyright ("Copyright © 2008 - 2015 Jb Evain")] + + [assembly: ComVisible (false)] +diff --git a/Mono.Cecil/AssemblyInfo.cs b/Mono.Cecil/AssemblyInfo.cs +index 40cc0d4..41e159f 100644 +--- a/Mono.Cecil/AssemblyInfo.cs ++++ b/Mono.Cecil/AssemblyInfo.cs +@@ -10,7 +10,7 @@ using System.Reflection; + using System.Runtime.CompilerServices; + using System.Runtime.InteropServices; + +-[assembly: AssemblyTitle ("Mono.Cecil")] ++[assembly: AssemblyTitle ("Xamarin.Android.Cecil")] + + [assembly: Guid ("fd225bb4-fa53-44b2-a6db-85f5e48dcb54")] + diff --git a/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/CecilExtensions.cs b/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/CecilExtensions.cs index 8bc9398f3..b1bbfcc34 100644 --- a/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/CecilExtensions.cs +++ b/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/CecilExtensions.cs @@ -47,7 +47,7 @@ public static IEnumerable GetMethods (this TypeDefinition t) yield return m; if (t.IsInterface) foreach (var it in t.Interfaces) - foreach (var m in it.Resolve ().GetMethods ()) + foreach (var m in it.InterfaceType.Resolve ().GetMethods ()) yield return m; } diff --git a/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/Xamarin.Android.Tools.AnnotationSupport.Cecil.csproj b/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/Xamarin.Android.Tools.AnnotationSupport.Cecil.csproj index fc2556606..def7272c4 100644 --- a/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/Xamarin.Android.Tools.AnnotationSupport.Cecil.csproj +++ b/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/Xamarin.Android.Tools.AnnotationSupport.Cecil.csproj @@ -31,9 +31,6 @@ - - ..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.dll - @@ -41,9 +38,10 @@ - - - + + {15945D4B-FF56-4BCC-B598-2718D199DD08} + Xamarin.Android.Cecil + {1268EADF-8344-431C-81F6-FCB7CBC99F49} Xamarin.Android.Tools.ApiXmlAdjuster diff --git a/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/packages.config b/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/packages.config deleted file mode 100644 index 463589934..000000000 --- a/src/Xamarin.Android.Tools.AnnotationSupport.Cecil/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/tools/generator/generator.csproj b/tools/generator/generator.csproj index 2834e054c..af9fadd9d 100644 --- a/tools/generator/generator.csproj +++ b/tools/generator/generator.csproj @@ -42,18 +42,6 @@ - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.dll - - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Mdb.dll - - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Pdb.dll - - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Rocks.dll - ..\..\packages\Mono.Options.4.4.0.0\lib\net4-client\Mono.Options.dll @@ -143,6 +131,10 @@ {D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD} Java.Interop.Tools.Cecil + + {15945D4B-FF56-4BCC-B598-2718D199DD08} + Xamarin.Android.Cecil + diff --git a/tools/generator/packages.config b/tools/generator/packages.config index bfb63452b..8a52a6801 100644 --- a/tools/generator/packages.config +++ b/tools/generator/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/tools/jcw-gen/jcw-gen.csproj b/tools/jcw-gen/jcw-gen.csproj index f904228d4..39b73ec4d 100644 --- a/tools/jcw-gen/jcw-gen.csproj +++ b/tools/jcw-gen/jcw-gen.csproj @@ -30,18 +30,6 @@ - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.dll - - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Mdb.dll - - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Pdb.dll - - - ..\..\packages\Mono.Cecil.0.10.0-beta1-v2\lib\net40\Mono.Cecil.Rocks.dll - ..\..\packages\Mono.Options.4.4.0.0\lib\net4-client\Mono.Options.dll @@ -63,6 +51,10 @@ {64CC4E44-CE3A-4319-BF3F-6CF8BD513870} Java.Interop.Tools.Diagnostics + + {15945D4B-FF56-4BCC-B598-2718D199DD08} + Xamarin.Android.Cecil + diff --git a/tools/jcw-gen/packages.config b/tools/jcw-gen/packages.config index bfb63452b..8a52a6801 100644 --- a/tools/jcw-gen/packages.config +++ b/tools/jcw-gen/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file