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

make all packages serviceable by default (#2575)

Browse source 
fixes https://github.com/dotnet/cli/issues/2569
This commit is contained in:
Andrew Stanton-Nurse 2016-04-19 08:34:42 -07:00
parent 08ee6dedd9
commit b682ab1d4f
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Microsoft.DotNet.ProjectModel/DependencyContextBuilder.cs
View file

@ -115,7 +115,9 @@ namespace Microsoft.Extensions.DependencyModel
{ {
var type = export.Library.Identity.Type; var type = export.Library.Identity.Type;
var serviceable = (export.Library as PackageDescription)?.PackageLibrary.IsServiceable ?? false; // TEMPORARY: All packages are serviceable in RC2
// See https://github.com/dotnet/cli/issues/2569
var serviceable = (export.Library as PackageDescription) != null;
var libraryDependencies = new HashSet<Dependency>(); var libraryDependencies = new HashSet<Dependency>();
foreach (var libraryDependency in export.Library.Dependencies) foreach (var libraryDependency in export.Library.Dependencies)

12
test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextBuilderTests.cs
View file

@ -95,6 +95,18 @@ namespace Microsoft.Extensions.DependencyModel.Tests
context.Target.Framework.Should().Be("SomeFramework,Version=v1.2"); context.Target.Framework.Should().Be("SomeFramework,Version=v1.2");
} }
[Fact]
public void SetsServiceableToTrueForPackageDescriptions()
{
var context = Build(runtimeExports: new[]
{
Export(PackageDescription("Pack.Age", servicable: false))
});
var lib = context.RuntimeLibraries.Single();
lib.Serviceable.Should().BeTrue();
}
[Fact] [Fact]
public void TakesServicableFromPackageDescription() public void TakesServicableFromPackageDescription()
{ {