mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix run behaviour when only single target exists

Browse source
This commit is contained in:
Pavel Krymets 2016-02-19 15:12:04 -08:00
parent f81ba05a7c
commit 6ca22e4a56
15 changed files with 197 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/dotnet/commands/dotnet-run/RunCommand.cs
View file

@ -61,6 +61,7 @@ namespace Microsoft.DotNet.Tools.Run
}
var rids = PlatformServices.Default.Runtime.GetAllCandidateRuntimeIdentifiers();
if (Framework == null)
{
var defaultFrameworks = new[]
@ -69,14 +70,23 @@ namespace Microsoft.DotNet.Tools.Run
FrameworkConstants.FrameworkIdentifiers.NetStandardApp,
};
var contexts = ProjectContext.CreateContextForEachFramework(Project, null, rids);
_context = contexts.FirstOrDefault(c =>
defaultFrameworks.Contains(c.TargetFramework.Framework) && !string.IsNullOrEmpty(c.RuntimeIdentifier));
var contexts = ProjectContext.CreateContextForEachFramework(Project, null);
if (_context == null)
ProjectContext context;
if (contexts.Count() == 1)
{
throw new InvalidOperationException($"Couldn't find default target with framework: {string.Join(",", defaultFrameworks)}");
context = contexts.Single();
}
else
{
context = contexts.FirstOrDefault(c => defaultFrameworks.Contains(c.TargetFramework.Framework));
if (context == null)
{
throw new InvalidOperationException($"Couldn't find target to run. Defaults: {string.Join(", ", defaultFrameworks)}");
}
}
_context = context.CreateRuntimeContext(rids);
}
else
{