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

extract logic for opening project and preserving directory and path to separate class

Browse source
This commit is contained in:
Krzysztof Wicher 2016-11-29 10:23:04 -08:00
parent 1edda43dd1
commit 4e3c73e778
4 changed files with 129 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/dotnet/commands/dotnet-add-p2p/Program.cs
View file

@ -49,20 +49,7 @@ namespace Microsoft.DotNet.Tools.Add.ProjectToProjectReference
throw new GracefulException(LocalizableStrings.RequiredArgumentNotPassed, "<Project>");
}
ProjectRootElement project;
string projectDir;
if (File.Exists(projectArgument.Value))
{
project = P2PHelpers.GetProjectFromFileOrThrow(projectArgument.Value);
projectDir = new FileInfo(projectArgument.Value).DirectoryName;
}
else
{
project = P2PHelpers.GetProjectFromDirectoryOrThrow(projectArgument.Value);
projectDir = projectArgument.Value;
}
projectDir = PathUtility.EnsureTrailingSlash(projectDir);
var msbuildProj = MsbuildProject.FromFileOrDirectory(projectArgument.Value);
if (app.RemainingArguments.Count == 0)
{
@ -73,17 +60,17 @@ namespace Microsoft.DotNet.Tools.Add.ProjectToProjectReference
if (!forceOption.HasValue())
{
P2PHelpers.EnsureAllReferencesExist(references);
P2PHelpers.ConvertPathsToRelative(projectDir, ref references);
P2PHelpers.ConvertPathsToRelative(msbuildProj.ProjectDirectory, ref references);
}
int numberOfAddedReferences = P2PHelpers.AddProjectToProjectReference(
project,
msbuildProj.Project,
frameworkOption.Value(),
references);
if (numberOfAddedReferences != 0)
{
project.Save();
msbuildProj.Project.Save();
}
return 0;