Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -766,10 +766,16 @@ private void CalculateExcludedLibraries()
var dependencyName = dependenciesToWalk.Pop();
if (!includedDependencies.ContainsKey(dependencyName))
{
includedDependencies.Add(dependencyName, _dependencyLibraries[dependencyName]);
foreach (var newDependency in _libraryDependencies[dependencyName])
// There may not be a library in the assets file if a referenced project has
// PrivateAssets="all" for a package reference, and there is a package in the graph
// that depends on the same packge.
if (_dependencyLibraries.TryGetValue(dependencyName, out var dependencyLibrary))
{
dependenciesToWalk.Push(newDependency.Name);
includedDependencies.Add(dependencyName, dependencyLibrary);
foreach (var newDependency in _libraryDependencies[dependencyName])
{
dependenciesToWalk.Push(newDependency.Name);
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using System.Xml.Linq;
using Xunit.Abstractions;
using System.Collections.Generic;
using Microsoft.NET.TestFramework.ProjectConstruction;

namespace Microsoft.NET.Publish.Tests
{
Expand Down Expand Up @@ -166,5 +167,37 @@ public void It_publishes_a_PackageReference_with_PrivateAssets_All_and_Publish_t

publishDirectory.Should().OnlyHaveFiles(expectedFiles);
}

[Fact]
public void TransitiveNetStandardPackageReferenceAndPublishFalse()
{
var testLibraryProject = new TestProject()
{
Name = "TestLibrary",
IsSdkProject = true,
TargetFrameworks = "netstandard2.0"
};

testLibraryProject.PackageReferences.Add(new TestPackageReference("WindowsAzure.Storage", "9.3.3"));

var testProject = new TestProject()
{
Name = "TestApp",
IsSdkProject = true,
IsExe = true,
TargetFrameworks = "netcoreapp3.0"
};

testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "12.0.2", privateAssets: "all"));

testProject.ReferencedProjects.Add(testLibraryProject);

var testAsset = _testAssetsManager.CreateTestProject(testProject)
.Restore(Log, testProject.Name);

var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));

publishCommand.Execute().Should().Pass();
}
}
}