Skip to content

Commit

Permalink
Revert "[build] specify --azure-feed"
Browse files Browse the repository at this point in the history
This reverts commit be85722.

This was merged: dotnet/install-scripts#233
  • Loading branch information
jonathanpeppers committed Jan 12, 2022
1 parent c97a4b1 commit 581ff17
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,30 +102,18 @@ async Task<bool> InstallDotNetAsync (Context context, string dotnetPath, string
var type = runtimeOnly ? "runtime" : "SDK";
Log.StatusLine ($"Installing dotnet {type} '{version}'...");

//TODO: temporarily specify the feed until we get:
// https://github.com/dotnet/install-scripts/issues/229
var feed = "https://dotnetbuilds.blob.core.windows.net/public";
if (Context.IsWindows) {
var args = new List<string> {
"-NoProfile",
"-ExecutionPolicy", "unrestricted",
"-file", dotnetScriptPath,
"-Version", version,
"-InstallDir", dotnetPath,
"-AzureFeed", feed,
"-Verbose"
"-NoProfile", "-ExecutionPolicy", "unrestricted", "-file", dotnetScriptPath,
"-Version", version, "-InstallDir", dotnetPath, "-Verbose"
};
if (runtimeOnly)
args.AddRange (new string [] { "-Runtime", "dotnet" });

return Utilities.RunCommand ("powershell.exe", args.ToArray ());
} else {
var args = new List<string> {
dotnetScriptPath,
"--version", version,
"--install-dir", dotnetPath,
"--azure-feed", feed,
"--verbose"
dotnetScriptPath, "--version", version, "--install-dir", dotnetPath, "--verbose"
};
if (runtimeOnly)
args.AddRange (new string [] { "-Runtime", "dotnet" });
Expand Down

0 comments on commit 581ff17

Please sign in to comment.