Fix package output path, don't check if TargetFramework is a global p…

…roperty, and reenable pack tests

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.DefaultOutputPaths.targets

@@ -62,7 +62,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!-- Set the package output path (for nuget pack target) now, before the TargetFramework is appended -->
   <PropertyGroup Condition="'$(PackageOutputPath)' == ''">
     <PackageOutputPath Condition="'$(UseArtifactsOutput)' != 'true'">$(OutputPath)</PackageOutputPath>
-    <PackageOutputPath Condition="'$(UseArtifactsOutput)' == 'true'">$(BaseArtifactsPath)\package\</PackageOutputPath>
+    <PackageOutputPath Condition="'$(UseArtifactsOutput)' == 'true'">$(BaseArtifactsPath)\package\$(Configuration.ToLowerInvariant())\</PackageOutputPath>
   </PropertyGroup>
 
   <!-- Exclude files from OutputPath and IntermediateOutputPath from default item globs.  Use the value
@@ -100,15 +100,11 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup Condition="'$(UseArtifactsOutput)' == 'true'">
     <_ArtifactPivots>$(Configuration.ToLowerInvariant())</_ArtifactPivots>
 
-    <!-- Check if TargetFramework is a global property by trying to overwrite it -->
-    <_TargetFrameworkBackup>$(TargetFramework)</_TargetFrameworkBackup>
-    <TargetFramework></TargetFramework>
-    <TargetFrameworkIsGlobal>false</TargetFrameworkIsGlobal>
-    <TargetFrameworkIsGlobal Condition="'$(TargetFramework)' == '$(_TargetFrameworkBackup)'">true</TargetFrameworkIsGlobal>
-    <TargetFramework>$(_TargetFrameworkBackup)</TargetFramework>
-
-    <_ArtifactPivots Condition="'$(TargetFrameworks)' != '' Or
-                                '$(TargetFrameworkIsGlobal)' == 'true'"
+    <!-- Per the design, we should include the TargetFramework in the pivots if TargetFrameworks is defined, or if TargetFramework is a global property.
+         However, basing this on whether TargetFramework is a global property currently breaks "dotnet pack": https://github.com/NuGet/Home/issues/12323
+         Because of this, for now we will only include the TargetFramework in the pivots if TargetFrameworks is defined, and won't look at whether
+         TargetFramework is a global property or not. -->
+    <_ArtifactPivots Condition="'$(TargetFrameworks)' != ''"
                      >$(_ArtifactPivots)_$(TargetFramework.ToLowerInvariant())</_ArtifactPivots>
 
     <!-- This targets file is evaluated before RuntimeIdentifierInference.targets, so this will only include the

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

@@ -712,7 +712,7 @@ public void TransitiveFrameworkReferenceFromProjectReference()
             runtimeFrameworkNames.Should().BeEquivalentTo("Microsoft.AspNetCore.App", "Microsoft.NETCore.App");
         }
 
-        [Fact(Skip = "https://github.com/NuGet/Home/issues/12323")]
+        [Fact]
         public void TransitiveFrameworkReferenceFromPackageReference()
         {
             var referencedPackage = new TestProject()
@@ -724,13 +724,13 @@ public void TransitiveFrameworkReferenceFromPackageReference()
 
             var packageAsset = _testAssetsManager.CreateTestProject(referencedPackage);
 
-            var packCommand = new PackCommand(Log, packageAsset.TestRoot, referencedPackage.Name);
+            var packCommand = new PackCommand(packageAsset);
 
             packCommand.Execute()
                 .Should()
                 .Pass();
 
-            var nupkgFolder = packCommand.GetOutputDirectory(null);
+            var nupkgFolder = packCommand.GetPackageDirectory();
 
             var testProject = new TestProject()
             {

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

@@ -23,7 +23,7 @@ public class GivenThatWeHaveAPackageReferenceWithAliases : SdkTest
         public GivenThatWeHaveAPackageReferenceWithAliases(ITestOutputHelper log) : base(log)
         { }
 
-        [RequiresMSBuildVersionFact("16.8.0", Skip = "https://github.com/NuGet/Home/issues/12323")]
+        [RequiresMSBuildVersionFact("16.8.0")]
         public void CanBuildProjectWithPackageReferencesWithConflictingTypes()
         {
             var targetFramework = ToolsetInfo.CurrentTargetFramework;
@@ -61,7 +61,7 @@ public void CanBuildProjectWithPackageReferencesWithConflictingTypes()
                 .Pass();
         }
 
-        [RequiresMSBuildVersionFact("16.8.0", Skip = "https://github.com/NuGet/Home/issues/12323")]
+        [RequiresMSBuildVersionFact("16.8.0")]
         public void CanBuildProjectWithMultiplePackageReferencesWithAliases()
         {
             var targetFramework = ToolsetInfo.CurrentTargetFramework;
@@ -105,7 +105,7 @@ public void CanBuildProjectWithMultiplePackageReferencesWithAliases()
                 .Pass();
         }
 
-        [RequiresMSBuildVersionFact("16.8.0", Skip = "https://github.com/NuGet/Home/issues/12323")]
+        [RequiresMSBuildVersionFact("16.8.0")]
         public void CanBuildProjectWithAPackageReferenceWithMultipleAliases()
         {
             var targetFramework = ToolsetInfo.CurrentTargetFramework;
@@ -154,7 +154,7 @@ private IEnumerable<TestPackageReference> GetPackageReferencesWithConflictingTyp
         private TestPackageReference GetPackageReference(string targetFramework, string packageName, string projectFileContent, [CallerMemberName] string callingMethod = "", string identifier = null)
         {
             var project = GetProject(targetFramework, packageName, projectFileContent);
-            var packCommand = new PackCommand(Log, _testAssetsManager.CreateTestProject(project, callingMethod: callingMethod, identifier: identifier).TestRoot, packageName);
+            var packCommand = new PackCommand(_testAssetsManager.CreateTestProject(project, callingMethod: callingMethod, identifier: identifier));
 
             packCommand
                 .Execute()

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

@@ -18,7 +18,7 @@ public class GivenThatWeHaveAPpContentFile : SdkTest
         public GivenThatWeHaveAPpContentFile(ITestOutputHelper log) : base(log)
         {}
 
-        [Fact(Skip = "https://github.com/NuGet/Home/issues/12323")]
+        [Fact]
         public void It_copies_to_output_successfully()
         {
             var packageReference = GetPackageReference();
@@ -41,7 +41,7 @@ public void It_copies_to_output_successfully()
                 .Should()
                 .Pass();
 
-            var outputPath = Path.Combine(testAsset.TestRoot, testProject.Name, "bin", "Debug", testProject.TargetFrameworks);
+            var outputPath = buildCommand.GetOutputDirectory().FullName;
             File.Exists(Path.Combine(outputPath, packageReference.ID + ".dll")).Should().BeTrue();
             File.Exists(Path.Combine(outputPath, "Nontransformed.ps1")).Should().BeTrue();
             File.Exists(Path.Combine(outputPath, "Test.ps1")).Should().BeTrue();
@@ -61,7 +61,7 @@ private TestPackageReference GetPackageReference()
             packageAsset = packageAsset
                 .WithProjectChanges(project => AddContent(project));
 
-            var packCommand = new PackCommand(Log, packageAsset.TestRoot, referencedPackage.Name);
+            var packCommand = new PackCommand(packageAsset);
             packCommand.Execute()
                 .Should()
                 .Pass();

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

@@ -23,21 +23,26 @@ public void It_packs_successfully()
                 .CopyTestAsset("HelloWorld")
                 .WithSource();
 
-            new PackCommand(Log, testAsset.TestRoot)
+            var packCommand = new PackCommand(testAsset);
+
+            packCommand
                 .Execute()
                 .Should()
                 .Pass();
 
-
+            var packageDirectory = packCommand.GetPackageDirectory();
+            packageDirectory.Should().OnlyHaveFiles(new[]
+            {
+                "HelloWorld.1.0.0.nupkg",
+            });
 
-            var outputDirectory = new DirectoryInfo(Path.Combine(testAsset.TestRoot, "bin", "Debug"));
+            var outputDirectory = packCommand.GetOutputDirectory();
             outputDirectory.Should().OnlyHaveFiles(new[] {
-                "HelloWorld.1.0.0.nupkg",
-                $"{ToolsetInfo.CurrentTargetFramework}/HelloWorld.dll",
-                $"{ToolsetInfo.CurrentTargetFramework}/HelloWorld.pdb",
-                $"{ToolsetInfo.CurrentTargetFramework}/HelloWorld.deps.json",
-                $"{ToolsetInfo.CurrentTargetFramework}/HelloWorld.runtimeconfig.json",
-                $"{ToolsetInfo.CurrentTargetFramework}/HelloWorld{EnvironmentInfo.ExecutableExtension}",
+                $"HelloWorld.dll",
+                $"HelloWorld.pdb",
+                $"HelloWorld.deps.json",
+                $"HelloWorld.runtimeconfig.json",
+                $"HelloWorld{EnvironmentInfo.ExecutableExtension}",
             });
         }
     }

src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishWithGeneratePackageOnBuildAndPackAsTool.cs

@@ -26,8 +26,8 @@ public GivenThatWeWantToPublishWithGeneratePackageOnBuildAndPackAsTool(ITestOutp
         [Theory]
         [InlineData(false, false)]
         [InlineData(false, true)]
-        [InlineData(true, false, Skip = "https://github.com/NuGet/Home/issues/12323")]
-        [InlineData(true, true, Skip = "https://github.com/NuGet/Home/issues/12323")]
+        [InlineData(true, false)]
+        [InlineData(true, true)]
         public void It_publishes_successfully(bool generatePackageOnBuild, bool packAsTool)
         {
             Console.WriteLine(generatePackageOnBuild.ToString() + packAsTool.ToString());
@@ -54,8 +54,8 @@ public void It_publishes_successfully(bool generatePackageOnBuild, bool packAsTo
         [Theory]
         [InlineData(false, false)]
         [InlineData(false, true)]
-        [InlineData(true, false, Skip = "https://github.com/NuGet/Home/issues/12323")]
-        [InlineData(true, true, Skip = "https://github.com/NuGet/Home/issues/12323")]
+        [InlineData(true, false)]
+        [InlineData(true, true)]
         public void It_builds_with_GeneratePackageOnBuild_successfully(bool generatePackageOnBuild, bool packAsTool)
         {
             TestAsset testAsset = _testAssetsManager

src/Tests/Microsoft.NET.TestFramework/Commands/MSBuildCommand.cs

@@ -105,6 +105,17 @@ public virtual DirectoryInfo GetIntermediateDirectory(string targetFramework = "
             return new DirectoryInfo(output);
         }
 
+        public DirectoryInfo GetPackageDirectory(string configuration = "Debug")
+        {
+            if (TestAsset != null)
+            {
+                return new DirectoryInfo(OutputPathCalculator.FromTestAsset(ProjectFile, TestAsset).GetPackageDirectory(configuration));
+            }
+
+            string output = Path.Combine(ProjectRootPath, "bin", configuration);
+            return new DirectoryInfo(output);
+        }
+
         public virtual DirectoryInfo GetNonSDKOutputDirectory(string configuration = "Debug")
         {
             configuration = configuration ?? string.Empty;

src/Tests/Microsoft.NET.TestFramework/Commands/PackCommand.cs

@@ -11,6 +11,13 @@ public sealed class PackCommand : MSBuildCommand
         public PackCommand(ITestOutputHelper log, string projectPath, string relativePathToProject = null)
             : base(log, "Pack", projectPath, relativePathToProject)
         {
+
+        }
+
+        public PackCommand(TestAsset testAsset, string relativePathToProject = null)
+            : base(testAsset, "Pack", relativePathToProject)
+        {
+
         }
 
         public string GetIntermediateNuspecPath(string packageId = null, string configuration = "Debug", string packageVersion = "1.0.0")
@@ -30,7 +37,7 @@ public string GetNuGetPackage(string packageId = null, string configuration = "D
                 packageId = Path.GetFileNameWithoutExtension(ProjectFile);
             }
 
-            return Path.Combine(GetOutputDirectory(null, configuration).FullName, $"{packageId}.{packageVersion}.nupkg");
+            return Path.Combine(GetPackageDirectory(configuration).FullName, $"{packageId}.{packageVersion}.nupkg");
         }
     }
 }

src/Tests/Microsoft.NET.TestFramework/OutputPathCalculator.cs

@@ -195,5 +195,17 @@ public string GetIntermediateDirectory(string targetFramework = null, string con
             string output = System.IO.Path.Combine(Path.GetDirectoryName(ProjectPath), "obj", configuration, targetFramework, runtimeIdentifier);
             return output;
         }
+
+        public string GetPackageDirectory(string configuration = "Debug")
+        {
+            if (UsesArtifactsFolder())
+            {
+                return System.IO.Path.Combine(Path.GetDirectoryName(ProjectPath), "artifacts", "package", configuration.ToLowerInvariant());
+            }
+            else
+            {
+                return System.IO.Path.Combine(Path.GetDirectoryName(ProjectPath), "bin", configuration);
+            }
+        }
     }
 }