From b40b0225075042f6fd6f07a71459f1c9e37a8156 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Thu, 9 Jun 2016 08:33:01 -0400
Subject: [PATCH] [build] Don't set
 `$(ImplicitlyExpandDesignTimeFacades)`=False

Way back in the dawn of two months ago and creating
`Mono.Android.csproj` by squinting *just right* and using the original
Makefiles as a guide (xbuild? what's that?), I saw that the "system"
`System.Runtime.dll` was being pulled in and I said: "wait...what?"

I mean, I asked "why is this using the *system* `System.Runtime.dll`
and not using the one that we just build and installed into
`bin/$(Configuration)/lib/xbuild-frameworks/MonoAndroid/v1.0/Facades`?"

On the assumption that *of course* I want to be using the
`System.Runtime.dll` that was previously built, I set
`$(ImplicitlyExpandDesignTimeFacades)` to False so that I could
explicitly list the one we just built instead of the system one.

This *works*...

However, copying that idiom elsewhere results in "bizarre" errors such
as that mentioned in commit 9a50c668:

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

Setting `$(ImplicitlyExpandDesignTimeFacades)` to False isn't
required, and it's presence leads to mistakenly reusing the idiom
elsewhere. Remove it.
---
 src/Mono.Android.Export/Mono.Android.Export.csproj         | 7 -------
 src/Mono.Android/Mono.Android.csproj                       | 7 -------
 .../Xamarin.Android.NUnitLite.csproj                       | 7 -------
 3 files changed, 21 deletions(-)

diff --git a/src/Mono.Android.Export/Mono.Android.Export.csproj b/src/Mono.Android.Export/Mono.Android.Export.csproj
index 0763a3e0c74..c02368d4c27 100644
--- a/src/Mono.Android.Export/Mono.Android.Export.csproj
+++ b/src/Mono.Android.Export/Mono.Android.Export.csproj
@@ -52,10 +52,6 @@
       <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>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -110,9 +106,6 @@
     <Compile Include="Mono.CodeGeneration\Exp.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <ImplicitlyExpandDesignTimeFacades>False</ImplicitlyExpandDesignTimeFacades>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Mono.Android\Mono.Android.csproj">
       <Project>{66CF299A-CE95-4131-BCD8-DB66E30C4BF7}</Project>
diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj
index c08d17293eb..450fd1befbc 100644
--- a/src/Mono.Android/Mono.Android.csproj
+++ b/src/Mono.Android/Mono.Android.csproj
@@ -63,10 +63,6 @@
       <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>
   <ItemGroup>
     <Compile Include="Android\IncludeAndroidResourcesFromAttribute.cs" />
@@ -302,9 +298,6 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="Mono.Android.targets" />
   <Import Project="$(IntermediateOutputPath)android-$(AndroidApiLevel)\Mono.Android.projitems" Condition="Exists('$(IntermediateOutputPath)android-$(AndroidApiLevel)\Mono.Android.projitems')" />
-  <PropertyGroup>
-    <ImplicitlyExpandDesignTimeFacades>False</ImplicitlyExpandDesignTimeFacades>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\build-tools\api-merge\api-merge.csproj">
       <Project>{3FC3E78B-F7D4-42EA-BBE8-4535DF42BFF8}</Project>
diff --git a/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj b/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj
index c2edaf0904a..6159a5a8261 100644
--- a/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj
+++ b/src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.csproj
@@ -58,10 +58,6 @@
       <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>
   <ItemGroup>
     <Compile Include="Resources\Resource.designer.cs" />
@@ -348,9 +344,6 @@
     <AndroidResource Include="Resources\layout\test_suite.axml" />
   </ItemGroup>
   <Import Project="$(OutputPath)\..\..\..\xbuild\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <PropertyGroup>
-    <ImplicitlyExpandDesignTimeFacades>False</ImplicitlyExpandDesignTimeFacades>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Mono.Android\Mono.Android.csproj">
       <Project>{66CF299A-CE95-4131-BCD8-DB66E30C4BF7}</Project>