Bump to mono/mono-4.8.0-branch/9e164326, Java.Interop/a1d3ecc8 (#223)

jonpryor · grendello · commit 1d658252cd47 · 2016-09-15T18:13:56.000+02:00
Mono 4.8 has new SGEN bridge performance characteristics and
semantics, requiring that we bump the SGEN Bridge Version to 5.

Additionally, Mono 4.8 is using Cecil/master, which is
API INCOMPATIBLE with Cecil 0.9.6, and Mono sources are included in
`Xamarin.Android.Build.Tasks.dll`.

We could attempt to address the Cecil incompatibility by building
Mono's `external/cecil` projects, but that doesn't work because
Java.Interop assemblies *also* use Cecil, and
`Xamarin.Android.Build.Tasks.dll` uses `Java.Interop.Tools.Cecil.dll`,
which uses Cecil via NuGet package, so everything gets very intermixed
and confusing if Java.Interop tries to use e.g. Cecil 0.9.6 via nuget
while xamarin-android attempts to use Cecil via Mono's source.

Skip that problem, and bump to Java.Interop/a1d3ecc8, which in turn
uses the Cecil 0.10.0-beta1-v2 *Preview* NuGet package, which is
API compoatible with Cecil/master and mono/master.

Additionally, update xamarin-android's Cecil 0.9.6 use to likewise use
Cecil 0.10.0-beta1-v2.

This allows xamarin-android to build while using Mono 4.8 sources.

Finally, there's lots of "unrelated noise" in this patch, largely
because every time I add a project to the solution via Xamarin Studio,
Xamarin Studio decides to modify EVERY PROJECT IN THE REPO. Preserve
some of these changes -- and "fix" others -- so that I can reduce the
"visual noise" of future Xamarin Studio changes.
diff --git a/.gitmodules b/.gitmodules
@@ -5,7 +5,7 @@
 [submodule "external/mono"]
 	path = external/mono
 	url = https://github.com/mono/mono.git
-	branch = mono-4.6.0-branch
+	branch = mono-4.8.0-branch
 [submodule "external/mxe"]
 	path = external/mxe
 	url = https://github.com/xamarin/mxe.git
diff --git a/Configuration.props b/Configuration.props
@@ -25,7 +25,8 @@
     <NeedMxe Condition=" '$(HostOS)' == 'Darwin' ">true</NeedMxe>
     <MakeConcurrency Condition=" '$(MakeConcurrency)' == '' And '$(HostCpuCount)' != '' ">-j$(HostCpuCount)</MakeConcurrency>
     <ManagedRuntime Condition=" '$(ManagedRuntime)' == '' And '$(OS)' != 'Windows_NT' ">mono</ManagedRuntime>
-    <MonoSgenBridgeVersion Condition=" '$(MonoSgenBridgeVersion)' == '' ">4</MonoSgenBridgeVersion>
+    <ManagedRuntimeArgs Condition=" '$(ManagedRuntimeArgs)' == '' And '$(ManagedRuntime)' == 'mono' ">--debug=casts</ManagedRuntimeArgs>
+    <MonoSgenBridgeVersion Condition=" '$(MonoSgenBridgeVersion)' == '' ">5</MonoSgenBridgeVersion>
     <TargetFrameworkRootPath>$(MSBuildThisFileDirectory)bin\$(Configuration)\lib\xbuild-frameworks</TargetFrameworkRootPath>
     <HOME Condition=" '$(HOME)' == '' ">$(HOMEDRIVE)$(HOMEPATH)</HOME>
     <AndroidApiLevel Condition=" '$(AndroidApiLevel)' == '' ">24</AndroidApiLevel>
diff --git a/README.md b/README.md
@@ -97,8 +97,8 @@ Overridable MSBuild properties include:
 * `$(MonoSgenBridgeVersion)`: The Mono SGEN Bridge version to support.
     Valid values include:
 
-    * `4`: Mono 4.6 support. This is the default.
-    * `5`: Mono 4.8 support.
+    * `4`: Mono 4.6 support.
+    * `5`: Mono 4.8 support. This is the default.
 
 # Build Requirements
 
diff --git a/build-tools/libzip/libzip.mdproj b/build-tools/libzip/libzip.mdproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.Common.targets" />
   <PropertyGroup>
-    <BuildDependsOn/>
+    <BuildDependsOn />
     <BuildDependsOn Condition="'$(HostOS)' == 'Windows' OR '$(HostOS)' == 'Darwin'">
       ResolveReferences;
       _BuildUnlessCached
diff --git a/build-tools/unix-distribution-setup/unix-distribution-setup.mdproj b/build-tools/unix-distribution-setup/unix-distribution-setup.mdproj
@@ -6,24 +6,14 @@
     <ItemType>GenericProject</ItemType>
     <ProjectGuid>{2CF172E5-BDAE-4ABA-8BC8-08040ED3E77A}</ProjectGuid>
   </PropertyGroup>
+  <Import Project="..\..\Configuration.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <OutputPath>..\..\bin\Debug\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <OutputPath>..\..\bin\Release\</OutputPath>
   </PropertyGroup>
 
-  <Import Project="..\..\Configuration.props" />
-
-  <Target Name="Build">
-    <Copy SourceFiles="..\..\tools\scripts\generator" DestinationFiles="$(OutputPath)bin\generator" />
-    <Exec
-	Condition=" '$(HostOS)' != 'Windows' "
-	Command="chmod +x $(OutputPath)bin\generator" />
-  </Target>
-
-  <Target Name="Clean">
-    <Delete Files="$(OutputPath)bin\generator" />
-  </Target>
+  <Import Project="unix-distribution-setup.targets" />
 </Project>
 
diff --git a/build-tools/unix-distribution-setup/unix-distribution-setup.targets b/build-tools/unix-distribution-setup/unix-distribution-setup.targets
@@ -0,0 +1,18 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Target Name="Build">
+    <Copy
+        SourceFiles="..\..\tools\scripts\generator"
+        DestinationFiles="$(OutputPath)bin\generator"
+    />
+    <Exec
+        Condition=" '$(HostOS)' != 'Windows' "
+        Command="chmod +x $(OutputPath)bin\generator"
+    />
+  </Target>
+
+  <Target Name="Clean">
+    <Delete Files="$(OutputPath)bin\generator" />
+  </Target>
+</Project>
+
diff --git a/external/Java.Interop b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 6f7f5203e9ab00b0e4fbcc33fbb9488f61a3a4bb
+Subproject commit a1d3ecc8ba6e67b96ae1c633194b0e78c2ac5c23
diff --git a/external/mono b/external/mono
@@ -1 +1 @@
-Subproject commit b13663f353cfb0d47040f09dab1385a47aea029b
+Subproject commit 9e1643269799485b4c56c159814ddb278e99ca41
diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets
@@ -94,13 +94,13 @@
     <MakeDir Directories="$(IntermediateOutputPath)jcw;$(IntermediateOutputPath)jcw\bin" />
     <PropertyGroup>
       <OutputPathAbs>$(MSBuildProjectDirectory)\$(OutputPath)</OutputPathAbs>
-      <JcwGen>$(JavaInteropFullPath)\bin\$(Configuration)\jcw-gen.exe</JcwGen>
+      <JcwGen>"$(JavaInteropFullPath)\bin\$(Configuration)\jcw-gen.exe" -v10</JcwGen>
       <_LibDirs>-L "$(OutputPathAbs)" -L "$(OutputPathAbs)..\v1.0\" -L "$(OutputPathAbs)..\v1.0\Facades"</_LibDirs>
       <_Assembly>"$(OutputPathAbs)$(AssemblyName).dll"</_Assembly>
       <_Out>-o "$(MSBuildProjectDirectory)\$(IntermediateOutputPath)jcw\src"</_Out>
     </PropertyGroup>
     <Exec
-        Command="$(ManagedRuntime) $(JcwGen) $(_Out) $(_LibDirs) $(_Assembly)"
+        Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(JcwGen) $(_Out) $(_LibDirs) $(_Assembly)"
     />
     <ItemGroup>
       <_JavaSources Include="$(IntermediateOutputPath)jcw\src\**\*.java" />
diff --git a/src/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj b/src/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
@@ -13,6 +13,8 @@
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AssemblyName>Mono.Data.Sqlite</AssemblyName>
     <SignAssembly>true</SignAssembly>
+    <AndroidApplication>false</AndroidApplication>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
   </PropertyGroup>
   <Import Project="..\..\Configuration.props" />
   <PropertyGroup>
@@ -27,6 +29,7 @@
     <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;SQLITE_STANDARD;MONODROID</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
     <ConsolePause>false</ConsolePause>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/Mono.Posix/Mono.Posix.csproj b/src/Mono.Posix/Mono.Posix.csproj
@@ -13,6 +13,8 @@
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AssemblyName>Mono.Posix</AssemblyName>
     <SignAssembly>true</SignAssembly>
+    <AndroidApplication>false</AndroidApplication>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
   </PropertyGroup>
   <Import Project="..\..\Configuration.props" />
   <PropertyGroup>
@@ -26,6 +28,7 @@
     <OutputPath>..\..\bin\$(Configuration)\lib\xbuild-frameworks\MonoAndroid\v1.0</OutputPath>
     <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;MONODROID</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
+    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
     <ConsolePause>false</ConsolePause>
diff --git a/src/OpenTK-1.0/OpenTK.csproj b/src/OpenTK-1.0/OpenTK.csproj
@@ -19,6 +19,8 @@
     <NoWarn>3001,3002,3003,3005,3006,3021,3014,0618,1591,0414,0169,0419,1635</NoWarn>
     <NoStdLib>true</NoStdLib>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AndroidApplication>false</AndroidApplication>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
   </PropertyGroup>
   <Import Project="..\..\Configuration.props" />
   <PropertyGroup>
@@ -67,7 +69,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-        <Compile Include="GlobalAssemblyInfo.cs"/>
+        <Compile Include="GlobalAssemblyInfo.cs" />
         <Compile Include="$(OpenTKSourceDirectory)\Source\OpenTK\Audio\AudioCapture.cs">
             <Link>Audio\AudioCapture.cs</Link>
         </Compile>
diff --git a/src/System.Drawing.Primitives/System.Drawing.Primitives.csproj b/src/System.Drawing.Primitives/System.Drawing.Primitives.csproj
@@ -9,6 +9,10 @@
     <RootNamespace>System.Drawing</RootNamespace>
     <AssemblyName>System.Drawing.Primitives</AssemblyName>
     <NoStdLib>true</NoStdLib>
+    <AndroidApplication>false</AndroidApplication>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
   </PropertyGroup>
   <Import Project="..\..\Configuration.props" />
   <PropertyGroup>
diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/Extensions.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/Extensions.cs
@@ -60,7 +60,8 @@ public static bool Implements (TypeDefinition type, string interfaceName, bool g
 			while (type != null) {
 				// does the type implements it itself
 				if (type.HasInterfaces) {
-					foreach (TypeReference iface in type.Interfaces) {
+					foreach (var ifaceInfo in type.Interfaces) {
+						var iface       = ifaceInfo.InterfaceType;
 						string fullname = (generic) ? iface.GetElementType ().FullName : iface.FullName;
 						if (fullname == interfaceName)
 							return true;
diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FixAbstractMethodsStep.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FixAbstractMethodsStep.cs
@@ -137,7 +137,8 @@ bool FixAbstractMethods (TypeDefinition type)
 			foreach (var baseType in type.GetBaseTypes ())
 				typeMethods.AddRange (baseType.Methods);
 
-			foreach (var iface in type.Interfaces) {
+			foreach (var ifaceInfo in type.Interfaces) {
+				var iface    = ifaceInfo.InterfaceType;
 				var ifaceDef = iface.Resolve ();
 				if (ifaceDef == null) {
 					if (Context.LogInternalExceptions)
diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/PreserveLinqExpressions.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/PreserveLinqExpressions.cs
@@ -45,8 +45,8 @@ bool IsLinqProvider (TypeDefinition type)
 				return false; // we are not looking for default system types.
 			if (!type.HasInterfaces)
 				return false;
-			return type.Interfaces.Any (i => i.FullName == "System.Linq.IQueryProvider")
-					|| type.Interfaces.Select (t => t.Resolve ()).Any (t => t != null && IsLinqProvider (t));
+			return type.Interfaces.Any (i => i.InterfaceType.FullName == "System.Linq.IQueryProvider")
+					|| type.Interfaces.Select (t => t.InterfaceType.Resolve ()).Any (t => t != null && IsLinqProvider (t));
 		}
 	}
 }
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
diff --git a/src/Xamarin.Android.Build.Tasks/packages.config b/src/Xamarin.Android.Build.Tasks/packages.config
diff --git a/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj b/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj
diff --git a/src/Xamarin.Android.Tools.Aidl/Xamarin.Android.Tools.Aidl.csproj b/src/Xamarin.Android.Tools.Aidl/Xamarin.Android.Tools.Aidl.csproj
diff --git a/src/Xamarin.Android.Tools.Aidl/packages.config b/src/Xamarin.Android.Tools.Aidl/packages.config
