Skip to content

Commit 5daa8a9

Browse files
authored
Merge pull request #2581 from dsplaisted/fix-aspnet-privateassets
Fix issue where ASP.NET PackageReferences with implicit versions had incorrect PrivateAssets value
2 parents 43539b5 + 149a8b2 commit 5daa8a9

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ Copyright (c) .NET Foundation. All rights reserved.
9797
<ItemGroup>
9898
<!-- Set implicit metadata on ASP.NET package references -->
9999
<PackageReference Update="Microsoft.AspNetCore.App">
100-
<PrivateAssets Condition="'%(PackageReference.Version)' == ''">true</PrivateAssets>
100+
<PrivateAssets Condition="'%(PackageReference.Version)' == ''">all</PrivateAssets>
101101
<Publish Condition="'%(PackageReference.Version)' == ''">true</Publish>
102102
</PackageReference>
103103

104104
<PackageReference Update="Microsoft.AspNetCore.All">
105-
<PrivateAssets Condition="'%(PackageReference.Version)' == ''">true</PrivateAssets>
105+
<PrivateAssets Condition="'%(PackageReference.Version)' == ''">all</PrivateAssets>
106106
<Publish Condition="'%(PackageReference.Version)' == ''">true</Publish>
107107
</PackageReference>
108108

src/Tests/Microsoft.NET.Pack.Tests/GivenThatThereAreImplicitPackageReferences.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,27 @@ public void Packing_a_netcoreapp_2_0_app_does_not_include_the_implicit_dependenc
158158
dependencies.Should().BeEmpty();
159159
}
160160

161+
[Theory]
162+
[InlineData("Microsoft.AspNetCore.App")]
163+
[InlineData("Microsoft.AspNetCore.All")]
164+
public void Package_an_aspnetcore_2_1_app_does_not_include_the_implicit_dependency(string packageId)
165+
{
166+
TestProject testProject = new TestProject()
167+
{
168+
Name = "PackAspNetCoreApp21App",
169+
IsSdkProject = true,
170+
TargetFrameworks = "netcoreapp2.1",
171+
IsExe = true
172+
};
173+
174+
testProject.PackageReferences.Add(new TestPackageReference(packageId, ""));
175+
176+
var dependencies = PackAndGetDependencies(testProject);
177+
178+
dependencies.Should().BeEmpty();
179+
180+
}
181+
161182
[Fact]
162183
public void Packing_a_netcoreapp_2_0_DotnetCliTool_app_includes_the_implicit_dependency()
163184
{

0 commit comments

Comments
 (0)