From c6d212fbd8383c1282f9c08285c5e9648062934e Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Wed, 8 Jun 2016 21:42:54 -0400
Subject: [PATCH] [Mono.Posix] Mono.Posix.csproj fixes.

Building xamarin-android/master with Mono 4.4.0 [0] would result in a
build error within `src/Mono.Posix`:

	CSC: error CS1703: An assembly `System.Runtime' with the same identity
	has already been imported. Consider removing one of the references.

This was introduced by commit f2fed376, which added `System.Runtime`
as a `@(Reference)` to `Mono.Posix.csproj`.

`Mono.Posix.csproj` `<Import/>`s `Xamarin.Android.CSharp.targets`,
which indirectly adds `System.Runtime`, so there is no need for
`Mono.Posix.csproj` to directly refernce `System.Runtime`.

Additionally, `msbuild` is more stringent regarding property functions
and quoting: this resulted in an MSBuild error:

	Condition="$(AndroidSupportedAbisForConditionalChecks.Contains (:x86:'))">

The fix is to properly quote the `.Contains()` method parameters.

Finally, re-order various elements to increase consistency with other
projects, e.g. `@(Reference)` should go with other `@(Reference)`
entries, `Configuration.props` should be imported as early as
possible, `$(TargetFrameworkVersion)` should be set to
`$(AndroidFrameworkVersion)` (which requires the earlirer
`Configuration.props` import), etc.

[0]: mono-4.4.0-branch-c7-baseline/5995f74
---
 src/Mono.Posix/Mono.Posix.csproj | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Mono.Posix/Mono.Posix.csproj b/src/Mono.Posix/Mono.Posix.csproj
index bc2f49f77dd..8120cc27e1d 100644
--- a/src/Mono.Posix/Mono.Posix.csproj
+++ b/src/Mono.Posix/Mono.Posix.csproj
@@ -12,7 +12,12 @@
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AssemblyName>Mono.Posix</AssemblyName>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <Import Project="..\..\Configuration.props" />
+  <PropertyGroup>
+    <TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -53,8 +58,11 @@
       <HintPath>$(OutputPath)..\v1.0\System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Java.Interop">
+      <HintPath>$(OutputPath)..\v1.0\Java.Interop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
-  <Import Project="..\..\Configuration.props" />
   <ItemGroup>
     <Compile Include="$(XamarinAndroidSourcePath)\src\Mono.Posix\Mono.Unix.Native\NativeConvert.Android.cs" />
     <Compile Include="$(XamarinAndroidSourcePath)\src\Mono.Posix\Mono.Unix.Android\AndroidUtils.cs" />
@@ -237,14 +245,6 @@
       <Name>Mono.Android</Name>
       <Private>False</Private>
     </ProjectReference>
-    <Reference Include="Java.Interop">
-      <HintPath>$(OutputPath)..\v1.0\Java.Interop.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Runtime">
-      <HintPath>$(OutputPath)..\v1.0\Facades\System.Runtime.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <PropertyGroup>
     <XANativeLibsDir>$(OutputPath)\..\..\..\xbuild\Xamarin\Android\lib</XANativeLibsDir>
@@ -259,7 +259,7 @@
     <EmbeddedNativeLibrary Include="$(XANativeLibsDir)\armeabi-v7a\libMonoPosixHelper.so" Condition="$(AndroidSupportedAbisForConditionalChecks.Contains (':armeabi-v7a:'))">
       <Link>MonoPosixHelper\armeabi-v7a\libMonoPosixHelper.so</Link>
     </EmbeddedNativeLibrary>
-    <EmbeddedNativeLibrary Include="$(XANativeLibsDir)\x86\libMonoPosixHelper.so" Condition="$(AndroidSupportedAbisForConditionalChecks.Contains (:x86:'))">
+    <EmbeddedNativeLibrary Include="$(XANativeLibsDir)\x86\libMonoPosixHelper.so" Condition="$(AndroidSupportedAbisForConditionalChecks.Contains (':x86:'))">
       <Link>MonoPosixHelper\x86\libMonoPosixHelper.so</Link>
     </EmbeddedNativeLibrary>
     <EmbeddedNativeLibrary Include="$(XANativeLibsDir)\x86_64\libMonoPosixHelper.so" Condition="$(AndroidSupportedAbisForConditionalChecks.Contains (':x86_64:'))">