Bump to mono/2018-02/0c5a524e (#1289)

Bumps to Java.Interop/master/0afb2b0f Bumps to llvm/master/a9cfb50e. Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=11771 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=15051 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=19436 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=45901 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=56071 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=58413 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=58413 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=58413 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=59184 fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60065 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60225 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60298 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60359 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60568 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60756 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60848 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60862 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60900 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60904 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60986 Fixes: https://github.com/mono/mono/issues/59400 Fixes: mono/mono#6169 Fixes: mono/mono#6187 Fixes: mono/mono#6192 Fixes: mono/mono#6255 Fixes: mono/mono#6264 Fixes: mono/mono#6266 Fixes: mono/mono#6281 Fixes: mono/mono#6283 Fixes: mono/mono#6320 Fixes: mono/mono#6339 Fixes: mono/mono#6343 Fixes: mono/mono#6349 Fixes: mono/mono#6379 Fixes: mono/mono#6383 Fixes: mono/mono#6401. Fixes: mono/mono#6411 Fixes: mono/mono#6414 Fixes: mono/mono#6490 Fixes: mono/mono#6721 Fixes: mono/mono#6767 Fixes: mono/mono#6777 Fixes: mono/mono#6848 Fixes: mono/mono#6940 Fixes: mono/mono#6948 Fixes: mono/mono#6998 Fixes: mono/mono#7016 Fixes: mono/mono#7085 Fixes: mono/mono#7086 Fixes: mono/mono#7095 Fixes: mono/mono#7137 Fixes: mono/mono#7184 Fixes: mono/mono#7240 Fixes: mono/mono#7262 Fixes: mono/mono#7289 Fixes: mono/mono#7338 Fixes: mono/mono#7356 Fixes: mono/mono#7364 Fixes: mono/mono#7378 Fixes: mono/mono#7389 Fixes: mono/mono#7460 Fixes: mono/mono#7535 Fixes: mono/mono#7536 Fixes: mono/mono#7610 Fixes: mono/mono#7624 Fixes: mono/mono#7637 Fixes: mono/mono#7655 Fixes: mono/mono#7657 Fixes: mono/mono#7685 Fixes: mono/mono#7786 Fixes: mono/mono#7792 Fixes: mono/mono#7822 Fixes: mono/mono#7860 Fixes: mono/mono#8089 Fixes: mono/mono#8267 Fixes: mono/mono#8409 Fixes: xamarin/maccore#628 Fixes: xamarin/maccore#629 Fixes: xamarin/maccore#673 Fixes: xamarin/maccore#673 Fixes: https://github.com/xamarin/xamarin-android/issues/1561\#issuecomment-381736716
dotnet · Apr 25, 2018 · 166e7d5 · 166e7d5
1 parent 31a23ca
commit 166e7d5
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 63 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -5,7 +5,7 @@
 [submodule "external/mono"]
 	path = external/mono
 	url = https://github.com/mono/mono.git
-	branch = 2017-12
+	branch = 2018-02
 [submodule "external/mxe"]
 	path = external/mxe
 	url = https://github.com/xamarin/mxe.git

diff --git a/Configuration.props b/Configuration.props
@@ -62,10 +62,10 @@
     <JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
     <LlvmSourceDirectory Condition=" '$(LlvmSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\llvm</LlvmSourceDirectory>
     <MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
-    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.10.0</MonoRequiredMinimumVersion>
-    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">5.11.0</MonoRequiredMaximumVersion>
+    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.12.0</MonoRequiredMinimumVersion>
+    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">5.13.0</MonoRequiredMaximumVersion>
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
-    <MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).22</MonoRequiredDarwinMinimumVersion>
+    <MonoRequiredDarwinMinimumVersion>$(MonoRequiredMinimumVersion).0</MonoRequiredDarwinMinimumVersion>
     <LinkerSourceDirectory>$(MSBuildThisFileDirectory)external\mono\external\linker</LinkerSourceDirectory>
     <OpenTKSourceDirectory>$(MSBuildThisFileDirectory)external\opentk</OpenTKSourceDirectory>
     <LibZipSourceDirectory Condition=" '$(LibZipSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\libzip</LibZipSourceDirectory>

diff --git a/build-tools/dependencies/dependencies.projitems b/build-tools/dependencies/dependencies.projitems
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_DarwinMonoFramework>MonoFramework-MDK-5.10.0.47.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
+    <_DarwinMonoFramework>MonoFramework-MDK-5.12.0.210.macos10.xamarin.universal.pkg</_DarwinMonoFramework>
     <_AptGetInstall>apt-get -f -u install</_AptGetInstall>
   </PropertyGroup>
   <ItemGroup>
@@ -59,7 +59,7 @@
       <MaximumVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' Or '$(IgnoreMaxMonoVersion)' == 'False' " >$(MonoRequiredMaximumVersion)</MaximumVersion>
       <DarwinMinimumVersion>$(MonoRequiredDarwinMinimumVersion)</DarwinMinimumVersion>
       <CurrentVersionCommand>$(MSBuildThisFileDirectory)..\scripts\mono-version</CurrentVersionCommand>
-      <DarwinMinimumUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2017-12/41/$(_DarwinMonoFramework)</DarwinMinimumUrl>
+      <DarwinMinimumUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-02/177/9bbc930d620487446f537e729f018eb965523fcd/$(_DarwinMonoFramework)</DarwinMinimumUrl>
       <DarwinInstall>installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target /</DarwinInstall>
     </RequiredProgram>
   </ItemGroup>

diff --git a/external/mono b/external/mono
diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/Linker.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/Linker.cs
@@ -43,7 +43,7 @@ static LinkContext CreateLinkContext (LinkerOptions options, Pipeline pipeline,
 				if (prepareDependenciesDump != null)
 					prepareDependenciesDump.Invoke (context.Annotations, null);
 			}
-			context.LogInternalExceptions = true;
+			context.LogMessages = true;
 			context.Logger = logger;
 			context.CoreAction = AssemblyAction.Link;
 			context.UserAction = AssemblyAction.Link;

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
@@ -324,103 +324,103 @@
     <Compile Include="Utilities\XDocumentExtensions.cs" />
     <Compile Include="Linker\MonoDroid.Tuner\PreserveRuntimeSerialization.cs" />
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\Annotations.cs">
-      <Link>Linker\Mono.Linker\Annotations.cs</Link>
+      <Link>Linker\Linker\Annotations.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\AssemblyAction.cs">
-      <Link>Linker\Mono.Linker\AssemblyAction.cs</Link>
+      <Link>Linker\Linker\AssemblyAction.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\AssemblyResolver.cs">
-      <Link>Linker\Mono.Linker\AssemblyResolver.cs</Link>
+      <Link>Linker\Linker\AssemblyResolver.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\I18nAssemblies.cs">
-      <Link>Linker\Mono.Linker\I18nAssemblies.cs</Link>
+      <Link>Linker\Linker\I18nAssemblies.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\IXApiVisitor.cs">
-      <Link>Linker\Mono.Linker\IXApiVisitor.cs</Link>
+      <Link>Linker\Linker\IXApiVisitor.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\LinkContext.cs">
-      <Link>Linker\Mono.Linker\LinkContext.cs</Link>
+      <Link>Linker\Linker\LinkContext.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\MethodAction.cs">
-      <Link>Linker\Mono.Linker\MethodAction.cs</Link>
+      <Link>Linker\Linker\MethodAction.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\MethodReferenceExtensions.cs">
-      <Link>Linker\Mono.Linker\MethodReferenceExtensions.cs</Link>
+      <Link>Linker\Linker\MethodReferenceExtensions.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\Pipeline.cs">
-      <Link>Linker\Mono.Linker\Pipeline.cs</Link>
+      <Link>Linker\Linker\Pipeline.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\TypePreserve.cs">
-      <Link>Linker\Mono.Linker\TypePreserve.cs</Link>
+      <Link>Linker\Linker\TypePreserve.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\TypeReferenceExtensions.cs">
-      <Link>Linker\Mono.Linker\TypeReferenceExtensions.cs</Link>
+      <Link>Linker\Linker\TypeReferenceExtensions.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\XApiReader.cs">
-      <Link>Linker\Mono.Linker\XApiReader.cs</Link>
+      <Link>Linker\Linker\XApiReader.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\BlacklistStep.cs">
-      <Link>Linker\Mono.Linker.Steps\BlacklistStep.cs</Link>
+      <Link>Linker\Linker.Steps\BlacklistStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\BaseStep.cs">
-      <Link>Linker\Mono.Linker.Steps\BaseStep.cs</Link>
+      <Link>Linker\Linker.Steps\BaseStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\CleanStep.cs">
-      <Link>Linker\Mono.Linker.Steps\CleanStep.cs</Link>
+      <Link>Linker\Linker.Steps\CleanStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\IStep.cs">
-      <Link>Linker\Mono.Linker.Steps\IStep.cs</Link>
+      <Link>Linker\Linker.Steps\IStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\LoadI18nAssemblies.cs">
-      <Link>Linker\Mono.Linker.Steps\LoadI18nAssemblies.cs</Link>
+      <Link>Linker\Linker.Steps\LoadI18nAssemblies.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\LoadReferencesStep.cs">
-      <Link>Linker\Mono.Linker.Steps\LoadReferencesStep.cs</Link>
+      <Link>Linker\Linker.Steps\LoadReferencesStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\OutputStep.cs">
-      <Link>Linker\Mono.Linker.Steps\OutputStep.cs</Link>
+      <Link>Linker\Linker.Steps\OutputStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\RegenerateGuidStep.cs">
-      <Link>Linker\Mono.Linker.Steps\RegenerateGuidStep.cs</Link>
+      <Link>Linker\Linker.Steps\RegenerateGuidStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\ResolveFromAssemblyStep.cs">
-      <Link>Linker\Mono.Linker.Steps\ResolveFromAssemblyStep.cs</Link>
+      <Link>Linker\Linker.Steps\ResolveFromAssemblyStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\ResolveFromXApiStep.cs">
-      <Link>Linker\Mono.Linker.Steps\ResolveFromXApiStep.cs</Link>
+      <Link>Linker\Linker.Steps\ResolveFromXApiStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\ResolveFromXmlStep.cs">
-      <Link>Linker\Mono.Linker.Steps\ResolveFromXmlStep.cs</Link>
+      <Link>Linker\Linker.Steps\ResolveFromXmlStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\ResolveStep.cs">
-      <Link>Linker\Mono.Linker.Steps\ResolveStep.cs</Link>
+      <Link>Linker\Linker.Steps\ResolveStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\TypeMapStep.cs">
-      <Link>Linker\Mono.Linker.Steps\TypeMapStep.cs</Link>
+      <Link>Linker\Linker.Steps\TypeMapStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\SweepStep.cs">
-      <Link>Linker\Mono.Linker.Steps\SweepStep.cs</Link>
+      <Link>Linker\Linker.Steps\SweepStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker.Steps\MarkStep.cs">
-      <Link>Linker\Mono.Linker.Steps\MarkStep.cs</Link>
+      <Link>Linker\Linker.Stepsq\MarkStep.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\LoadException.cs">
-      <Link>Linker\Mono.Linker\LoadException.cs</Link>
+      <Link>Linker\Linker\LoadException.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\MarkException.cs">
-      <Link>Linker\Mono.Linker\MarkException.cs</Link>
+      <Link>Linker\Linker\MarkException.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\ConsoleLogger.cs">
-      <Link>Linker\Mono.Linker\ConsoleLogger.cs</Link>
+      <Link>Linker\Linker\ConsoleLogger.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\ILogger.cs">
-      <Link>Linker\Mono.Linker\ILogger.cs</Link>
-    </Compile>
-    <Compile Include="$(LinkerSourceFullPath)\linker\Linker\MarkingHelpers.cs">
-      <Link>Linker\Mono.Linker\MarkingHelpers.cs</Link>
+      <Link>Linker\Linker\ILogger.cs</Link>
     </Compile>
     <Compile Include="$(LinkerSourceFullPath)\linker\Linker\Tracer.cs">
-      <Link>Linker\Mono.Linker\Tracer.cs</Link>
+      <Link>Linker\Linker\Tracer.cs</Link>
+    </Compile>
+    <Compile Include="$(LinkerSourceFullPath)\linker\Linker\MarkingHelpers.cs">
+      <Link>Linker\Linker\MarkingHelpers.cs</Link>
     </Compile>
     <Compile Include="Tasks\MergeResources.cs" />
     <Compile Include="Tasks\GetConvertedJavaLibraries.cs" />
@@ -712,7 +712,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="pdb2mdb\" />
-    <Folder Include="Linker\Mono.Linker\" />
+    <Folder Include="Linker\Linker\" />
     <Folder Include="utils\" />
   </ItemGroup>
 </Project>
diff --git a/src/mono-runtimes/mono-runtimes.projitems b/src/mono-runtimes/mono-runtimes.projitems
@@ -15,7 +15,7 @@
   </PropertyGroup>
   <ItemGroup>
     <_MonoRuntime Include="armeabi" Condition=" '$(_ArmeabiRuntimeConfigure)' == 'true' ">
-      <Strip>$(_ArmStrip)</Strip>
+      <Strip>$(AndroidToolchainDirectory)\toolchains\armeabi-clang\bin\arm-linux-androideabi-strip</Strip>
       <OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
       <NativeLibraryExtension>so</NativeLibraryExtension>
       <OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
@@ -29,7 +29,7 @@
   <!-- Cross compiler doesn't need this one, it uses the 'armeabi' build above. Thus no PropertyGroup here. -->
   <ItemGroup>
     <_MonoRuntime Include="armeabi-v7a" Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi-v7a:'))">
-      <Strip>$(_ArmStrip)</Strip>
+      <Strip>$(AndroidToolchainDirectory)\toolchains\armeabi-v7a-clang\bin\arm-linux-androideabi-strip</Strip>
       <OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
       <NativeLibraryExtension>so</NativeLibraryExtension>
       <OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
@@ -46,7 +46,7 @@
   </PropertyGroup>
   <ItemGroup>
     <_MonoRuntime Include="arm64-v8a" Condition=" '$(_Arm64RuntimeConfigure)' == 'true' ">
-      <Strip>$(_Arm64Strip)</Strip>
+      <Strip>$(AndroidToolchainDirectory)\toolchains\arm64-v8a-clang\bin\aarch64-linux-android-strip</Strip>
       <OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
       <NativeLibraryExtension>so</NativeLibraryExtension>
       <OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
@@ -63,7 +63,7 @@
   </PropertyGroup>
   <ItemGroup>
     <_MonoRuntime Include="x86" Condition=" '$(_X86RuntimeConfigure)' == 'true' ">
-      <Strip>$(_X86Strip)</Strip>
+      <Strip>$(AndroidToolchainDirectory)\toolchains\x86-clang\bin\i686-linux-android-strip</Strip>
       <OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
       <NativeLibraryExtension>so</NativeLibraryExtension>
       <OutputMonoBtlsFilename>libmono-btls-shared</OutputMonoBtlsFilename>
@@ -80,7 +80,7 @@
   </PropertyGroup>
   <ItemGroup>
     <_MonoRuntime Include="x86_64" Condition=" '$(_X8664RuntimeConfigure)' == 'true' ">
-      <Strip>$(_X86_64Strip)</Strip>
+      <Strip>$(AndroidToolchainDirectory)\toolchains\x86_64-clang\bin\x86_64-linux-android-strip</Strip>
       <OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
       <NativeLibraryExtension>so</NativeLibraryExtension>
       <OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>

diff --git a/src/mono-runtimes/mono-runtimes.props b/src/mono-runtimes/mono-runtimes.props
@@ -73,18 +73,6 @@
   </PropertyGroup>
 
   <!-- Mono runtimes settings -->
-  <PropertyGroup>
-    <_ArmStrip>$(AndroidToolchainDirectory)\toolchains\arm-linux-androideabi-clang\bin\arm-linux-androideabi-strip</_ArmStrip>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_Arm64Strip>$(AndroidToolchainDirectory)\toolchains\aarch64-linux-android-clang\bin\aarch64-linux-android-strip</_Arm64Strip>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_X86Strip>$(AndroidToolchainDirectory)\toolchains\i686-linux-android-clang\bin\i686-linux-android-strip</_X86Strip>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_X86_64Strip>$(AndroidToolchainDirectory)\toolchains\x86_64-linux-android-clang\bin\x86_64-linux-android-strip</_X86_64Strip>
-  </PropertyGroup>
   <PropertyGroup>
     <_HostWin64CFlags>$(_HostWinCFlags)</_HostWin64CFlags>
   </PropertyGroup>

diff --git a/src/mono-runtimes/mono-runtimes.targets b/src/mono-runtimes/mono-runtimes.targets
@@ -110,7 +110,7 @@
     />
   </ItemGroup>
   <ItemGroup>
-    <_MonoUtility  Include="linkeranalyzer.exe" />
+    <_MonoUtility  Include="illinkanalyzer.exe" />
     <_MonoUtility  Include="mono-symbolicate.exe" />
     <_MonoUtility  Include="mkbundle.exe" />
   </ItemGroup>

diff --git a/tools/scripts/illinkanalyzer b/tools/scripts/illinkanalyzer
@@ -3,4 +3,4 @@ BINDIR=`dirname "$0"`
 MANDROID_DIR="$BINDIR/.."
 
 unset MONO_PATH
-exec mono $MONO_OPTIONS "$MANDROID_DIR/linkeranalyzer.exe" "$@"
+exec mono $MONO_OPTIONS "$MANDROID_DIR/illinkanalyzer.exe" "$@"