diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index cfbb6d44413..e2c15d75d14 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -41,7 +41,12 @@ protected override async Task 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; } diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternal.cs b/build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternal.cs index 398464084a2..b49a3592d65 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternal.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_PrepareExternal.cs @@ -25,8 +25,9 @@ protected override async Task 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 () { "--configfile", Path.Combine (Configurables.Paths.ExternalDir, "xamarin-android-tools", "NuGet.config") }, binlogName: "prepare-xat-restore" ); }