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

[WIP] Removes *3 verbs, making msbuild the driver (#4456)

Browse source 
Removes *3 verbs, making msbuild the driver
This commit is contained in:
Piotr Puszkiewicz 2016-10-27 18:46:43 -07:00 • committed by GitHub
parent 55c59d621e
commit 6fcbefa4f7
746 changed files with 4256 additions and 32434 deletions
Download patch file Download diff file Expand all files Collapse all files

54
TestAssets/TestPackages/dotnet-dependency-tool-invoker/Program.cs
View file

@ -2,7 +2,6 @@
using System.IO;
using System.Collections.Generic;
using System.Linq;
using Microsoft.DotNet.ProjectModel;
using Microsoft.DotNet.Cli.Utils;
using NuGet.Frameworks;
@ -24,13 +23,7 @@ namespace Microsoft.DotNet.Tools.DependencyInvoker
return 1;
}
var projectContexts =
CreateProjectContexts(dotnetParams.ProjectPath)
.Where(p => dotnetParams.Framework == null ||
dotnetParams.Framework.GetShortFolderName()
.Equals(p.TargetFramework.GetShortFolderName()));
var commandFactory =
new ProjectDependenciesCommandFactory(
dotnetParams.Framework,
@ -39,15 +32,7 @@ namespace Microsoft.DotNet.Tools.DependencyInvoker
dotnetParams.BuildBasePath,
dotnetParams.ProjectPath);
var result = 0;
if(projectContexts.Any())
{
result = InvokeDependencyToolForProjectJson(projectContexts, commandFactory, dotnetParams);
}
else
{
result = InvokeDependencyToolForMSBuild(commandFactory, dotnetParams);
}
var result = InvokeDependencyToolForMSBuild(commandFactory, dotnetParams);
return result;
}
@ -61,24 +46,6 @@ namespace Microsoft.DotNet.Tools.DependencyInvoker
return InvokeDependencyTool(commandFactory, dotnetParams, dotnetParams.Framework);
}
private static int InvokeDependencyToolForProjectJson(
IEnumerable<ProjectContext> projectContexts,
ProjectDependenciesCommandFactory commandFactory,
DotnetBaseParams dotnetParams)
{
foreach (var projectContext in projectContexts)
{
Console.WriteLine($"Invoking '{dotnetParams.Command}' for '{projectContext.TargetFramework}'.");
if (InvokeDependencyTool(commandFactory, dotnetParams, projectContext.TargetFramework) != 0)
{
return 1;
}
}
return 0;
}
private static int InvokeDependencyTool(
ProjectDependenciesCommandFactory commandFactory,
DotnetBaseParams dotnetParams,
@ -106,22 +73,5 @@ namespace Microsoft.DotNet.Tools.DependencyInvoker
return 0;
}
private static IEnumerable<ProjectContext> CreateProjectContexts(string projectPath = null)
{
projectPath = projectPath ?? Directory.GetCurrentDirectory();
if (!projectPath.EndsWith(Project.FileName))
{
projectPath = Path.Combine(projectPath, Project.FileName);
}
if (!File.Exists(projectPath))
{
return Enumerable.Empty<ProjectContext>();
}
return ProjectContext.CreateContextForEachFramework(projectPath);
}
}
}