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

Revert "MSBuildProjectDescriptions has dedicated property for the csproj path"

Browse source 
This reverts commit a95e20d96480dac3010c8403e04bd716fba2cc5b.
This commit is contained in:
Mihai Codoban 2016-03-30 14:58:22 -07:00
parent 52cabf9cbf
commit 2e78b9ae60
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Microsoft.DotNet.ProjectModel/MSBuildProjectDescription.cs
View file

@ -9,19 +9,17 @@ namespace Microsoft.DotNet.ProjectModel
{
/// <summary>
/// Represents an MSBuild project.
/// It has been built by MSBuild, so it behaves like a package: can provide all assets up front
///
/// The Path represents the path to the project.json, if there is one near the csproj file.
/// It has been invisibly built by MSBuild, so it behaves like a package: can provide all assets up front
/// </summary>
public class MSBuildProjectDescription : TargetLibraryWithAssets
{
public MSBuildProjectDescription(
string path,
string msbuildProjectPath,
LockFileProjectLibrary projectLibrary,
LockFileTargetLibrary lockFileLibrary,
IEnumerable<LibraryRange> dependencies,
bool compatible,
string path,
LockFileProjectLibrary projectLibrary,
LockFileTargetLibrary lockFileLibrary,
Project projectFile,
IEnumerable<LibraryRange> dependencies,
bool compatible,
bool resolved)
: base(
new LibraryIdentity(projectLibrary.Name, projectLibrary.Version, LibraryType.MSBuildProject),
@ -33,11 +31,12 @@ namespace Microsoft.DotNet.ProjectModel
compatible: compatible,
framework: null)
{
ProjectFile = projectFile;
ProjectLibrary = projectLibrary;
MsbuildProjectPath = msbuildProjectPath;
}
public LockFileProjectLibrary ProjectLibrary { get; }
public string MsbuildProjectPath { get; set; }
public Project ProjectFile { get; }
}
}

6
src/Microsoft.DotNet.ProjectModel/Resolution/MSBuildDependencyProvider.cs
View file

@ -36,12 +36,12 @@ namespace Microsoft.DotNet.ProjectModel.Resolution
var projectFile = projectLibrary.Path == null ? null : _projectResolver(projectLibrary.Path);
var msbuildPackageDescription = new MSBuildProjectDescription(
projectLibrary.Path,
msbuildProjectPath,
projectLibrary,
targetLibrary,
dependencies,
compatible,
projectFile,
dependencies,
compatible,
resolved: compatible && exists);
return msbuildPackageDescription;