Exe do not inclue app package (#2395)

* Packing a .NET Core Exe shouldn't include package dependency on Microsoft.NETCore.App

Author: William Li

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

@@ -48,10 +48,10 @@ Copyright (c) .NET Foundation. All rights reserved.
   <ItemGroup Condition=" '$(DisableImplicitFrameworkReferences)' != 'true' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
     <PackageReference Include="Microsoft.NETCore.App" Version="$(RuntimeFrameworkVersion)" IsImplicitlyDefined="true" />
 
-    <!-- For libraries targeting .NET Core 2.0 or higher, don't include a dependency on Microsoft.NETCore.App in the package produced by pack.
-         Packing an app (for example a .NET CLI tool) should include the Microsoft.NETCore.App package dependency. -->
+    <!-- For targeting .NET Core 2.0 or higher, don't include a dependency on Microsoft.NETCore.App in the package produced by pack.
+         Packing an DotnetCliTool should include the Microsoft.NETCore.App package dependency. -->
     <PackageReference Update="Microsoft.NETCore.App"
-                      Condition="('$(OutputType)' != 'Exe') And ('$(_TargetFrameworkVersionWithoutV)' != '') And ('$(_TargetFrameworkVersionWithoutV)' >= '2.0')"
+                      Condition="('$(_TargetFrameworkVersionWithoutV)' != '') And ('$(_TargetFrameworkVersionWithoutV)' >= '2.0') And ('$(PackageType)' != 'DotnetCliTool')"
                       PrivateAssets="All"
                       Publish="true" />    
   </ItemGroup>

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToGenerateADepsFileForATool.cs

@@ -41,6 +41,8 @@ public void It_creates_a_deps_file_for_the_tool_and_the_tool_runs()
                 IsExe = true
             };
 
+            toolProject.AdditionalProperties.Add("PackageType", "DotnetCliTool");
+
             GenerateDepsAndRunTool(toolProject)
                 .Should()
                 .Pass()
@@ -59,6 +61,8 @@ public void It_handles_conflicts_when_creating_a_tool_deps_file()
                 IsExe = true
             };
 
+            toolProject.AdditionalProperties.Add("PackageType", "DotnetCliTool");
+
             toolProject.PackageReferences.Add(new TestPackageReference("Microsoft.Extensions.DependencyModel", "1.1.0", null));
 
             string toolSource = @"

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

@@ -143,7 +143,7 @@ public void Packing_an_app_exclude_dependencys_framework_assemblies_dependency()
         }
 
         [Fact]
-        public void Packing_a_netcoreapp_2_0_app_includes_the_implicit_dependency()
+        public void Packing_a_netcoreapp_2_0_app_does_not_include_the_implicit_dependency()
         {
             TestProject testProject = new TestProject()
             {
@@ -155,6 +155,24 @@ public void Packing_a_netcoreapp_2_0_app_includes_the_implicit_dependency()
 
             var dependencies = PackAndGetDependencies(testProject);
 
+            dependencies.Should().BeEmpty();
+        }
+
+        [Fact]
+        public void Packing_a_netcoreapp_2_0_DotnetCliTool_app_includes_the_implicit_dependency()
+        {
+            TestProject testProject = new TestProject()
+            {
+                Name = "PackNetCoreApp20App",
+                IsSdkProject = true,
+                TargetFrameworks = "netcoreapp2.0",
+                IsExe = true
+            };
+
+            testProject.AdditionalProperties.Add("PackageType", "DotnetCliTool");
+
+            var dependencies = PackAndGetDependencies(testProject);
+
             dependencies.Count().Should().Be(1);
             dependencies.Single().Attribute("id").Value
                 .Should().Be("Microsoft.NETCore.App");