[structure] Rework installation directory structure

Context: dotnet#253 (comment)

The *intention* is that Jenkins-produced `oss-xamarin.android*.zip`
artifacts be usable on Windows, so that side-by-side testing can be
perfomed without replacing the system installation. Usage is in
[UsingJenkinsBuildArtifacts.md](Documentation/UsingJenkinsBuildArtifacts).

This isn't *entirely* the case. It was *apparently* the case at the
time of commit 87ca273, but things have bitrotten since, and/or the
support was always insufficient.

For example, 87ca273 states that it should be possible to use
`msbuild /t:TargetFrameworkRootPath=...` to specify the
`lib\xbuild-frameworks` directory as the location to find
`Mono.Android` framework assemblies.

...and this works! So long as your project *only* uses Xamarin.Android
assemblies and projects.

PCL assemblies and projects do *not* fall under this umbrella.
Consequently, attempting to use PCL assemblies while overriding
`$(TargetFrameworkRootPath)` results in a gnarly error:

	error MSB3644: The reference assemblies for framework ".NETPortable,Version=v4.5,Profile=Profile259" were not found.

This significantly reduces the usefulness of
`oss-xamarin.android*.zip` on Windows.

Additionally, PR dotnet#253 mentions that, for filesystem organization, it
would be useful if the macOS/Linux directory structure --
`$prefix/bin`, `$prefix/lib/mandroid`,
`$prefix/lib/xbuild/Xamarin/Android`, `$prefix/lib/xbuild-frameworks`
-- more closely resembled the Windows directory structure of
`$MSBuild` and `$ReferenceAssemblies` (as seen in `.vsix` files).
This would turn macOS/Linux into using `$xa_prefix/xbuild` and
`$xa_prefix/xbuild-frameworks` directories.

`$prefix/bin` would only contain `xabuild`. What is currently in
`$prefix/lib/mandroid` would be merged with
`$xa_prefix/xbuild/Xamarin/Android`.

`$xa_prefix`, meanwhile, could become
`$prefix/lib/oss-xamarin.android`.

This would turn the current macOS structure:

	$prefix/bin/xabuild
	$prefix/bin/generator
	$prefix/bin/cross-arm
	$prefix/lib/mandroid/generator.exe
	$prefix/lib/xbuild-frameworks/MonoAndroid/v1.0/mscorlib
	$prefix/lib/xbuild/Xamarin/Android/Xamarin.Android.Common.targets

Into:

	$prefix/bin/xabuild
	$prefix/lib/oss-xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/mscorlib
	$prefix/lib/oss-xamarin.android/xbuild/Xamarin/Android/Xamarin.Android.Common.targets
	$prefix/lib/oss-xamarin.android/xbuild/Xamarin/Android/generator.exe
	$prefix/lib/oss-xamarin.android/xbuild/Xamarin/Android/Darwin/cross-arm

Author: jonpryor

Configuration.props

@@ -20,6 +20,7 @@
   <PropertyGroup>
     <AutoProvision Condition=" '$(AutoProvision)' == '' ">False</AutoProvision>
     <AutoProvisionUsesSudo Condition=" '$(AutoProvisionUsesSudo)' == '' ">False</AutoProvisionUsesSudo>
+    <XAInstallPrefix Condition=" '$(XAInstallPrefix)' == '' ">$(MSBuildThisFileDirectory)\bin\$(Configuration)\lib\xamarin.android\</XAInstallPrefix>
     <HostOS Condition=" '$(HostOS)' == '' And '$(OS)' == 'Windows_NT' ">Windows</HostOS>
     <HostCc Condition=" '$(HostCc)' == '' ">$(HostCc64)</HostCc>
     <HostCxx Condition=" '$(HostCxx)' == '' ">$(HostCxx64)</HostCxx>

Documentation/DevelopmentTips.md

@@ -65,7 +65,7 @@ varies based on the operating system you're building from:
 Once the assemblies have been rebuilt, they can be copied into the appropriate
 Xamarin.Android SDK directory by using the `_InstallBcl` target:
 
-	# This updates bin/$(Configuration)/lib/xbuild-frameworks/MonoAndroid/v1.0/ASSEMBLY.dll
+	# This updates bin/$(Configuration)/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/ASSEMBLY.dll
 	$ xbuild build-tools/mono-runtimes/mono-runtimes.mdproj /t:_InstallBcl
 
 # Update Directory

Documentation/UsingJenkinsBuildArtifacts.md

@@ -149,7 +149,7 @@ MSBuild properties:
     `oss-xamarin.android*.zip` installation.
 * `MonoAndroidToolsDirectory`: The `xbuild\Xamarin\Android` directory in the
     `oss-xamarin.android*.zip` installation.
-* `TargetFrameworkRootPath`: The `xbuild-frameworks` directory in the
+* `XATargetFrameworkRootPath`: The `xbuild-frameworks` directory in the
     `oss-xamarin.android*.zip` installation.
 
 For example (using the paths from [Android SDK Setup](#Android_SDK_Setup)):
@@ -158,7 +158,7 @@ For example (using the paths from [Android SDK Setup](#Android_SDK_Setup)):
 		/p:AndroidNdkDirectory="C:\xa-sdk\android-ndk\android-ndk-r14" ^
 		/p:MonoAndroidBinDirectory="C:\xa-sdk\oss-xamarin.android_v7.2.99.19_Darwin-x86_64_master_3b893cd\bin\Debug\lib\xbuild\Xamarin\Android" ^
 		/p:MonoAndroidToolsDirectory="C:\xa-sdk\oss-xamarin.android_v7.2.99.19_Darwin-x86_64_master_3b893cd\bin\Debug\lib\xbuild\Xamarin\Android" ^
-		/p:TargetFrameworkRootPath="C:\xa-sdk\oss-xamarin.android_v7.2.99.19_Darwin-x86_64_master_3b893cd\bin\Debug\lib\xbuild-frameworks" ^
+		/p:XATargetFrameworkRootPath="C:\xa-sdk\oss-xamarin.android_v7.2.99.19_Darwin-x86_64_master_3b893cd\bin\Debug\lib\xbuild-frameworks" ^
 		/t:SignAndroidPackage ^
 		samples\HelloWorld\HelloWorld.csproj
 

Makefile

@@ -90,7 +90,7 @@ prepare-external: prepare-deps
 	(cd $(call GetPath,JavaInterop) && make bin/BuildDebug/JdkInfo.props)
 
 prepare-props: prepare-external
-	cp Configuration.Java.Interop.Override.props external/Java.Interop/Configuration.Override.props
+	cp build-tools/scripts/Configuration.Java.Interop.Override.props external/Java.Interop/Configuration.Override.props
 	cp $(call GetPath,MonoSource)/mcs/class/msfinal.pub .
 
 prepare-msbuild: prepare-props

README.md

@@ -320,13 +320,13 @@ The `bin\$(Configuration)` directory, e.g. `bin\Debug`, contains
 acts as a *local installation prefix*, in which the directory structure
 mirrors that of the OS X Xamarin.Android.framework directory structure:
 
-* `bin\$(Configuration)\lib\xbuild\Xamarin\Android`: MSBuild-related support
+* `bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android`: MSBuild-related support
     files and required runtimes used by the MSBuild tooling.
-* `bin\$(Configuration)\lib\xbuild-frameworks\MonoAndroid`: Xamarin.Android
+* `bin\$(Configuration)\lib\xamarin.android\xbuild-frameworks\MonoAndroid`: Xamarin.Android
     profiles.
-* `bin\$(Configuration)\lib\xbuild-frameworks\MonoAndroid\v1.0`: Xamarin.Android
+* `bin\$(Configuration)\lib\xamarin.android\xbuild-frameworks\MonoAndroid\v1.0`: Xamarin.Android
     Base Class Library assemblies such as `mscorlib.dll`.
-* `bin\$(Configuration)\lib\xbuild-frameworks\MonoAndroid\*`: Contains
+* `bin\$(Configuration)\lib\xamarin.android\xbuild-frameworks\MonoAndroid\*`: Contains
     `Mono.Android.dll` for a given Xamarin.Android `$(TargetFrameworkVersion)`.
 
 # Xamarin.Android `$(TargetFrameworkVersion)`s
@@ -354,7 +354,7 @@ For example, to generate `Mono.Android.dll` for API-19 (Android 4.4):
 
     cd src/Mono.Android
     xbuild /p:AndroidApiLevel=19 /p:AndroidFrameworkVersion=v4.4
-    # creates bin\Debug\lib\xbuild-frameworks\MonoAndroid\v4.4\Mono.Android.dll
+    # creates bin\Debug\lib\xamarin.android\xbuild-frameworks\MonoAndroid\v4.4\Mono.Android.dll
 
 <a name="Samples" />
 

build-tools/api-xml-adjuster/Makefile

@@ -6,7 +6,7 @@ ANDROID_SDK_PATH=$(shell find ~/ -maxdepth 1 -name android-sdk-*)
 
 DOCS_DIR=~/android-toolchain/docs
 
-MANDROID = ../../bin/$(CONFIGURATION)/lib/mandroid
+MANDROID = ../../bin/$(CONFIGURATION)/lib/xamarin.anroid/xbuild/Xamarin/Android
 BUILDBIN = ../../bin/Build$(CONFIGURATION)
 
 CLASS_PARSE = $(MANDROID)/class-parse.exe
@@ -62,7 +62,7 @@ $(ANALYZED_XML): $(API_XML_TOOL) $(CLASS_PARSE_XML)
 	$(RUN_API_XML_TOOL) $(CLASS_PARSE_XML) $(ANALYZED_XML) || rm -f $(ANALYZED_XML)
 
 $(CLASS_PARSE):
-	cd $(JAVA_INTEROP_PATH)/tools/class-parse && $(XBUILD) /p:OutputPath=$(TOP)/out/lib/mandroid
+	cd $(JAVA_INTEROP_PATH)/tools/class-parse && $(XBUILD) /p:OutputPath=$(TOP)/out/lib/xamarin.android/xbuild/Xamarin.Android/
 
 $(API_XML_TOOL):
 	$(XBUILD)

build-tools/bundle/bundle-path.targets

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <UsingTask AssemblyFile="..\..\bin\Build$(Configuration)\xa-prep-tasks.dll"  TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitHash" />
+  <UsingTask AssemblyFile="..\..\bin\Build$(Configuration)\xa-prep-tasks.dll"  TaskName="Xamarin.Android.BuildTools.PrepTasks.HashFileContents" />
   <Target Name="_GetHashes">
     <GitCommitHash
         WorkingDirectory="$(LibZipSourceFullPath)"
@@ -20,11 +21,19 @@
         ToolExe="$(GitToolExe)">
       <Output TaskParameter="AbbreviatedCommitHash"   PropertyName="_MonoHash" />
     </GitCommitHash>
+    <!-- Files which contribute to the bundle "version" -->
+    <ItemGroup>
+      <VersionFile Include="..\mono-runtimes\mono-runtimes.*" />
+    </ItemGroup>
+    <HashFileContents
+        Files="@(VersionFile)">
+      <Output TaskParameter="AbbreviatedCompleteHash" PropertyName="_VersionHash"/>
+    </HashFileContents>
   </Target>
   <Target Name="GetBundleFileName"
       DependsOnTargets="_GetHashes">
     <PropertyGroup>
-      <XABundleFileName>bundle-v18-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</XABundleFileName>
+      <XABundleFileName>bundle-v19-h$(_VersionHash)-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</XABundleFileName>
     </PropertyGroup>
   </Target>
 </Project>

build-tools/bundle/bundle.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="$(_SourceTopDir)\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.Zip" />
-  <Import Project="..\mono-runtimes\mono-runtimes.props" />
-  <Import Project="..\mono-runtimes\mono-runtimes.projitems" />
   <Import Project="..\mono-runtimes\mono-runtimes.targets" />
   <Import Project="..\libzip\libzip.props" />
   <Import Project="..\libzip-windows\libzip-windows.props" />

build-tools/libzip-windows/libzip-windows.mdproj

@@ -9,10 +9,10 @@
   </PropertyGroup>
   <Import Project="..\..\Configuration.props" />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\bin\$(Configuration)</OutputPath>
+    <OutputPath>$(XAInstallPrefix)xbuild\Xamarin\Android\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\bin\$(Configuration)</OutputPath>
+    <OutputPath>$(XAInstallPrefix)xbuild\Xamarin\Android\</OutputPath>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.Common.targets" />
   <PropertyGroup>
@@ -24,6 +24,7 @@
   <Import Project="libzip-windows.props" />
   <Import Project="libzip-windows.projitems" />
   <Import Project="libzip-windows.targets" />
+  <Import Project="..\libzip\libzip.targets" />
   <ItemGroup>
     <ProjectReference Include="..\android-toolchain\android-toolchain.mdproj">
       <Project>{8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA}</Project>

build-tools/libzip-windows/libzip-windows.targets

@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\libzip\libzip.targets" />
 </Project>