Skip to content

Commit

Permalink
[Xamarin.Android.Build.Tasks] Rework target order so _ValidateAndroid…
Browse files Browse the repository at this point in the history
…PackageProperties is called early. (#323)

Context https://bugzilla.xamarin.com/show_bug.cgi?id=46931

Rather than have a bunch of DependsOn calls to _ValidateAndroidPackageProperties we
just need to rework the order so that this target is called early as part of the
Build target.

Once we do this we can revert the commit 5fc80f27 which broke the build.
  • Loading branch information
dellis1972 authored and grendello committed Dec 1, 2016
1 parent 0c35978 commit 8337d21
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
Expand Up @@ -440,6 +440,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
_CheckForContent;
_CheckTargetFramework;
_RemoveLegacyDesigner;
_ValidateAndroidPackageProperties;
$(BuildDependsOn);
_CompileDex;
</BuildDependsOn>
Expand All @@ -456,6 +457,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
_CheckForContent;
_CheckTargetFramework;
_RemoveLegacyDesigner;
_ValidateAndroidPackageProperties;
$(BuildDependsOn);
</BuildDependsOn>
</PropertyGroup>
Expand Down Expand Up @@ -510,7 +512,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
</ItemGroup>
</Target>

<Target Name="_ValidateAndroidPackageProperties" DependsOnTargets="$(_OnResolveMonoAndroidSdks)">
<Target Name="_ValidateAndroidPackageProperties">
<CreateProperty Value="$(ProjectDir)$(AndroidManifest)" Condition="'$(AndroidManifest)' != ''">
<Output TaskParameter="Value" PropertyName="_AndroidManifestAbs"/>
</CreateProperty>
Expand Down Expand Up @@ -1171,8 +1173,7 @@ because xbuild doesn't support framework reference assemblies.

<PropertyGroup>
<_GenerateJavaDesignerForComponentDependsOnTargets>
_ValidateAndroidPackageProperties
;_GetAdditionalResourcesFromAssemblies
_GetAdditionalResourcesFromAssemblies
;_CreateAdditionalResourceCache
;_CollectAdditionalResourceFiles
</_GenerateJavaDesignerForComponentDependsOnTargets>
Expand Down Expand Up @@ -1227,7 +1228,6 @@ because xbuild doesn't support framework reference assemblies.
<PropertyGroup>
<_UpdateAndroidResgenDependsOnTargets>
_CheckForDeletedResourceFile;
_ValidateAndroidPackageProperties;
$(_OnResolveMonoAndroidSdks);
_GetLibraryImports;
_CheckDuplicateJavaLibraries;
Expand Down Expand Up @@ -1395,7 +1395,7 @@ because xbuild doesn't support framework reference assemblies.

<!-- Package Build -->
<Target Name="PackageForAndroid"
DependsOnTargets="SetWearAppTargetToPackageForAndroid;Build;_ValidateAndroidPackageProperties;_CopyPackage" />
DependsOnTargets="SetWearAppTargetToPackageForAndroid;Build;_CopyPackage" />

<Target Name="_ResolveAssemblies">
<!--- Remove the ImplicitlyExpandDesignTimeFacades assemblies. We have already build the app there are not required for packaging -->
Expand Down Expand Up @@ -1729,7 +1729,6 @@ because xbuild doesn't support framework reference assemblies.
<PropertyGroup>
<_CreateBaseApkDependsOnTargets>
_GetAddOnPlatformLibraries;
_ValidateAndroidPackageProperties;
_GetLibraryImports;
_CheckDuplicateJavaLibraries;
_GetAdditionalResourcesFromAssemblies;
Expand Down Expand Up @@ -2458,13 +2457,12 @@ because xbuild doesn't support framework reference assemblies.
<_BuildApkDependsOnTargets>
Build
;$(_OnResolveMonoAndroidSdks)
;_ValidateAndroidPackageProperties
;_BuildApkEmbed
</_BuildApkDependsOnTargets>
</PropertyGroup>

<Target Name="BuildApk" DependsOnTargets="$(_BuildApkDependsOnTargets)" />
<Target Name="Package" DependsOnTargets="Build;_ValidateAndroidPackageProperties;_CopyPackage" />
<Target Name="Package" DependsOnTargets="Build;_CopyPackage" />
<Target Name="Sign" DependsOnTargets="Build;_ResolveAndroidSigningKey;_Sign" />

<!-- Cleaning -->
Expand Down

0 comments on commit 8337d21

Please sign in to comment.