Revert "[mono-runtimes] Try to download Mono archive before building mono (#2265)"

This reverts commit f970cd50d2. Unfortunately, it [broke the build][0]: libtool: error: Could not determine the host path corresponding to libtool: error: Could not determine the host path corresponding to libtool: error: '/Users/builder/jenkins/workspace/xamarin-android/xamarin-android/external/mono/sdks/builds/android-host-mxe-Win64-debug/mono/mini/.libs' libtool: error: '/Users/builder/jenkins/workspace/xamarin-android/xamarin-android/external/mono/sdks/builds/android-host-mxe-Win64-debug/mono/mini/.libs' libtool: error: Continuing, but uninstalled executables may not work. Looks like the MXE+Windows build side was broken. :-( Revert commit f970cd50 until we figure things out. [0]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/1207/
2018-10-12 19:33:43 -04:00 · 2018-10-12 19:33:43 -04:00 · 84952df685
--- a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitCommitHash.cs
+++ b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitCommitHash.cs
@ -16,9 +16,6 @@ namespace Xamarin.Android.BuildTools.PrepTasks
 		[Output]
 		public                  string      AbbreviatedCommitHash       { get; set; }

-		[Output]
-		public                  string      CommitHash       { get; set; }
-
 		protected   override    bool        LogTaskMessages             {
 			get { return false; }
 		}
@ -41,18 +38,17 @@ namespace Xamarin.Android.BuildTools.PrepTasks

 		protected override string GenerateCommandLineCommands ()
 		{
-			return "rev-parse HEAD";
+			return "log --no-color --first-parent -n1 --pretty=format:%h";
 		}

 		protected override void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
 		{
 			if (string.IsNullOrEmpty (singleLine))
 				return;
-			if (singleLine.Length < 40) {
-				Log.LogError ("Commit hash `{0}` is shorter than required length of {1} characters", singleLine, 40);
+			if (singleLine.Length < RequiredHashLength) {
+				Log.LogError ("Abbreviated commit hash `{0}` is shorter than required length of {1} characters", singleLine, RequiredHashLength);
 				return;
 			}
-			CommitHash = singleLine;
 			AbbreviatedCommitHash = singleLine.Substring (0, RequiredHashLength);
 		}
 	}
--- a/external/mono
+++ b/external/mono
@ -1 +1 @@
-Subproject commit 226e91a0644d69387e822867fe7e8bec2f875b5f
+Subproject commit ab3c897d6851ccf75e840d8b767aafa0d0a32d53
--- a/src/mono-runtimes/mono-runtimes.projitems
+++ b/src/mono-runtimes/mono-runtimes.projitems
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <_MonoBcl Include="bcl" />
-  </ItemGroup>
-
  <ItemGroup>
    <_MonoRuntime Include="armeabi-v7a" Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi-v7a:')) ">
      <Strip>$(AndroidToolchainDirectory)\toolchains\armeabi-v7a-clang\bin\arm-linux-androideabi-strip</Strip>
@ -64,16 +60,27 @@
      <OutputMonoBtlsFilename></OutputMonoBtlsFilename>
      <OutputMonoPosixHelperFilename>libMonoPosixHelper</OutputMonoPosixHelperFilename>
    </_MonoRuntime>
-    <_MonoRuntime Include="host-$(HostOS)" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':$(HostOS):')) And ( '$(HostOS)' == 'Darwin' Or '$(HostOS)' == 'Linux' )">
+    <_MonoRuntime Include="host-Darwin" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">
      <Strip>strip</Strip>
      <StripFlags>-S</StripFlags>
      <OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
-      <NativeLibraryExtension Condition=" '$(HostOS)' == 'Darwin' ">dylib</NativeLibraryExtension>
-      <NativeLibraryExtension Condition=" '$(HostOS)' == 'Linux' ">so</NativeLibraryExtension>
+      <NativeLibraryExtension>dylib</NativeLibraryExtension>
      <OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
      <OutputAotProfilerFilename>libmono-profiler-aot</OutputAotProfilerFilename>
      <OutputMonoBtlsFilename></OutputMonoBtlsFilename>
      <OutputMonoPosixHelperFilename>libMonoPosixHelper</OutputMonoPosixHelperFilename>
+      <BuildTests>True</BuildTests>
+    </_MonoRuntime>
+    <_MonoRuntime Include="host-Linux" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:'))">
+      <Strip>strip</Strip>
+      <StripFlags>-S</StripFlags>
+      <OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
+      <NativeLibraryExtension>so</NativeLibraryExtension>
+      <OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
+      <OutputAotProfilerFilename>libmono-profiler-aot</OutputAotProfilerFilename>
+      <OutputMonoBtlsFilename></OutputMonoBtlsFilename>
+      <OutputMonoPosixHelperFilename>libMonoPosixHelper</OutputMonoPosixHelperFilename>
+      <BuildTests>True</BuildTests>
    </_MonoRuntime>
  </ItemGroup>

@ -84,6 +91,7 @@
      <InstallBinaries>true</InstallBinaries>
      <InstallPath Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">Darwin/</InstallPath>
      <InstallPath Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:'))">Linux/</InstallPath>
+      <PackageOptions>llvm-llvm32_CC="$(HostCc32)" llvm-llvm32_CXX="$(HostCxx32)"</PackageOptions>
    </_LlvmRuntime>

    <_LlvmRuntime Include="llvm64" Condition=" ($(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':arm64:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':x86_64:'))) And '$(HostBits)' == '64' ">
@ -91,6 +99,7 @@
      <InstallBinaries>true</InstallBinaries>
      <InstallPath Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">Darwin/</InstallPath>
      <InstallPath Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:'))">Linux/</InstallPath>
+      <PackageOptions>llvm-llvm64_CC="$(HostCc64)" llvm-llvm64_CXX="$(HostCxx64)"</PackageOptions>
    </_LlvmRuntime>

    <_LlvmRuntime Include="llvmwin32" Condition=" ($(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-armeabi-v7a:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-x86:'))) ">
--- a/src/mono-runtimes/mono-runtimes.targets
+++ b/src/mono-runtimes/mono-runtimes.targets
@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll"  TaskName="Xamarin.Android.BuildTools.PrepTasks.DownloadUri" />
  <UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" />
-  <UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitHash" />
  <Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
  <PropertyGroup>
    <_SourceTopDir>..\..</_SourceTopDir>
@ -25,15 +23,15 @@
  </ItemGroup>
  <UsingTask AssemblyFile="$(_SourceTopDir)\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.GetNugetPackageBasePath" />
  <ItemGroup>
-    <_MonoDocCopyItems Include="@(MonoDocCopyItem->'$(_MonoProfileToolsDir)\%(Identity)')" />
+    <_MonoDocCopyItems Include="@(MonoDocCopyItem->'$(_MonoOutputDir)\%(Identity)')" />
  </ItemGroup>
  <ItemGroup>
    <_MonoDocInstalledItems Include="@(MonoDocCopyItem->'$(_MSBuildDir)\%(Identity)')" />
    <_MonoDocInstalledItems Include="$(_MSBuildDir)\mdoc.exe" />
  </ItemGroup>
  <PropertyGroup>
-    <_MonoProfileDir>$(MonoSourceFullPath)\sdks\out\android-bcl\monodroid</_MonoProfileDir>
-    <_MonoProfileToolsDir>$(MonoSourceFullPath)\sdks\out\android-bcl\monodroid_tools</_MonoProfileToolsDir>
+    <_MonoProfileDir>$(MonoSourceFullPath)\mcs\class\lib\monodroid</_MonoProfileDir>
+    <_MonoOutputDir>$(MonoSourceFullPath)\mcs\class\lib\monodroid_tools</_MonoOutputDir>
  </PropertyGroup>
  <PropertyGroup>
    <_MonoSdksConfiguration Condition=" '$(Configuration)' == 'Release' ">release</_MonoSdksConfiguration>
@ -46,15 +44,15 @@
    <_MonoSdksMxePrefixDir>$(AndroidToolchainDirectory)</_MonoSdksMxePrefixDir>
    <_MonoSdksMxeSrc>$(MSBuildThisFileDirectory)..\..\external\mxe</_MonoSdksMxeSrc>

-    <_MonoSdksParameters>CONFIGURATION=$(_MonoSdksConfiguration) IGNORE_PROVISION_MXE=true IGNORE_PROVISION_ANDROID=true ANDROID_TOOLCHAIN_DIR=&quot;$(_MonoSdksAndroidToolchainDir)&quot; ANDROID_TOOLCHAIN_CACHE_DIR=&quot;$(_MonoSdksAndroidToolchainCacheDir)&quot; ANDROID_TOOLCHAIN_PREFIX=&quot;$(_MonoSdksAndroidToolchainPrefix)&quot; LLVM_SRC=&quot;$(_MonoSdksLlvmSrc)&quot; MXE_PREFIX_DIR=&quot;$(_MonoSdksMxePrefixDir)&quot; MXE_SRC=&quot;$(_MonoSdksMxeSrc)&quot;</_MonoSdksParameters>
+    <_MonoSdksParameters>CONFIGURATION=$(_MonoSdksConfiguration) IGNORE_PROVISION_MXE=true IGNORE_PROVISION_ANDROID=true IGNORE_PROVISION_LLVM=true ANDROID_TOOLCHAIN_DIR=&quot;$(_MonoSdksAndroidToolchainDir)&quot; ANDROID_TOOLCHAIN_CACHE_DIR=&quot;$(_MonoSdksAndroidToolchainCacheDir)&quot; ANDROID_TOOLCHAIN_PREFIX=&quot;$(_MonoSdksAndroidToolchainPrefix)&quot; LLVM_SRC=&quot;$(_MonoSdksLlvmSrc)&quot; MXE_PREFIX_DIR=&quot;$(_MonoSdksMxePrefixDir)&quot; MXE_SRC=&quot;$(_MonoSdksMxeSrc)&quot;</_MonoSdksParameters>
  </PropertyGroup>
  <PropertyGroup>
    <ForceBuildDependsOn>
-      _DownloadArchive;
-      _Autogen;
-      _Build;
-      _InstallRuntimes;
+      _BuildLlvm;
      _InstallLlvm;
+      _Autogen;
+      _BuildRuntimes;
+      _InstallRuntimes;
      _InstallBcl;
      _InstallCilStrip;
      _InstallMonoDoc;
@ -111,11 +109,11 @@
    <_MonoUtility  Include="mkbundle.exe" />
  </ItemGroup>
  <ItemGroup>
-    <_MonoUtilitySource Include="@(_MonoUtility->'$(_MonoProfileToolsDir)\%(Identity)')" />
+    <_MonoUtilitySource Include="@(_MonoUtility->'$(_MonoOutputDir)\%(Identity)')" />
    <_MonoUtilityDest   Include="@(_MonoUtility->'$(_MSBuildDir)\%(Identity)')" />
    <_MonoUtilitySource
        Condition=" '$(_DebugFileExt)' == '.mdb'"
-        Include="@(_MonoUtility->'$(_MonoProfileToolsDir)\%(Identity).mdb')"
+        Include="@(_MonoUtility->'$(_MonoOutputDir)\%(Identity).mdb')"
    />
    <_MonoUtilityDest
        Condition=" '$(_DebugFileExt)' == '.mdb'"
@ -123,7 +121,7 @@
    />
    <_MonoUtilitySource
        Condition=" '$(_DebugFileExt)' == '.pdb'"
-        Include="@(_MonoUtility->'$(_MonoProfileToolsDir)\%(Filename).pdb')"
+        Include="@(_MonoUtility->'$(_MonoOutputDir)\%(Filename).pdb')"
    />
    <_MonoUtilityDest
        Condition=" '$(_DebugFileExt)' == '.pdb'"
@ -156,9 +154,21 @@
      <_LlvmTargetBinary Include="@(_LlvmRuntime->'$(_MSBuildDir)\%(InstallPath)llc%(ExeSuffix)')" Condition=" '%(_LlvmRuntime.InstallBinaries)' == 'true' " />
    </ItemGroup>
  </Target>
+  
+  <Target Name="_BuildLlvm"
+      Condition=" '@(_LlvmRuntime)' != '' "
+      DependsOnTargets="_SetAutogenShTimeToLastCommitTimestamp;_PrepareLlvmItems"
+      Inputs="$(LlvmSourceFullPath)\CMakeLists.txt"
+      Outputs="@(_LlvmSourceBinary)">
+    <Exec
+        Command="make DISABLE_IOS=1 $(MakeConcurrency) @(_LlvmRuntime->'package-llvm-%(Identity)', ' ') $(_MonoSdksParameters) @(_LlvmRuntime->'%(PackageOptions)', ' ')"
+        IgnoreStandardErrorWarningFormat="True"
+        WorkingDirectory="$(MonoSourceFullPath)\sdks\builds"
+    />
+  </Target>

  <Target Name="_InstallLlvm"
-          DependsOnTargets="_Build"
+          DependsOnTargets="_BuildLlvm"
          Inputs="@(_LlvmSourceBinary)"
          Outputs="@(_LlvmTargetBinary)"
          Condition=" '@(_LlvmRuntime)' != '' ">
@ -179,18 +189,6 @@
    />
  </Target>

-  <Target Name="_GetMonoGitCommitHash">
-    <GitCommitHash
-        WorkingDirectory="$(MonoSourceFullPath)"
-        ToolPath="$(GitToolPath)"
-        ToolExe="$(GitToolExe)" >
-      <Output TaskParameter="CommitHash"   PropertyName="_MonoGitCommitHash" />
-    </GitCommitHash>
-    <PropertyGroup>
-      <_MonoArchiveName>android-$(_MonoSdksConfiguration)-$(_MonoGitCommitHash)-$(HostOS)</_MonoArchiveName>
-    </PropertyGroup>
-  </Target>
-
  <Target Name="_GetRuntimesOutputItems">
    <ItemGroup>
      <_RuntimeSource
@ -282,41 +280,26 @@
    </ItemGroup>
  </Target>

-  <Target Name="_DownloadArchive"
-      DependsOnTargets="_GetMonoGitCommitHash"
-      Condition=" !Exists('$(MonoSourceFullPath)\sdks\out\.stamp-$(_MonoArchiveName)-download') " >
-    <MakeDir
-        Directories="$(MonoSourceFullPath)\sdks\out"
-    />
-    <DownloadUri
-        SourceUris="https://xamjenkinsartifact.blob.core.windows.net/mono-sdks/$(_MonoArchiveName).tar.gz"
-        DestinationFiles="$(AndroidToolchainCacheDirectory)\$(_MonoArchiveName).tar.gz"
-        ContinueOnError="True"
-    />
+  <Target Name="_BuildRuntimes"
+      Condition=" '@(_MonoRuntime)' != '' Or '@(_MonoCrossRuntime)' != '' "
+      DependsOnTargets="_GetRuntimesOutputItems"
+      Outputs="@(_RuntimeSource);@(_RuntimeBinarySource);@(_CrossRuntimeBinarySource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_RuntimeEglibHeaderSource);@(_MonoBtlsSource);@(_BclTestOutput)">
    <Exec
-        Condition=" Exists('$(AndroidToolchainCacheDirectory)\$(_MonoArchiveName).tar.gz') "
-        Command="tar -xvf $(AndroidToolchainCacheDirectory)\$(_MonoArchiveName).tar.gz"
-        IgnoreStandardErrorWarningFormat="True"
-        WorkingDirectory="$(MonoSourceFullPath)\sdks\out"
-    />
-    <Touch
-        Condition=" Exists('$(AndroidToolchainCacheDirectory)\$(_MonoArchiveName).tar.gz') "
-        Files="$(MonoSourceFullPath)\sdks\out\.stamp-$(_MonoArchiveName)-download"
-        AlwaysCreate="True"
-    />
-  </Target>
-
-  <Target Name="_Build"
-      Condition=" '@(_MonoRuntime)' != '' Or '@(_MonoCrossRuntime)' != '' Or '@(_MonoBcl)' != '' Or '@(_LlvmRuntime)' != '' "
-      DependsOnTargets="_SetAutogenShTimeToLastCommitTimestamp;_GetRuntimesOutputItems;_PrepareLlvmItems;_GetMonoGitCommitHash;_DownloadArchive"
-      Inputs="$(LlvmSourceFullPath)\CMakeLists.txt;$(MonoSourceFullPath)\autogen.sh"
-      Outputs="@(_RuntimeSource);@(_RuntimeBinarySource);@(_CrossRuntimeBinarySource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_RuntimeEglibHeaderSource);@(_MonoBtlsSource);@(_BclTestOutput);@(_BclProfileItems);@(_LlvmSourceBinary)">
-    <Exec
-        Condition=" !Exists('$(MonoSourceFullPath)\sdks\out\.stamp-$(_MonoArchiveName)-download') "
-        Command="make DISABLE_IOS=1 $(MakeConcurrency) @(_MonoRuntime->'package-android-%(Identity)', ' ') @(_MonoCrossRuntime->'package-android-%(Identity)', ' ') @(_MonoBcl->'package-android-%(Identity)', ' ') @(_LlvmRuntime->'provision-llvm-%(Identity)', ' ') $(_MonoSdksParameters)"
+        Command="make DISABLE_IOS=1 $(MakeConcurrency) @(_MonoRuntime->'package-android-%(Identity)', ' ') @(_MonoCrossRuntime->'package-android-%(Identity)', ' ') $(_MonoSdksParameters)"
        IgnoreStandardErrorWarningFormat="True"
        WorkingDirectory="$(MonoSourceFullPath)\sdks\builds"
    />
+    <Exec
+        Condition=" '%(_MonoRuntime.BuildTests)' == 'True' "
+        Command="make DISABLE_IOS=1 $(MakeConcurrency) -C android-%(_MonoRuntime.Identity)-$(_MonoSdksConfiguration) -C runtime test"
+        IgnoreStandardErrorWarningFormat="True"
+        WorkingDirectory="$(MonoSourceFullPath)\sdks\builds"
+    />
+    <Exec
+        Condition=" '%(MonoTestAssembly.TestType)' == 'xunit' "
+        Command="make DISABLE_IOS=1 -C $(MonoSourceFullPath)\mcs\class\%(MonoTestAssembly.SourcePath) xunit-test-local"
+        WorkingDirectory="$(MonoSourceFullPath)"
+    />
  </Target>

  <Target Name="_InstallRuntimes"
@ -325,13 +308,16 @@
      Outputs="@(_InstallRuntimeOutput);@(_InstallRuntimeBinaryOutput);@(_InstallCrossRuntimeBinaryOutput);@(_InstallProfilerOutput);@(_InstallMonoPosixHelperOutput);@(_RuntimeEglibHeaderOutput)">
    <ItemGroup>
      <_BclTestAssemblyReference Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == 'reference'" />
-      <_BclTestAssembly  Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == '' Or '%(MonoTestAssembly.TestType)' == 'xunit' " />
-      <_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(_MonoProfileDir)\%(Identity)')" />
-      <_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(_MonoProfileDir)\%(Filename).pdb')" Condition="Exists('@(_BclTestAssemblyReference->'$(_MonoProfileDir)\%(Filename).pdb')')" />
-      <_BclTestAssemblySource Include="@(_BclTestAssembly->'$(_MonoProfileDir)\tests\%(Identity)')" />
-      <_BclTestAssemblySource Include="@(_BclTestAssembly->'$(_MonoProfileDir)\tests\%(Filename).pdb')" />
-      <_BclTestAssemblySource Include="@(MonoTestRunner->'$(_MonoProfileDir)\%(Identity)')" />
-      <_BclTestAssemblySource Include="@(MonoTestRunner->'$(_MonoProfileDir)\%(Filename).pdb')" />
+      <_BclTestAssemblyXUnit  Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == 'xunit'" />
+      <_BclTestAssemblyNUnit  Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == ''" />
+      <_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Identity)')" />
+      <_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')" Condition="Exists('@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')')" />
+      <_BclTestAssemblySource Include="@(_BclTestAssemblyXUnit->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Identity)')" />
+      <_BclTestAssemblySource Include="@(_BclTestAssemblyXUnit->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Filename).pdb')" />
+      <_BclTestAssemblySource Include="@(_BclTestAssemblyNUnit->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Identity)')" />
+      <_BclTestAssemblySource Include="@(_BclTestAssemblyNUnit->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Filename).pdb')" />
+      <_BclTestAssemblySource Include="@(MonoTestRunner->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Identity)')" />
+      <_BclTestAssemblySource Include="@(MonoTestRunner->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')" />
    </ItemGroup>
    <Copy
        SourceFiles="@(_BclTestAssemblySource)"
@ -473,19 +459,19 @@
    <Touch Files="@(_InstallMonoPosixHelperOutput);@(_InstallUnstrippedMonoPosixHelperOutput)" />
  </Target>
  <ItemGroup>
-    <_MonoCilStripSource  Include="$(_MonoProfileToolsDir)\mono-cil-strip.exe" />
+    <_MonoCilStripSource  Include="$(_MonoOutputDir)\mono-cil-strip.exe" />
    <_MonoCilStripDest    Include="$(_MSBuildDir)\cil-strip.exe" />
    <_MonoCilStripSource
        Condition=" '$(_DebugFileExt)' == '.mdb' "
-        Include="$(_MonoProfileToolsDir)\mono-cil-strip.exe.mdb"
+        Include="$(_MonoOutputDir)\mono-cil-strip.exe.mdb"
    />
    <_MonoCilStripDest
        Condition=" '$(_DebugFileExt)' == '.mdb' "
-        Include="$(_MonoProfileToolsDir)\cil-strip.exe.mdb"
+        Include="$(_MonoOutputDir)\cil-strip.exe.mdb"
    />
    <_MonoCilStripSource
        Condition=" '$(_DebugFileExt)' == '.pdb' "
-        Include="$(_MonoProfileToolsDir)\mono-cil-strip.pdb"
+        Include="$(_MonoOutputDir)\mono-cil-strip.pdb"
    />
    <_MonoCilStripDest
        Condition=" '$(_DebugFileExt)' == '.pdb' "
@ -502,7 +488,7 @@
    />
  </Target>
  <Target Name="_InstallMonoDoc"
-      Inputs="@(_MonoDocCopyItems);$(_MonoProfileToolsDir)\mdoc.exe"
+      Inputs="@(_MonoDocCopyItems);$(_MonoOutputDir)\mdoc.exe"
      Outputs="@(_MonoDocInstalledItems)">
    <MakeDir Directories="$(_MSBuildDir)" />
    <Copy
@ -510,7 +496,7 @@
        DestinationFolder="$(_MSBuildDir)"
    />
    <Exec
-        Command="$(RemapAssemblyRefTool) &quot;$(_MonoProfileToolsDir)\mdoc.exe&quot; &quot;$(_MSBuildDir)\mdoc.exe&quot; Mono.Cecil &quot;..\..\bin\Build$(Configuration)\Xamarin.Android.Cecil.dll&quot;"
+        Command="$(RemapAssemblyRefTool) &quot;$(_MonoOutputDir)\mdoc.exe&quot; &quot;$(_MSBuildDir)\mdoc.exe&quot; Mono.Cecil &quot;..\..\bin\Build$(Configuration)\Xamarin.Android.Cecil.dll&quot;"
    />
    <Touch
        Files="@(_MonoDocInstalledItems)"
@ -526,7 +512,7 @@
    />
    <ItemGroup>
      <_MonoUtilityExe Include="@(_MonoUtility)">
-        <Source>$(_MonoProfileToolsDir)\%(Identity)</Source>
+        <Source>$(_MonoOutputDir)\%(Identity)</Source>
        <Dest>$(_MSBuildDir)\%(Identity)</Dest>
      </_MonoUtilityExe>
    </ItemGroup>
@ -620,13 +606,13 @@
      AfterTargets="Clean">
    <Exec
        Condition=" '@(_MonoRuntime)' != '' Or '@(_MonoCrossRuntime)' != '' Or '@(_LlvmRuntime)' != '' "
-        Command="make $(MakeConcurrency) @(_MonoRuntime->'clean-android-%(Identity)', ' ') @(_MonoCrossRuntime->'clean-android-%(Identity)', ' ') @(_MonoBcl->'clean-android-%(Identity)', ' ') @(_LlvmRuntime->'clean-llvm-%(Identity)', ' ') $(_MonoSdksParameters)"
+        Command="make $(MakeConcurrency) @(_MonoRuntime->'clean-android-%(Identity)', ' ') @(_MonoCrossRuntime->'clean-android-%(Identity)', ' ') @(_LlvmRuntime->'clean-llvm-%(Identity)', ' ') $(_MonoSdksParameters)"
        IgnoreStandardErrorWarningFormat="True"
        WorkingDirectory="$(MonoSourceFullPath)\sdks\builds"
    />
  </Target>

  <Target Name="CoreCompile"
-      DependsOnTargets="_Build">
+      DependsOnTargets="_BuildRuntimes">
  </Target>
 </Project>