Remove ILLink hack

Author: dellis1972

src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets

@@ -101,30 +101,10 @@ Copyright (C) 2016 Xamarin. All rights reserved.
       <IsTrimmable>true</IsTrimmable>
       <RuntimeIdentifier>android</RuntimeIdentifier>
     </ReferencePath>
-    <ResolvedFileToPublish Include="$(_GenerateResourceDesignerAssemblyOutput)">
-      <PostprocessAssembly>True</PostprocessAssembly>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <IsTrimmable>true</IsTrimmable>
-      <!-- <TrimMode>link</TrimMode> -->
-      <RuntimeIdentifier>android</RuntimeIdentifier>
-    </ResolvedFileToPublish>
     <Compile Remove="$(_AndroidResourceDesignerFile)" />
   </ItemGroup>
 </Target>
 
-
-<Target Name="_InjectDesigner" AfterTargets="PrepareForILLink" BeforeTargets="_RunILLink" Condition=" '$(AndroidUseDesignerAssembly)' == 'True' ">
-  <ItemGroup>
-    <ManagedAssemblyToLink Include="$(_GenerateResourceDesignerAssemblyOutput)">
-      <PostprocessAssembly>True</PostprocessAssembly>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <IsTrimmable>true</IsTrimmable>
-      <!-- <TrimMode>link</TrimMode> -->
-      <RuntimeIdentifier>android</RuntimeIdentifier>
-    </ManagedAssemblyToLink>
-  </ItemGroup>
-</Target>
-
 <PropertyGroup>
   <BuildResourceDesignerDependsOn>
     _GenerateResourceCaseMap;

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets

@@ -61,6 +61,12 @@ _ResolveAssemblies MSBuild target.
     <ItemGroup>
       <IntermediateAssembly Remove="@(IntermediateAssembly)" />
       <IntermediateAssembly Include="$(_OuterIntermediateAssembly)" />
+      <ReferenceCopyLocalPaths Include="$(_GenerateResourceDesignerAssemblyOutput)">
+        <PostprocessAssembly>True</PostprocessAssembly>
+        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        <IsTrimmable>true</IsTrimmable>
+        <RuntimeIdentifier>android</RuntimeIdentifier>
+      </ReferenceCopyLocalPaths>
     </ItemGroup>
     <ItemGroup Condition=" '@(_DebugSymbolsIntermediatePath->Count())' != '0' ">
       <_DebugSymbolsIntermediatePath Remove="@(_DebugSymbolsIntermediatePath)" />