Merge pull request #1444 from dotnet/piotrpMSFT/Issue1352/RID_Override

Remove dotnet-restore RID override
This commit is contained in:
Piotr Puszkiewicz 2016-02-16 14:38:12 -08:00
commit 2471a3fc55

View file

@ -7,7 +7,6 @@ using System.IO;
using System.Linq;
using System.Text;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.Cli.Compiler.Common;
using Microsoft.Dnx.Runtime.Common.CommandLine;
using Microsoft.Dotnet.Cli.Compiler.Common;
using Microsoft.DotNet.ProjectModel;
@ -37,15 +36,6 @@ namespace Microsoft.DotNet.Tools.Restore
var quiet = args.Any(s => s.Equals("--quiet", StringComparison.OrdinalIgnoreCase));
args = args.Where(s => !s.Equals("--quiet", StringComparison.OrdinalIgnoreCase)).ToArray();
// Until NuGet/Home#1941 is fixed, if no RIDs are specified, add our own.
if (!args.Any(s => s.Equals("--runtime", StringComparison.OrdinalIgnoreCase)))
{
args = Enumerable.Concat(
args,
PlatformServices.Default.Runtime.GetOverrideRestoreRuntimeIdentifiers().SelectMany(r => new [] { "--runtime", r })
).ToArray();
}
app.OnExecute(() =>
{
try