Revert "MSBuildProjectDescriptions has dedicated property for the csproj path"
This reverts commit a95e20d96480dac3010c8403e04bd716fba2cc5b.
This commit is contained in:
parent
52cabf9cbf
commit
2e78b9ae60
2 changed files with 13 additions and 14 deletions
|
@ -9,19 +9,17 @@ namespace Microsoft.DotNet.ProjectModel
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents an MSBuild project.
|
/// Represents an MSBuild project.
|
||||||
/// It has been built by MSBuild, so it behaves like a package: can provide all assets up front
|
/// It has been invisibly 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.
|
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class MSBuildProjectDescription : TargetLibraryWithAssets
|
public class MSBuildProjectDescription : TargetLibraryWithAssets
|
||||||
{
|
{
|
||||||
public MSBuildProjectDescription(
|
public MSBuildProjectDescription(
|
||||||
string path,
|
string path,
|
||||||
string msbuildProjectPath,
|
LockFileProjectLibrary projectLibrary,
|
||||||
LockFileProjectLibrary projectLibrary,
|
LockFileTargetLibrary lockFileLibrary,
|
||||||
LockFileTargetLibrary lockFileLibrary,
|
Project projectFile,
|
||||||
IEnumerable<LibraryRange> dependencies,
|
IEnumerable<LibraryRange> dependencies,
|
||||||
bool compatible,
|
bool compatible,
|
||||||
bool resolved)
|
bool resolved)
|
||||||
: base(
|
: base(
|
||||||
new LibraryIdentity(projectLibrary.Name, projectLibrary.Version, LibraryType.MSBuildProject),
|
new LibraryIdentity(projectLibrary.Name, projectLibrary.Version, LibraryType.MSBuildProject),
|
||||||
|
@ -33,11 +31,12 @@ namespace Microsoft.DotNet.ProjectModel
|
||||||
compatible: compatible,
|
compatible: compatible,
|
||||||
framework: null)
|
framework: null)
|
||||||
{
|
{
|
||||||
|
ProjectFile = projectFile;
|
||||||
ProjectLibrary = projectLibrary;
|
ProjectLibrary = projectLibrary;
|
||||||
MsbuildProjectPath = msbuildProjectPath;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public LockFileProjectLibrary ProjectLibrary { get; }
|
public LockFileProjectLibrary ProjectLibrary { get; }
|
||||||
public string MsbuildProjectPath { get; set; }
|
|
||||||
|
public Project ProjectFile { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,12 +36,12 @@ namespace Microsoft.DotNet.ProjectModel.Resolution
|
||||||
var projectFile = projectLibrary.Path == null ? null : _projectResolver(projectLibrary.Path);
|
var projectFile = projectLibrary.Path == null ? null : _projectResolver(projectLibrary.Path);
|
||||||
|
|
||||||
var msbuildPackageDescription = new MSBuildProjectDescription(
|
var msbuildPackageDescription = new MSBuildProjectDescription(
|
||||||
projectLibrary.Path,
|
|
||||||
msbuildProjectPath,
|
msbuildProjectPath,
|
||||||
projectLibrary,
|
projectLibrary,
|
||||||
targetLibrary,
|
targetLibrary,
|
||||||
dependencies,
|
projectFile,
|
||||||
compatible,
|
dependencies,
|
||||||
|
compatible,
|
||||||
resolved: compatible && exists);
|
resolved: compatible && exists);
|
||||||
|
|
||||||
return msbuildPackageDescription;
|
return msbuildPackageDescription;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue