Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit 4dc50ab

Browse files
committed
Reorder .targets
Moved the XamarinBuildDownload item declaration into the restore target so that it’s evaluated later in the build (so $(AndroidSdkDirectory) will be populated).
1 parent d50661e commit 4dc50ab

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

template.targets

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<XamarinBuildDownload Include="$(_XbdKey_)" Condition="!Exists('$(AndroidSdkDirectory)\extras\android\$(_XbdAarFile_)')">
22-
<Url>$(_XbdUrl_)</Url>
23-
<Kind>Zip</Kind>
24-
<Sha1>$(_XbdSha1_)</Sha1>
25-
<CustomErrorCode>XBD0100</CustomErrorCode>
26-
<CustomErrorMessage>Please make sure 'Android Support Repository' is installed and updated to the latest version in the Android SDK Manager. You can find it in the 'Extras' section of the Android SDK Manager.</CustomErrorMessage>
27-
<ExclusiveLockTimeout>3600</ExclusiveLockTimeout>
28-
</XamarinBuildDownload>
2921
<XamarinBuildRestoreResources Include="_XbdRestoreItems_"/>
3022
</ItemGroup>
3123

@@ -35,6 +27,17 @@
3527
<Output PropertyName="_XbdAarFileFullPath_" TaskParameter="Value" />
3628
</CreateProperty>
3729

30+
<ItemGroup>
31+
<XamarinBuildDownload Include="$(_XbdKey_)" Condition="!Exists('$(AndroidSdkDirectory)\extras\android\$(_XbdAarFile_)')">
32+
<Url>$(_XbdUrl_)</Url>
33+
<Kind>Zip</Kind>
34+
<Sha1>$(_XbdSha1_)</Sha1>
35+
<CustomErrorCode>XBD0100</CustomErrorCode>
36+
<CustomErrorMessage>Please make sure 'Android Support Repository' is installed and updated to the latest version in the Android SDK Manager. You can find it in the 'Extras' section of the Android SDK Manager.</CustomErrorMessage>
37+
<ExclusiveLockTimeout>3600</ExclusiveLockTimeout>
38+
</XamarinBuildDownload>
39+
</ItemGroup>
40+
3841
<ItemGroup>
3942
<XamarinBuildDownloadRestoreAssemblyAar Include="$(_XbdAarFileFullPath_)">
4043
<LogicalName>__AndroidLibraryProjects__.zip</LogicalName>

0 commit comments

Comments
 (0)