File tree Expand file tree Collapse file tree 2 files changed +11
-0
lines changed
src/Xamarin.Android.Build.Tasks
Microsoft.Android.Sdk/targets Expand file tree Collapse file tree 2 files changed +11
-0
lines changed Original file line number Diff line number Diff line change @@ -77,6 +77,12 @@ They run in a context of an inner build with a single $(RuntimeIdentifier).
7777 <ItemGroup >
7878 <AndroidAotProfile Include =" $(MSBuildThisFileDirectory)dotnet.aotprofile" Condition =" '$(AndroidEnableProfiledAot)' == 'true' and '$(AndroidUseDefaultAotProfile)' != 'false' " />
7979 </ItemGroup >
80+
81+ <!-- Recreate the library directories items, sent to us via a property from the outer build -->
82+ <ItemGroup Condition =" '$(_RuntimePackLibraryDirectoriesList)' != '' " >
83+ <_RuntimePackLibraryDirectory Include =" $(_RuntimePackLibraryDirectoriesList)" />
84+ </ItemGroup >
85+
8086 <GetAotAssemblies
8187 AndroidAotMode =" $(AndroidAotMode)"
8288 AndroidNdkDirectory =" $(AndroidNdkDirectory)"
Original file line number Diff line number Diff line change @@ -1742,8 +1742,13 @@ because xbuild doesn't support framework reference assemblies.
17421742<Target Name =" _RunAotForAllRIDs"
17431743 Condition =" '$(_AndroidUseMarshalMethods)' == 'True' "
17441744 Returns =" @(ResolvedFileToPublish)" >
1745+ <PropertyGroup >
1746+ <_RuntimePackLibraryDirectoriesList >@(_RuntimePackLibraryDirectory)</_RuntimePackLibraryDirectoriesList >
1747+ </PropertyGroup >
1748+
17451749 <MSBuild
17461750 Projects =" @(_ProjectToBuild)"
1751+ Properties =" _RuntimePackLibraryDirectoriesList=$(_RuntimePackLibraryDirectoriesList)"
17471752 BuildInParallel =" $(_AndroidBuildRuntimeIdentifiersInParallel)"
17481753 Targets =" _AndroidAotAndComputeFilesToPublishForRuntimeIdentifiers" >
17491754 <Output TaskParameter =" TargetOutputs" ItemName =" ResolvedFileToPublish" />
You can’t perform that action at this time.
0 commit comments