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

Remove IsLoadable from Project

Browse source
This commit is contained in:
David Fowler 2015-10-17 08:05:35 -07:00
parent fe3a9d1332
commit b2ebe529bd
4 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Microsoft.Extensions.ProjectModel/Project.cs
View file

@ -77,8 +77,6 @@ namespace Microsoft.Extensions.ProjectModel
public string[] Tags { get; set; } public string[] Tags { get; set; }
public bool IsLoadable { get; set; }
public ProjectFilesCollection Files { get; set; } public ProjectFilesCollection Files { get; set; }
public IDictionary<string, string> Commands { get; } = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); public IDictionary<string, string> Commands { get; } = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

1
src/Microsoft.Extensions.ProjectModel/ProjectDescription.cs
View file

@ -25,7 +25,6 @@ namespace Microsoft.Extensions.ProjectModel
LibraryRange libraryRange, LibraryRange libraryRange,
Project project, Project project,
IEnumerable<LibraryRange> dependencies, IEnumerable<LibraryRange> dependencies,
IEnumerable<string> assemblies,
TargetFrameworkInformation targetFrameworkInfo, TargetFrameworkInformation targetFrameworkInfo,
bool resolved) : bool resolved) :
base( base(

4
src/Microsoft.Extensions.ProjectModel/ProjectReader.cs
View file

@ -102,8 +102,8 @@ namespace Microsoft.Extensions.ProjectModel
project.ReleaseNotes = rawProject.ValueAsString("releaseNotes"); project.ReleaseNotes = rawProject.ValueAsString("releaseNotes");
project.RequireLicenseAcceptance = rawProject.ValueAsBoolean("requireLicenseAcceptance", defaultValue: false); project.RequireLicenseAcceptance = rawProject.ValueAsBoolean("requireLicenseAcceptance", defaultValue: false);
project.IsLoadable = rawProject.ValueAsBoolean("loadable", defaultValue: true);
// TODO: Move this to the dependencies node // REVIEW: Move this to the dependencies node?
project.EmbedInteropTypes = rawProject.ValueAsBoolean("embedInteropTypes", defaultValue: false); project.EmbedInteropTypes = rawProject.ValueAsBoolean("embedInteropTypes", defaultValue: false);
project.Dependencies = new List<LibraryRange>(); project.Dependencies = new List<LibraryRange>();

8
src/Microsoft.Extensions.ProjectModel/Resolution/ProjectDependencyProvider.cs
View file

@ -51,13 +51,6 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
var dependencies = project.Dependencies.Concat(targetFrameworkDependencies).ToList(); var dependencies = project.Dependencies.Concat(targetFrameworkDependencies).ToList();
var loadableAssemblies = new List<string>();
if (project.IsLoadable)
{
loadableAssemblies.Add(project.Name);
}
// Mark the library as unresolved if there were specified frameworks // Mark the library as unresolved if there were specified frameworks
// and none of them resolved // and none of them resolved
bool unresolved = targetFrameworkInfo.FrameworkName == null; bool unresolved = targetFrameworkInfo.FrameworkName == null;
@ -66,7 +59,6 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
new LibraryRange(project.Name, LibraryType.Unspecified), new LibraryRange(project.Name, LibraryType.Unspecified),
project, project,
dependencies, dependencies,
loadableAssemblies,
targetFrameworkInfo, targetFrameworkInfo,
!unresolved); !unresolved);
} }