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

Address PR feedback.

Browse source
This commit is contained in:
Sridhar Periyasamy 2015-11-30 18:04:50 -08:00
parent 86296b6d2d
commit 76d381b75f
1 changed files with 42 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/Microsoft.DotNet.Tools.Publish/Program.cs
View file

@ -53,11 +53,7 @@ namespace Microsoft.DotNet.Tools.Publish
} }
// get the lock file // get the lock file
var projectDir = path.ToLower().EndsWith(Project.FileName) ? var projectLockJsonPath = GetProjectLockFile(path);
Path.GetDirectoryName(path) :
path;
var projectLockJsonPath = Path.Combine(projectDir, LockFile.FileName);
if (!File.Exists(projectLockJsonPath)) if (!File.Exists(projectLockJsonPath))
{ {
Reporter.Output.WriteLine($"Unable to locate {LockFile.FileName} for project '{project.Value}'".Red()); Reporter.Output.WriteLine($"Unable to locate {LockFile.FileName} for project '{project.Value}'".Red());
@ -66,24 +62,7 @@ namespace Microsoft.DotNet.Tools.Publish
} }
var lockFile = LockFileReader.Read(projectLockJsonPath); var lockFile = LockFileReader.Read(projectLockJsonPath);
var lockFileTargets = GetMatchingTargets(lockFile, framework.Value(), runtime.Value());
var lockFileTargets = lockFile.Targets.Where(target =>
{
if(target.TargetFramework == null || string.IsNullOrEmpty(target.RuntimeIdentifier))
{
return false;
}
if (!runtime.HasValue() || runtime.Value().Equals(target.RuntimeIdentifier))
{
if (!framework.HasValue() || NuGetFramework.Parse(framework.Value()).Equals(target.TargetFramework))
{
return true;
}
}
return false;
});
if(lockFileTargets.Count() == 0) if(lockFileTargets.Count() == 0)
{ {
@ -136,11 +115,49 @@ namespace Microsoft.DotNet.Tools.Publish
return NuGetFramework.Parse(framework).Equals(NuGetFramework.UnsupportedFramework); return NuGetFramework.Parse(framework).Equals(NuGetFramework.UnsupportedFramework);
} }
private static string GetProjectDirectory(string project)
{
return project.ToLower().EndsWith(Project.FileName) ?
Path.GetDirectoryName(project) :
project;
}
private static string GetProjectLockFile(string project)
{
string projectDir = GetProjectDirectory(project);
return Path.Combine(projectDir, LockFile.FileName);
}
// return the matching framework/runtime targets in the lock file
// if 'framework' or 'runtime' is null or empty then it matches with any.
private static IEnumerable<LockFileTarget> GetMatchingTargets(LockFile lockFile, string framework, string runtime)
{
var lockFileTargets = lockFile.Targets.Where(target =>
{
if (target.TargetFramework == null || string.IsNullOrEmpty(target.RuntimeIdentifier))
{
return false;
}
if (string.IsNullOrEmpty(runtime) || runtime.Equals(target.RuntimeIdentifier))
{
if (string.IsNullOrEmpty(framework) || NuGetFramework.Parse(framework).Equals(target.TargetFramework))
{
return true;
}
}
return false;
});
return lockFileTargets;
}
private static int Publish(NuGetFramework framework, string runtimeIdentifier, string projectPath, string outputPath, string configuration) private static int Publish(NuGetFramework framework, string runtimeIdentifier, string projectPath, string outputPath, string configuration)
{ {
// Load project context and publish it // Load project context and publish it
var rids = new[] { runtimeIdentifier }; var runtimeIdentifiers = new[] { runtimeIdentifier };
var context = ProjectContext.Create(projectPath, framework, rids); var context = ProjectContext.Create(projectPath, framework, runtimeIdentifiers);
if (string.IsNullOrEmpty(context.RuntimeIdentifier)) if (string.IsNullOrEmpty(context.RuntimeIdentifier))
{ {