Skip to content

Enabling restore for multiple solutions. #3997

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 2 commits into from
Dec 6, 2019
Merged

Enabling restore for multiple solutions. #3997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61adf2e
Enabling restore for multiple solutions.
Dec 6, 2019
1fa3eab
Fix whitespace formatting
jonpryor Dec 6, 2019
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
15 changes: 11 additions & 4 deletions build-tools/xaprepare/xaprepare/Application/Context.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,15 @@ partial class Context : AppObject
public const ConsoleColor FailureColor = ConsoleColor.Red;
public const ConsoleColor WarningColor = ConsoleColor.Yellow;

static readonly string XASolutionFilePath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "Xamarin.Android.sln");
static readonly string XATestsSolutionFilePath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "Xamarin.Android-Tests.sln");
static readonly IEnumerable<string> XASolutionFilesPath = new string [] {
Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "Xamarin.Android.BootstrapTasks.sln"),
Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "Xamarin.Android.Build.Tasks.sln"),
Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "Xamarin.Android.sln"),
};

static readonly IEnumerable<string> XATestsSolutionFilesPath = new string [] {
Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "Xamarin.Android-Tests.sln"),
};

string logDirectory;
string mainLogFilePath;
Expand Down Expand Up @@ -171,12 +178,12 @@ partial class Context : AppObject
/// <summary>
/// Path to the Xamarin.Android solution file
/// </summary>
public string XASolutionFile => XASolutionFilePath;
public IEnumerable<string> XASolutionFiles => XASolutionFilesPath;

/// <summary>
/// Path to the Xamarin.Android tests solution file
/// </summary>
public string XATestsSolutionFile => XATestsSolutionFilePath;
public IEnumerable<string> XATestsSolutionFiles => XATestsSolutionFilesPath;

/// <summary>
/// If <c>true</c>, the current console is capable of displayig UTF-8 characters
Expand Down
13 changes: 9 additions & 4 deletions build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@ protected override async Task<bool> Execute (Context context)
{
var nuget = new NuGetRunner (context);

if (!await NuGetRestore (nuget, context.XASolutionFile)) {
return false;
foreach (var solutionFile in context.XASolutionFiles) {
if (!await NuGetRestore (nuget, solutionFile)) {
return false;
}
}

Log.StatusLine ();
if (!await NuGetRestore (nuget, context.XATestsSolutionFile)) {
return false;

foreach (var solutionFile in context.XATestsSolutionFiles) {
if (!await NuGetRestore (nuget, solutionFile)) {
return false;
}
}

var msbuild = new MSBuildRunner (context);
Expand Down