-
-
Save jonpryor/a5767e5c1d6b4c456a95 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Xamarin.Android.Common.targets b/Xamarin.Android.Common.targets | |
index f78647d..2b3ea1c 100644 | |
--- a/Xamarin.Android.Common.targets | |
+++ b/Xamarin.Android.Common.targets | |
@@ -780,7 +780,7 @@ because xbuild doesn't support framework reference assemblies. | |
</Target> | |
<Target Name="_CopyIntermediateAssemblies" | |
- DependsOnTargets="_ResolveAssemblies;_CreatePackageWorkspace"> | |
+ DependsOnTargets="_ResolveAssemblies;_ResolveSatellitePaths;_CreatePackageWorkspace"> | |
<!-- Create our intermediate directory --> | |
<MakeDir Directories="$(MonoAndroidIntermediateAssemblyDir)" Condition="!Exists ('$(MonoAndroidIntermediateAssemblyDir)')" /> | |
@@ -790,6 +790,11 @@ because xbuild doesn't support framework reference assemblies. | |
SourceFiles="@(ResolvedAssemblies)" | |
DestinationFiles="@(ResolvedAssemblies->'$(MonoAndroidIntermediateAssemblyDir)%(TargetPath)%(Filename)%(Extension)')" | |
SkipUnchangedFiles="true" /> | |
+ <Copy | |
+ SourceFiles="@(_AndroidResolvedSatellitePaths)" | |
+ DestinationFiles="@(_AndroidResolvedSatellitePaths->'$(MonoAndroidIntermediateAssemblyDir)%(TargetPath)%(DestinationSubDirectory)%(Filename)%(Extension)')" | |
+ SkipUnchangedFiles="true" | |
+ /> | |
<!-- as well as *.config files --> | |
<CopyConfigFiles | |
SourceFiles="@(ResolvedAssemblies)" | |
@@ -1051,11 +1056,11 @@ because xbuild doesn't support framework reference assemblies. | |
</Target> | |
<Target Name="_ResolveSatellitePaths" | |
- DependsOnTargets="_PrepareAssemblies" | |
+ DependsOnTargets="_ResolveAssemblies" | |
> | |
<ResolveAssemblyReference | |
AllowedAssemblyExtensions="$(AllowedReferenceAssemblyFileExtensions)" | |
- AssemblyFiles="@(_ResolvedUserAssemblies)" | |
+ AssemblyFiles="@(ResolvedUserAssemblies)" | |
FindDependencies="True" | |
FindRelatedFiles="False" | |
FindSatellites="True" | |
@@ -1325,7 +1330,7 @@ because xbuild doesn't support framework reference assemblies. | |
<!-- Install targets --> | |
<Target Name="_Upload" | |
- DependsOnTargets="_ResolveSatellitePaths" | |
+ DependsOnTargets="_PrepareAssemblies" | |
Condition="'$(AndroidApplication)'!='' And $(AndroidApplication)" | |
> | |
<InstallPackageAssemblies |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment