Simplify: run _LinkAssembliesNoShrink only in the inner build

Remove _LinkAssembliesNoShrink from the outer build entirely:

- Remove from _LinkAssemblies DependsOnTargets (outer build no longer invokes it)
- Add Condition to only run when _ComputeFilesToPublishForRuntimeIdentifiers=true
- Remove _LinkAssembliesNoShrinkInputs target (no longer needed)
- Inline _AllResolvedAssemblies population into _AfterILLinkAdditionalSteps
- Simplify _PrepareAssemblies: non-trimmed builds now use @(ResolvedAssemblies)
  directly (like trimmed builds) instead of mapping through
  MonoAndroidIntermediateAssemblyDir — the inner build already modified
  assemblies in-place before crossgen2

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: simonrozsival

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

@@ -207,20 +207,18 @@ _ResolveAssemblies MSBuild target.
 
   <Target Name="_PrepareAssemblies"
       DependsOnTargets="$(_PrepareAssembliesDependsOnTargets)">
+    <ItemGroup>
+      <_ResolvedAssemblies          Include="@(ResolvedAssemblies)" />
+      <_ResolvedUserAssemblies      Include="@(ResolvedUserAssemblies)" />
+      <_ResolvedFrameworkAssemblies Include="@(ResolvedFrameworkAssemblies)" />
+      <_ResolvedSymbols             Include="@(ResolvedSymbols)" />
+    </ItemGroup>
     <ItemGroup Condition=" '$(PublishTrimmed)' != 'true' ">
-      <_ResolvedAssemblies          Include="@(ResolvedAssemblies->'$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubPath)')"          Condition=" '%(DestinationSubPath)' != '' " />
-      <_ResolvedUserAssemblies      Include="@(ResolvedUserAssemblies->'$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubPath)')"      Condition=" '%(DestinationSubPath)' != '' " />
-      <_ResolvedFrameworkAssemblies Include="@(ResolvedFrameworkAssemblies->'$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubPath)')" Condition=" '%(DestinationSubPath)' != '' " />
-      <_ResolvedSymbols             Include="@(ResolvedSymbols->'$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubPath)')"             Condition=" '%(DestinationSubPath)' != '' " />
       <_ShrunkAssemblies            Include="@(_ResolvedAssemblies)" />
       <_ShrunkUserAssemblies        Include="@(_ResolvedUserAssemblies)" />
       <_ShrunkFrameworkAssemblies   Include="@(_ResolvedFrameworkAssemblies)" />
     </ItemGroup>
     <ItemGroup Condition=" '$(PublishTrimmed)' == 'true' ">
-      <_ResolvedAssemblies          Include="@(ResolvedAssemblies)" />
-      <_ResolvedUserAssemblies      Include="@(ResolvedUserAssemblies)" />
-      <_ResolvedFrameworkAssemblies Include="@(ResolvedFrameworkAssemblies)" />
-      <_ResolvedSymbols             Include="@(ResolvedSymbols)" />
       <_ShrunkFrameworkAssemblies
           Include="@(_ShrunkAssemblies)"
           Condition=" '%(_ShrunkAssemblies.FrameworkAssembly)' == 'true' "

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

@@ -1419,47 +1419,23 @@ because xbuild doesn't support framework reference assemblies.
   <Error Text="%24(AndroidGenerateJniMarshalMethods)=True is not supported at this time." />
 </Target>
 
-<Target Name="_LinkAssembliesNoShrinkInputs">
+<!--
+  Inner build only: runs assembly modifications (FixAbstractMethods, AddKeepAlives, etc.)
+  BEFORE crossgen2 creates R2R images.  ResolvedAssemblies is empty in the inner build
+  because the Android-specific _ResolveAssemblies target only runs in the outer build,
+  so we gather assemblies from ResolvedFileToPublish instead.
+
+  Mark every DLL as HasMonoAndroidReference so FixAbstractMethodsStep inspects them;
+  the step's own MightNeedFix() guard (IsSubclassOf("Java.Lang.Object")) filters out
+  non-binding types.
+-->
+<Target Name="_LinkAssembliesNoShrink"
+    BeforeTargets="CreateReadyToRunImages"
+    Condition=" '$(PublishTrimmed)' != 'true' and '$(_ComputeFilesToPublishForRuntimeIdentifiers)' == 'true' ">
   <ItemGroup>
-    <!-- We need this in its own item group so it isn't lost during a partial build -->
-    <_AllResolvedAssemblies Include="@(ResolvedAssemblies)" />
-  </ItemGroup>
-
-  <!--
-    Inner build (Publish pipeline): ResolvedAssemblies is empty because the Android-specific
-    _ResolveAssemblies target only runs in the outer build.  Use ResolvedFileToPublish instead
-    so LinkAssembliesNoShrink can fix abstract methods etc. BEFORE crossgen2 creates R2R images.
-    Mark every DLL as HasMonoAndroidReference so FixAbstractMethodsStep inspects them; the step's
-    own MightNeedFix() guard (IsSubclassOf("Java.Lang.Object")) filters out non-binding types.
-  -->
-  <ItemGroup Condition=" '$(_ComputeFilesToPublishForRuntimeIdentifiers)' == 'true' ">
     <_ResolvedFileToPublishDlls Include="@(ResolvedFileToPublish)" Condition=" '%(Extension)' == '.dll' ">
       <HasMonoAndroidReference>True</HasMonoAndroidReference>
     </_ResolvedFileToPublishDlls>
-    <_AllResolvedAssemblies Include="@(_ResolvedFileToPublishDlls)" />
-  </ItemGroup>
-</Target>
-
-<Target Name="_LinkAssembliesNoShrink"
-    DependsOnTargets="_LinkAssembliesNoShrinkInputs"
-    BeforeTargets="CreateReadyToRunImages"
-    Condition="'$(PublishTrimmed)' != 'true'"
-    Inputs="@(ResolvedAssemblies);@(_ResolvedFileToPublishDlls);$(_AndroidBuildPropertiesCache)"
-    Outputs="@(ResolvedAssemblies->'$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubPath)')">
-
-  <!--
-    Inner build: SourceFiles = DestinationFiles = @(_ResolvedFileToPublishDlls) for in-place modification.
-    Outer build: SourceFiles = @(ResolvedAssemblies), DestinationFiles = intermediate dir copy.
-  -->
-  <ItemGroup Condition=" '$(_ComputeFilesToPublishForRuntimeIdentifiers)' == 'true' ">
-    <_LinkNoShrinkSource Include="@(_ResolvedFileToPublishDlls)" />
-    <_LinkNoShrinkDestination Include="@(_ResolvedFileToPublishDlls)" />
-    <_LinkNoShrinkUserAssemblies Include="@(_ResolvedFileToPublishDlls)" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(_ComputeFilesToPublishForRuntimeIdentifiers)' != 'true' ">
-    <_LinkNoShrinkSource Include="@(ResolvedAssemblies)" />
-    <_LinkNoShrinkDestination Include="@(ResolvedAssemblies->'$(MonoAndroidIntermediateAssemblyDir)%(DestinationSubPath)')" />
-    <_LinkNoShrinkUserAssemblies Include="@(ResolvedUserAssemblies)" />
   </ItemGroup>
 
   <LinkAssembliesNoShrink
@@ -1469,28 +1445,26 @@ because xbuild doesn't support framework reference assemblies.
       EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
       ErrorOnCustomJavaObject="$(AndroidErrorOnCustomJavaObject)"
       PackageNamingPolicy="$(AndroidPackageNamingPolicy)"
-      ResolvedAssemblies="@(_AllResolvedAssemblies)"
-      ResolvedUserAssemblies="@(_LinkNoShrinkUserAssemblies)"
-      SourceFiles="@(_LinkNoShrinkSource)"
-      DestinationFiles="@(_LinkNoShrinkDestination)"
+      ResolvedAssemblies="@(_ResolvedFileToPublishDlls)"
+      ResolvedUserAssemblies="@(_ResolvedFileToPublishDlls)"
+      SourceFiles="@(_ResolvedFileToPublishDlls)"
+      DestinationFiles="@(_ResolvedFileToPublishDlls)"
       TargetName="$(TargetName)"
       AddKeepAlives="$(AndroidAddKeepAlives)"
       UseDesignerAssembly="$(AndroidUseDesignerAssembly)"
       Deterministic="$(Deterministic)"
       ReadSymbols="$(_AndroidLinkAssembliesReadSymbols)">
   </LinkAssembliesNoShrink>
-
-  <ItemGroup Condition=" '$(_ComputeFilesToPublishForRuntimeIdentifiers)' != 'true' ">
-    <FileWrites Include="$(MonoAndroidIntermediateAssemblyDir)**" />
-  </ItemGroup>
 </Target>
 
 <!-- Runs additional steps after ILLink runs (_LinkAssemblies) -->
 <Target Name="_AfterILLinkAdditionalSteps"
-    DependsOnTargets="_LinkAssembliesNoShrinkInputs"
     Condition="'$(PublishTrimmed)' == 'true'"
     Inputs="$(_AndroidLinkFlag)"
     Outputs="$(_AdditionalPostLinkerStepsFlag)">
+  <ItemGroup>
+    <_AllResolvedAssemblies Include="@(ResolvedAssemblies)" />
+  </ItemGroup>
   <AssemblyModifierPipeline
       ApplicationJavaClass="$(AndroidApplicationJavaClass)"
       CodeGenerationTarget="$(_AndroidJcwCodegenTarget)"
@@ -2912,7 +2886,7 @@ because xbuild doesn't support framework reference assemblies.
   </Target>
 
   <Target Name="_LinkAssemblies"
-      DependsOnTargets="_ResolveAssemblies;_CreatePackageWorkspace;$(_BeforeLinkAssemblies);_GenerateJniMarshalMethods;_LinkAssembliesNoShrink"
+      DependsOnTargets="_ResolveAssemblies;_CreatePackageWorkspace;$(_BeforeLinkAssemblies);_GenerateJniMarshalMethods"
   />
 
 <!-- TypeMap imports must be last so their target overrides (e.g. _RemoveRegisterAttribute) take precedence -->