Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e293ce9
[build] Move cmdline-tools, platform-tools, build-tools download to M…
jonathanpeppers May 21, 2026
f08bf1e
[build] Move cmake download to MSBuild
jonathanpeppers May 21, 2026
154ffaf
[build] Move emulator, system-image, platforms, m2repo, docs, source …
jonathanpeppers May 21, 2026
47105b4
[xaprepare] Remove dead Android SDK code paths
jonathanpeppers May 21, 2026
bc7ba46
Migrate NDK download/extract from xaprepare to MSBuild
jonathanpeppers May 21, 2026
48d7717
[build] Use system unzip for NDK on Linux/macOS
jonathanpeppers May 21, 2026
4b7c075
[build] Standardize on `tar -xf` for Android SDK extraction
jonathanpeppers May 21, 2026
fe16edb
[build] Replace CopyNdkRedistributables task with <Copy/>
jonathanpeppers May 21, 2026
3c7b31d
[build] Replace GenerateAndroidPackageXml with template
jonathanpeppers May 21, 2026
5a4849d
Remove stray commit-msg.tmp file
jonathanpeppers May 21, 2026
c77523c
[build] Use Path.Combine for tar source path on Unix
jonathanpeppers May 21, 2026
d4fde57
[build] Use system unzip for NDK on Unix
jonathanpeppers May 22, 2026
e7c8446
Remove stray commit-msg.tmp file
jonathanpeppers May 22, 2026
76edd62
Merge remote-tracking branch 'origin/main' into jonathanpeppers/move-…
jonathanpeppers May 26, 2026
5191a34
[build] Fix invalid '--' in XML comment in androidsdk.targets
jonathanpeppers May 26, 2026
06d2ee4
[build] Resolve _SupportLicense lazily inside _CopyExtractedMultiDexJar
jonathanpeppers May 26, 2026
2b5c45c
Remove stray commit-msg.tmp
jonathanpeppers May 26, 2026
0eb7ad4
[build] Use unzip on Linux (GNU tar cannot read .zip archives)
jonathanpeppers May 27, 2026
8e00508
[build] Always use unzip for non-Windows hosts
jonathanpeppers May 27, 2026
3220f27
Remove stray commit-msg.tmp
jonathanpeppers May 27, 2026
82cc9b6
Use UnzipDirectoryChildren on Windows for SDK extraction
jonathanpeppers May 27, 2026
68a2d4e
Quote -p:AndroidSdkPlatforms arg so pwsh keeps it intact
jonathanpeppers May 27, 2026
468bb7b
URL-encode commas in -p:AndroidSdkPlatforms
jonathanpeppers May 28, 2026
6f8bc6f
Pass AndroidSdkPlatforms via env, not -p:
jonathanpeppers May 28, 2026
76301cc
Build BootstrapTasks before androidsdk in test setup
jonathanpeppers May 28, 2026
9d62934
Only emit env: when caller passes one
jonathanpeppers May 28, 2026
a47617e
Address PR review feedback on src/androidsdk/androidsdk.targets
jonathanpeppers Jun 2, 2026
ca49aef
[androidsdk] Replace Unix `find -exec mv` with MSBuild `<Move/>`
jonathanpeppers Jun 2, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Configuration.props
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,16 @@
<XABuildToolsHashMacOS>04E7F3A72044DE4926FA038FA0E251A37BBA1E1C3FB8BEAB6F8401BFD9EB4BF3</XABuildToolsHashMacOS>
<XABuildToolsHashLinux>5D9AC77FB6FF43D9DA518A337B4FCF8F9097113DF531D99CCEFE80EF7CE8250B</XABuildToolsHashLinux>
<XABuildToolsHashWindows>AA1095CB14D83E483818A748A2C06FAAEB8E601561B06A356A119A1B2CA280D3</XABuildToolsHashWindows>
<XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' "></XAPlatformToolsPackagePrefix>
<XAPlatformToolsVersion>36.0.0</XAPlatformToolsVersion>
<XAPlatformToolsHashMacOS>D3E9FA1DF3345CF728586908426615A60863D2632F73F1CE14F0F1349EF000FD</XAPlatformToolsHashMacOS>
<XAPlatformToolsHashLinux>0EAD642C943FFE79701FCCCA8F5F1C69C4CE4F43DF2EEFEE553F6CCB27CBFBE8</XAPlatformToolsHashLinux>
<XAPlatformToolsHashWindows>12C2841F354E92A0EB2FD7BF6F0F9BF8538ABCE7BD6B060AC8349D6F6A61107C</XAPlatformToolsHashWindows>
<XACmdlineToolsHashMacOS>5673201E6F3869F418EEED3B5CB6C4BE7401502BD0AAE1B12A29D164D647A54E</XACmdlineToolsHashMacOS>
<XACmdlineToolsHashLinux>7EC965280A073311C339E571CD5DE778B9975026CFCBE79F2B1CDCB1E15317EE</XACmdlineToolsHashLinux>
<XACmdlineToolsHashWindows>98B565CB657B012DAE6794CEFC0F66AE1EFB4690C699B78A614B4A6A3505B003</XACmdlineToolsHashWindows>
<XACmakeHashMacOS>57024D590691B9D66977D2F66786F10971549441B33B7830D3D2B659F80B93EA</XACmakeHashMacOS>
<XACmakeHashLinux>8CF0DC4F7CE0173D13ED71066FB6861A79C73545DF71D12CA3E933430F268D50</XACmakeHashLinux>
<XACmakeHashWindows>026982DBA2DBD2DE4A530CF1300FFAD05F6BC7D372D9DF83D46112FE017E0C6B</XACmakeHashWindows>
<XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.18.3</XABundleToolVersion>
<XABundleToolHash Condition="'$(XABundleToolHash)' == ''">A099CFA1543F55593BC2ED16A70A7C67FE54B1747BB7301F37FDFD6D91028E29</XABundleToolHash>
<XABinutilsVersion Condition="'$(XABinutilsVersion)' == ''">L_18.1.6-8.0.0-1</XABinutilsVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ namespace Xamarin.Android.Prepare
{
static class KnownProperties
{
public const string AndroidCmakeUrlPrefix = "AndroidCmakeUrlPrefix";
public const string AndroidCmakeVersion = "AndroidCmakeVersion";
public const string AndroidCmakeVersionPath = "AndroidCmakeVersionPath";
public const string AndroidMinimumDotNetApiLevel = "AndroidMinimumDotNetApiLevel";
public const string AndroidDefaultTargetDotnetApiLevel = "AndroidDefaultTargetDotnetApiLevel";
public const string AndroidLatestStableApiLevel = "AndroidLatestStableApiLevel";
Expand Down Expand Up @@ -56,6 +53,5 @@ static class KnownProperties
public const string XAInstallPrefix = "XAInstallPrefix";
public const string XAPackagesDir = "XAPackagesDir";
public const string XAPlatformToolsVersion = "XAPlatformToolsVersion";
public const string XAPlatformToolsPackagePrefix = "XAPlatformToolsPackagePrefix";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ namespace Xamarin.Android.Prepare
{
void InitDefaults ()
{
properties.Add (KnownProperties.AndroidCmakeUrlPrefix, StripQuotes ("@AndroidCmakeUrlPrefix@"));
properties.Add (KnownProperties.AndroidCmakeVersion, StripQuotes ("@AndroidCmakeVersion@"));
properties.Add (KnownProperties.AndroidCmakeVersionPath, StripQuotes (@"@AndroidCmakeVersionPath@"));
properties.Add (KnownProperties.AndroidMinimumDotNetApiLevel, StripQuotes ("@AndroidMinimumDotNetApiLevel@"));
properties.Add (KnownProperties.AndroidDefaultTargetDotnetApiLevel, StripQuotes ("@AndroidDefaultTargetDotnetApiLevel@"));
properties.Add (KnownProperties.AndroidLatestStableApiLevel, StripQuotes ("@AndroidLatestStableApiLevel@"));
Expand Down Expand Up @@ -60,7 +57,6 @@ namespace Xamarin.Android.Prepare
properties.Add (KnownProperties.XAInstallPrefix, StripQuotes (@"@XAInstallPrefix@"));
properties.Add (KnownProperties.XAPackagesDir, StripQuotes (@"@XAPackagesDir@"));
properties.Add (KnownProperties.XAPlatformToolsVersion, StripQuotes ("@XAPlatformToolsVersion@"));
properties.Add (KnownProperties.XAPlatformToolsPackagePrefix, StripQuotes ("@XAPlatformToolsPackagePrefix@"));
}

string StripQuotes (string input)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@ namespace Xamarin.Android.Prepare
partial class AndroidToolchain
{
static readonly string osTag = "linux";
static readonly string altOsTag = osTag;
static readonly string cltOsTag = osTag;
static readonly string pltOsTag = osTag;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,5 @@ namespace Xamarin.Android.Prepare
partial class AndroidToolchain
{
static readonly string osTag = "darwin";
static readonly string altOsTag = "macosx";
static readonly string cltOsTag = "mac";
static readonly string pltOsTag = osTag;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,5 @@ namespace Xamarin.Android.Prepare
partial class AndroidToolchain
{
static readonly string osTag = "windows";
static readonly string altOsTag = osTag;
static readonly string cltOsTag = "win";
static readonly string pltOsTag = cltOsTag;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,8 @@ public AndroidToolchain ()
string AndroidNdkVersion = BuildAndroidPlatforms.AndroidNdkVersion;
string AndroidPkgRevision = BuildAndroidPlatforms.AndroidNdkPkgRevision;
string AndroidNdkDirectory = GetRequiredProperty (KnownProperties.AndroidNdkDirectory);
string AndroidCmakeUrlPrefix = Context.Instance.Properties.GetValue (KnownProperties.AndroidCmakeUrlPrefix) ?? String.Empty;
string AndroidCmakeVersion = GetRequiredProperty (KnownProperties.AndroidCmakeVersion);
string AndroidCmakeVersionPath = GetRequiredProperty (KnownProperties.AndroidCmakeVersionPath);
string CommandLineToolsVersion = GetRequiredProperty (KnownProperties.CommandLineToolsVersion);
string CommandLineToolsFolder = GetRequiredProperty (KnownProperties.CommandLineToolsFolder);
string EmulatorVersion = GetRequiredProperty (KnownProperties.EmulatorVersion);
string EmulatorPkgRevision = GetRequiredProperty (KnownProperties.EmulatorPkgRevision);
string XABuildToolsFolder = GetRequiredProperty (KnownProperties.XABuildToolsFolder);
string XABuildToolsVersion = GetRequiredProperty (KnownProperties.XABuildToolsVersion);
string XAPlatformToolsVersion = GetRequiredProperty (KnownProperties.XAPlatformToolsVersion);
string XAPlatformToolsPackagePrefix = Context.Instance.Properties [KnownProperties.XAPlatformToolsPackagePrefix] ?? String.Empty;
bool isArm64Apple = Context.Instance.OS.Flavor == "macOS" && RuntimeInformation.OSArchitecture == Architecture.Arm64;
string EmulatorPkgRevision = GetRequiredProperty (KnownProperties.EmulatorPkgRevision);bool isArm64Apple = Context.Instance.OS.Flavor == "macOS" && RuntimeInformation.OSArchitecture == Architecture.Arm64;
Comment thread
jonathanpeppers marked this conversation as resolved.
Resolved
string emulatorArch = isArm64Apple ? "aarch64" : "x64";
string systemImageArch = isArm64Apple ? "arm64-v8a" : "x86_64";

Expand Down Expand Up @@ -106,37 +96,11 @@ public AndroidToolchain ()
buildToolName: $"android-ndk-r{AndroidNdkVersion}",
buildToolVersion: AndroidPkgRevision
),
new AndroidToolchainComponent ($"build-tools_r{XABuildToolsVersion}_{altOsTag}",
destDir: Path.Combine ("build-tools", XABuildToolsFolder),
isMultiVersion: true,
buildToolName: "android-sdk-build-tools",
buildToolVersion: $"{XABuildToolsVersion}"
),
new AndroidToolchainComponent ($"commandlinetools-{cltOsTag}-{CommandLineToolsVersion}",
destDir: Path.Combine ("cmdline-tools", CommandLineToolsFolder),
isMultiVersion: true,
buildToolName: "android-sdk-cmdline-tools",
buildToolVersion: $"{CommandLineToolsFolder}.{CommandLineToolsVersion}"
),
new AndroidToolchainComponent ($"{XAPlatformToolsPackagePrefix}platform-tools_r{XAPlatformToolsVersion}-{pltOsTag}",
destDir: "platform-tools",
pkgRevision: XAPlatformToolsVersion,
buildToolName: "android-sdk-platform-tools",
buildToolVersion: XAPlatformToolsVersion
),
new AndroidToolchainComponent ($"emulator-{osTag}_{emulatorArch}-{EmulatorVersion}",
destDir: "emulator",
pkgRevision: EmulatorPkgRevision,
dependencyType: AndroidToolchainComponentType.EmulatorDependency
),
new AndroidToolchainComponent ($"{AndroidCmakeUrlPrefix}cmake-{AndroidCmakeVersion}-{osTag}",
destDir: Path.Combine ("cmake", AndroidCmakeVersionPath),
isMultiVersion: true,
noSubdirectory: true,
pkgRevision: AndroidCmakeVersion,
buildToolName: "android-sdk-cmake",
buildToolVersion: AndroidCmakeVersion
),
};
}

Expand Down
4 changes: 0 additions & 4 deletions build-tools/xaprepare/xaprepare/xaprepare.targets
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@
<Replacement Include="@_CLRRuntimeFlavorDirName@=$(_CLRRuntimeFlavorDirName)" />
<Replacement Include="@_MonoRuntimeFlavorDirName@=$(_MonoRuntimeFlavorDirName)" />
<Replacement Include="@AndroidLatestStableFrameworkVersion@=$(AndroidLatestStableFrameworkVersion)" />
<Replacement Include="@AndroidCmakeUrlPrefix@=$(AndroidCmakeUrlPrefix)" />
<Replacement Include="@AndroidCmakeVersion@=$(AndroidCmakeVersion)" />
<Replacement Include="@AndroidCmakeVersionPath@=$(AndroidCmakeVersionPath)" />
<Replacement Include="@AndroidMinimumDotNetApiLevel@=$(AndroidMinimumDotNetApiLevel)" />
<Replacement Include="@AndroidDefaultTargetDotnetApiLevel@=$(AndroidDefaultTargetDotnetApiLevel)" />
<Replacement Include="@AndroidLatestStableApiLevel@=$(AndroidLatestStableApiLevel)" />
Expand Down Expand Up @@ -94,7 +91,6 @@
<Replacement Include="@XAInstallPrefix@=$(XAInstallPrefix)" />
<Replacement Include="@XABinRelativeInstallPrefix@=$(_XABinRelativeInstallPrefix)" />
<Replacement Include="@XAPackagesDir@=$(XAPackagesDir)" />
<Replacement Include="@XAPlatformToolsPackagePrefix@=$(XAPlatformToolsPackagePrefix)" />
</ItemGroup>

<ReplaceFileContents
Expand Down
Loading