Clean up

dotnet · Jan 9, 2025 · 98f8a81 · 98f8a81
1 parent 29dfbfe
commit 98f8a81
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/...rin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets b/...rin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets
@@ -79,16 +79,23 @@ Copyright (C) 2016 Xamarin. All rights reserved.
   </MSBuild>
 </Target>
 
+<Target Name="_CalculateDesignTimeAars" Condition=" '$(DesignTimeBuild)' == 'True' ">
+  <ItemGroup>
+    <!-- Only use the aar files if we have not extracted the data -->
+    <_DesignTimeAarFiles Include="@(AndroidAarLibrary)" Condition=" '@(LibraryResourceDirectories->Count())' == '0' " />
+  </ItemGroup>
+</Target>
+
 <Target Name="_GenerateRtxt"
     Condition="'$(AndroidUseDesignerAssembly)' == 'True' And '$(DesignTimeBuild)' == 'True' "
-    DependsOnTargets="_CreatePropertiesCache;_ResolveSdks;_ResolveAndroidTooling;_GetJavaPlatformJar;_GenerateAndroidResourceDir;_SetupDesignerProperties;_CollectProjectReferenceResources"
+    DependsOnTargets="_CreatePropertiesCache;_ResolveSdks;_ResolveAndroidTooling;_GetJavaPlatformJar;_GenerateAndroidResourceDir;_SetupDesignerProperties;_CollectProjectReferenceResources;_CalculateDesignTimeAars"
     Inputs="$(_AndroidResFlagFile);@(_AndroidResourceDest);@(LibraryResourceDirectories->'%(StampFile)')"
     Outputs="$(_DesignerIntermediateOutputPath)R.txt"
   >
   <!-- Generate an R.txt file using the Managed Parser -->
   <GenerateRtxt
       AdditionalResourceDirectories="@(LibraryResourceDirectories)"
-      AarLibraries="@(AndroidAarLibrary)"
+      AarLibraries="@(_DesignTimeAarFiles)"
       CaseMapFile="$(_GenerateResourceCaseMapFile)"
       JavaPlatformJarPath="$(JavaPlatformJarPath)"
       ResourceDirectory="$(MonoAndroidResDirIntermediate)"
@@ -99,18 +106,14 @@ Copyright (C) 2016 Xamarin. All rights reserved.
 </Target>
 
 <Target Name="_GenerateResourceCaseMap"
-    DependsOnTargets="_ComputeAndroidResourcePaths;_SetupDesignerProperties;_GetLibraryImports;_CollectProjectReferenceResources"
+    DependsOnTargets="_ComputeAndroidResourcePaths;_SetupDesignerProperties;_GetLibraryImports;_CollectProjectReferenceResources;_CalculateDesignTimeAars"
     Inputs="@(_AndroidResourceDest);@(LibraryResourceDirectories->'%(StampFile)')"
     Outputs="$(_GenerateResourceCaseMapFile)"
   >
-  <ItemGroup>
-    <!-- Only use the aar files if we have not extracted the data -->
-    <_LocalAarFiles Include="@(AndroidAarLibrary)" Condition=" '@(LibraryResourceDirectories->Count())' == '0' " />
-  </ItemGroup>
   <!-- Generate a ResourceMap file for the project and its resources -->
   <GenerateResourceCaseMap
       AdditionalResourceDirectories="@(LibraryResourceDirectories)"
-      AarLibraries="@(_LocalAarFiles)"
+      AarLibraries="@(_DesignTimeAarFiles)"
       OutputFile="$(_GenerateResourceCaseMapFile)"
       ProjectDir="$(ProjectDir)"
       ResourceDirectory="$(MonoAndroidResDirIntermediate)"
@@ -189,6 +192,7 @@ Copyright (C) 2016 Xamarin. All rights reserved.
   <_BuildResourceDesignerDependsOn>
     _SetupDesignerProperties;
     _ResolveAars;
+    _CalculateDesignTimeAars;
     _GenerateResourceCaseMap;
     _GenerateRtxt;
     _GenerateResourceDesignerIntermediateClass;