Skip to content

[xaprepare] use $(XAPackagesDir) for NuGet folder #8613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 4, 2024
Merged

[xaprepare] use $(XAPackagesDir) for NuGet folder #8613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions build-tools/xaprepare/xaprepare/Application/KnownProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ static class KnownProperties
public const string XABuildToolsPackagePrefix = "XABuildToolsPackagePrefix";
public const string XABinRelativeInstallPrefix = "XABinRelativeInstallPrefix";
public const string XAInstallPrefix = "XAInstallPrefix";
public const string XAPackagesDir = "XAPackagesDir";
public const string XAPlatformToolsVersion = "XAPlatformToolsVersion";
public const string XAPlatformToolsPackagePrefix = "XAPlatformToolsPackagePrefix";
}
Expand Down
1 change: 1 addition & 0 deletions build-tools/xaprepare/xaprepare/Application/Properties.Defaults.cs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ namespace Xamarin.Android.Prepare
properties.Add (KnownProperties.XABuildToolsPackagePrefix, StripQuotes ("@XABuildToolsPackagePrefix@"));
properties.Add (KnownProperties.XABinRelativeInstallPrefix, StripQuotes (@"@XABinRelativeInstallPrefix@"));
properties.Add (KnownProperties.XAInstallPrefix, StripQuotes (@"@XAInstallPrefix@"));
properties.Add (KnownProperties.XAPackagesDir, StripQuotes (@"@XAPackagesDir@"));
properties.Add (KnownProperties.XAPlatformToolsVersion, StripQuotes ("@XAPlatformToolsVersion@"));
properties.Add (KnownProperties.XAPlatformToolsPackagePrefix, StripQuotes ("@XAPlatformToolsPackagePrefix@"));
}
Expand Down
13 changes: 1 addition & 12 deletions build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ public static partial class Paths

// not really configurables, merely convenience aliases for more frequently used paths that come from properties
public static string XAInstallPrefix => ctx.Properties.GetRequiredValue (KnownProperties.XAInstallPrefix);
public static string XAPackagesDir = DetermineNugetPackagesDir (ctx);
public static string XAPackagesDir => ctx.Properties.GetRequiredValue (KnownProperties.XAPackagesDir);

static string GetNetcoreAppRuntimePath (Context ctx, string androidTarget)
{
Expand All @@ -276,17 +276,6 @@ static string GetNetcoreAppRuntimePath (Context ctx, string androidTarget)
);
}

static string DetermineNugetPackagesDir (Context ctx)
{
return Path.GetFullPath (
Path.Combine (
ctx.Properties.GetRequiredValue (KnownProperties.PkgXamarin_LibZipSharp),
"..",
".."
)
);
}

static string EnsureAndroidToolchainBinDirectories ()
{
if (androidToolchainBinDirectory != null)
Expand Down
1 change: 1 addition & 0 deletions build-tools/xaprepare/xaprepare/xaprepare.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
<Replacement Include="@XAPlatformToolsVersion@=$(XAPlatformToolsVersion)" />
<Replacement Include="@XAInstallPrefix@=$(XAInstallPrefix)" />
<Replacement Include="@XABinRelativeInstallPrefix@=$(_XABinRelativeInstallPrefix)" />
<Replacement Include="@XAPackagesDir@=$(XAPackagesDir)" />
<Replacement Include="@XAPlatformToolsPackagePrefix@=$(XAPlatformToolsPackagePrefix)" />
</ItemGroup>

Expand Down