Skip to content

[build] Pass NuGet.config when restoring #7578

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
pjcollins merged 1 commit into from
Nov 23, 2022
Merged

[build] Pass NuGet.config when restoring #7578

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
7 changes: 6 additions & 1 deletion build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ protected override async Task<bool> Execute (Context context)
// Install runtime packs associated with the SDK previously installed.
var packageDownloadProj = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "build-tools", "xaprepare", "xaprepare", "package-download.proj");
var logPath = Path.Combine (Configurables.Paths.BuildBinDir, $"msbuild-{context.BuildTimeStamp}-download-runtime-packs.binlog");
if (!Utilities.RunCommand (Configurables.Paths.DotNetPreviewTool, new string [] { "restore", ProcessRunner.QuoteArgument (packageDownloadProj), ProcessRunner.QuoteArgument ($"-bl:{logPath}") })) {
var restoreArgs = new string [] { "restore",
ProcessRunner.QuoteArgument (packageDownloadProj),
"--configfile", Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "NuGet.config"),
ProcessRunner.QuoteArgument ($"-bl:{logPath}"),
};
if (!Utilities.RunCommand (Configurables.Paths.DotNetPreviewTool, restoreArgs)) {
Log.ErrorLine ($"dotnet restore {packageDownloadProj} failed.");
return false;
}
Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -25,8 +25,9 @@ protected override async Task<bool> Execute (Context context)
return false;

return await msbuild.Restore (
projectPath: Path.Combine (Configurables.Paths.ExternalXamarinAndroidToolsSln),
projectPath: Configurables.Paths.ExternalXamarinAndroidToolsSln,
logTag: "xat-restore",
arguments: new List<string> () { "--configfile", Path.Combine (Configurables.Paths.ExternalDir, "xamarin-android-tools", "NuGet.config") },
binlogName: "prepare-xat-restore"
);
}
Expand Down