Skip to content

[xabuild] Probe DOTNET_ROOT for .NET sdks #4474

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
Mar 28, 2020
Merged

[xabuild] Probe DOTNET_ROOT for .NET sdks #4474

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
21 changes: 13 additions & 8 deletions tools/xabuild/XABuildPaths.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,17 @@ public XABuildPaths ()
string programFiles = Environment.GetFolderPath (Environment.SpecialFolder.ProgramFilesX86);
string prefix = Path.Combine (XamarinAndroidBuildOutput, "lib", "xamarin.android");

string DOTNET_ROOT = Environment.GetEnvironmentVariable ("DOTNET_ROOT");
string dotnetRootSdkDir = DOTNET_ROOT == null ? null : Path.Combine (DOTNET_ROOT, "sdk");

if (IsWindows) {
var instance = MSBuildLocator.QueryLatest ();
VsInstallRoot = instance.VisualStudioRootPath;

MSBuildPath = Path.Combine (VsInstallRoot, "MSBuild");
MSBuildBin = Path.GetDirectoryName (instance.MSBuildPath);
MSBuildConfig = Path.Combine (MSBuildBin, "MSBuild.exe.config");
DotNetSdkPath = FindLatestDotNetSdk (Path.Combine (Environment.GetEnvironmentVariable ("ProgramW6432"), "dotnet", "sdk"));
DotNetSdkPath = FindLatestDotNetSdk (Path.Combine (Environment.GetEnvironmentVariable ("ProgramW6432"), "dotnet", "sdk"), dotnetRootSdkDir);
MSBuildSdksPath = DotNetSdkPath ?? Path.Combine (MSBuildPath, "Sdks");
SystemFrameworks = Path.Combine (programFiles, "Reference Assemblies", "Microsoft", "Framework");
string msbuildDir = Path.GetDirectoryName (MSBuildBin);
Expand Down Expand Up @@ -184,7 +187,7 @@ public XABuildPaths ()
throw new InvalidOperationException ("Unable to locate MSBuild binaries directory");

MSBuildConfig = Path.Combine (MSBuildBin, "MSBuild.dll.config");
DotNetSdkPath = FindLatestDotNetSdk ("/usr/local/share/dotnet/sdk");
DotNetSdkPath = FindLatestDotNetSdk ("/usr/local/share/dotnet/sdk", dotnetRootSdkDir);
MSBuildSdksPath = DotNetSdkPath ?? Path.Combine (MSBuildBin, "Sdks");
SystemFrameworks = Path.Combine (mono, "xbuild-frameworks");
MonoSystemFrameworkRoot = mono;
Expand Down Expand Up @@ -291,11 +294,14 @@ string RunPathsTargets (string pathsTargets, string target)
}
}

string FindLatestDotNetSdk (string dotNetPath)
string FindLatestDotNetSdk (params string[] dotNetPaths)
{
if (Directory.Exists (dotNetPath)) {
Version latest = new Version (0,0);
string Sdk = null;
Version latest = new Version (0,0);
string Sdk = null;

foreach (var dotNetPath in dotNetPaths) {
if (!Directory.Exists (dotNetPath))
continue;
foreach (var dir in Directory.EnumerateDirectories (dotNetPath)) {
var version = GetVersionFromDirectory (dir);
var sdksDir = Path.Combine (dir, "Sdks");
Expand All @@ -308,9 +314,8 @@ string FindLatestDotNetSdk (string dotNetPath)
}
}
}
return Sdk;
}
return null;
return Sdk;
}

static Version GetVersionFromDirectory(string dir)
Expand Down