Update tests for artifacts output format

dotnet · dsplaisted · Mar 31, 2023 · Dec 16, 2022 · Dec 16, 2022 · Jan 6, 2023
commit deb72ce6fefda29dad75a0fa1b3285298f8108ed
diff --git a/src/Assets/TestProjects/AllResourcesInSatellite/AllResourcesInSatellite.csproj b/src/Assets/TestProjects/AllResourcesInSatellite/AllResourcesInSatellite.csproj
@@ -8,15 +8,6 @@
     <PublicSign>true</PublicSign>
   </PropertyGroup>
 
-  <!-- 
-    Also target desktop on Windows to get more test coverage:
-      * Desktop requires satellites to have same public key as parent whereas coreclr does not. 
-      * Reference path handling of satellite assembly generation used to be incorrect for desktop.
-   -->
-  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform(`Windows`))">
-    <TargetFrameworks>$(TargetFrameworks);net46</TargetFrameworks>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
     <PublicSign>false</PublicSign>
   </PropertyGroup>

diff --git a/...TestProjects/AllResourcesInSatelliteDisableVersionGenerate/AllResourcesInSatellite.csproj b/...TestProjects/AllResourcesInSatelliteDisableVersionGenerate/AllResourcesInSatellite.csproj
@@ -9,15 +9,6 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
-  <!-- 
-    Also target desktop on Windows to get more test coverage:
-      * Desktop requires satellites to have same public key as parent whereas coreclr does not. 
-      * Reference path handling of satellite assembly generation used to be incorrect for desktop.
-   -->
-  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform(`Windows`))">
-    <TargetFrameworks>$(TargetFrameworks);net46</TargetFrameworks>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
     <PublicSign>false</PublicSign>
   </PropertyGroup>

diff --git a/src/Assets/TestProjects/x64SolutionBuild/x64SolutionBuild.csproj b/src/Assets/TestProjects/x64SolutionBuild/x64SolutionBuild.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" />
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" />
+
   <Target Name="CheckPlatform" BeforeTargets="Build">
     <Error Condition="'$(Platform)' != 'x64'" Text="This test project expects to be built via solution and have Platform=x64" />
   </Target>

diff --git a/src/Tests/Microsoft.NET.Build.Tests/AppHostTests.cs b/src/Tests/Microsoft.NET.Build.Tests/AppHostTests.cs
@@ -78,7 +78,7 @@ public void It_builds_a_runnable_apphost_by_default(string targetFramework)
                 .Should()
                 .Pass();
 
-            var outputDirectory = buildCommand.GetOutputDirectory(targetFramework);
+            var outputDirectory = buildCommand.GetOutputDirectory();
             var hostExecutable = $"HelloWorld{Constants.ExeSuffix}";
             outputDirectory.Should().OnlyHaveFiles(GetExpectedFilesFromBuild(testAsset, targetFramework));
             new RunExeCommand(Log, Path.Combine(outputDirectory.FullName, hostExecutable))
@@ -270,19 +270,19 @@ public void It_uses_an_apphost_based_on_platform_target(string target)
 
             var testAsset = _testAssetsManager
                 .CopyTestAsset("HelloWorld", identifier: target)
+                .WithTargetFramework(targetFramework)
                 .WithSource();
 
             var buildCommand = new BuildCommand(testAsset);
             buildCommand
                 .Execute(new string[] {
-                    $"/p:TargetFramework={targetFramework}",
                     $"/p:PlatformTarget={target}",
                     $"/p:NETCoreSdkRuntimeIdentifier={EnvironmentInfo.GetCompatibleRid(targetFramework)}"
                 })
                 .Should()
                 .Pass();
 
-            var apphostPath = Path.Combine(buildCommand.GetOutputDirectory(targetFramework).FullName, "HelloWorld.exe");
+            var apphostPath = Path.Combine(buildCommand.GetOutputDirectory().FullName, "HelloWorld.exe");
             if (target == "x86")
             {
                 IsPE32(apphostPath).Should().BeTrue();
@@ -321,7 +321,7 @@ public void AppHost_contains_resources_from_the_managed_dll()
                 .Should()
                 .Pass();
 
-            var outputDirectory = buildCommand.GetOutputDirectory(targetFramework, runtimeIdentifier: runtimeIdentifier);
+            var outputDirectory = buildCommand.GetOutputDirectory(runtimeIdentifier: runtimeIdentifier);
             outputDirectory.Should().HaveFiles(new[] { testProject.Name + ".exe" });
 
             string apphostPath = Path.Combine(outputDirectory.FullName, testProject.Name + ".exe");
@@ -406,7 +406,7 @@ public void It_retries_on_failure_to_create_apphost()
                 .Should()
                 .Pass();
 
-            var intermediateDirectory = buildCommand.GetIntermediateDirectory(targetFramework: ToolsetInfo.CurrentTargetFramework).FullName;
+            var intermediateDirectory = buildCommand.GetIntermediateDirectory().FullName;
 
             File.SetLastWriteTimeUtc(
                 Path.Combine(

diff --git a/src/Tests/Microsoft.NET.Build.Tests/DepsFileSkipTests.cs b/src/Tests/Microsoft.NET.Build.Tests/DepsFileSkipTests.cs
@@ -138,8 +138,7 @@ public void ResourceAssetFromPackageCanBeSkipped()
                .Should()
                .Pass();
 
-            string outputFolder = buildCommand.GetOutputDirectory(testProject.TargetFrameworks,
-                runtimeIdentifier: testProject.RuntimeIdentifier).FullName;
+            string outputFolder = buildCommand.GetOutputDirectory(runtimeIdentifier: testProject.RuntimeIdentifier).FullName;
 
             string depsJsonPath = Path.Combine(outputFolder, $"{testProject.Name}.deps.json");
 
@@ -178,8 +177,7 @@ private void TestSkippingFile(TestProject testProject, string filenameToSkip, st
                .Should()
                .Pass();
 
-            string outputFolder = buildCommand.GetOutputDirectory(testProject.TargetFrameworks,
-                runtimeIdentifier: testProject.RuntimeIdentifier).FullName;
+            string outputFolder = buildCommand.GetOutputDirectory(runtimeIdentifier: testProject.RuntimeIdentifier).FullName;
 
             string depsJsonPath = Path.Combine(outputFolder, $"{testProject.Name}.deps.json");
 

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs
@@ -60,7 +60,7 @@ public void Multiple_frameworks_are_written_to_runtimeconfig_when_there_are_mult
                 .Should()
                 .Pass();
 
-            var outputDirectory = buildCommand.GetOutputDirectory(testProject.TargetFrameworks);
+            var outputDirectory = buildCommand.GetOutputDirectory();
 
             string runtimeConfigFile = Path.Combine(outputDirectory.FullName, testProject.Name + ".runtimeconfig.json");
             var runtimeFrameworkNames = GetRuntimeFrameworks(runtimeConfigFile);
@@ -107,9 +107,9 @@ public void Multiple_frameworks_are_written_to_runtimeconfig_for_self_contained_
                 .Should()
                 .Pass();
 
-            DirectoryInfo outputDirectory = buildCommand.GetOutputDirectory(testProject.TargetFrameworks);
+            DirectoryInfo outputDirectory = buildCommand.GetOutputDirectory(runtimeIdentifier: testProject.RuntimeIdentifier);
 
-            string runtimeConfigFile = Path.Combine(outputDirectory.FullName, testProject.RuntimeIdentifier, testProject.Name + ".runtimeconfig.json");
+            string runtimeConfigFile = Path.Combine(outputDirectory.FullName, testProject.Name + ".runtimeconfig.json");
             List<string> includedFrameworkNames = GetIncludedFrameworks(runtimeConfigFile);
             if (shouldHaveIncludedFrameworks)
             {
@@ -173,7 +173,7 @@ public void DuplicateFrameworksAreNotWrittenToRuntimeConfigWhenThereAreDifferent
                 .Should()
                 .Pass();
 
-            var outputDirectory = buildCommand.GetOutputDirectory(testProject.TargetFrameworks);
+            var outputDirectory = buildCommand.GetOutputDirectory();
 
             string runtimeConfigFile = Path.Combine(outputDirectory.FullName, testProject.Name + ".runtimeconfig.json");
             var runtimeFrameworkNames = GetRuntimeFrameworks(runtimeConfigFile);
@@ -702,7 +702,7 @@ public void TransitiveFrameworkReferenceFromProjectReference()
                 .Should()
                 .Pass();
 
-            var outputDirectory = buildCommand.GetOutputDirectory(testProject.TargetFrameworks);
+            var outputDirectory = buildCommand.GetOutputDirectory();
 
             string runtimeConfigFile = Path.Combine(outputDirectory.FullName, testProject.Name + ".runtimeconfig.json");
             var runtimeFrameworkNames = GetRuntimeFrameworks(runtimeConfigFile);
@@ -712,7 +712,7 @@ public void TransitiveFrameworkReferenceFromProjectReference()
             runtimeFrameworkNames.Should().BeEquivalentTo("Microsoft.AspNetCore.App", "Microsoft.NETCore.App");
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/NuGet/Home/issues/12323")]
         public void TransitiveFrameworkReferenceFromPackageReference()
         {
             var referencedPackage = new TestProject()
@@ -755,7 +755,7 @@ public void TransitiveFrameworkReferenceFromPackageReference()
                 .Should()
                 .Pass();
 
-            var outputDirectory = buildCommand.GetOutputDirectory(testProject.TargetFrameworks);
+            var outputDirectory = buildCommand.GetOutputDirectory();
 
             string runtimeConfigFile = Path.Combine(outputDirectory.FullName, testProject.Name + ".runtimeconfig.json");
             var runtimeFrameworkNames = GetRuntimeFrameworks(runtimeConfigFile);
@@ -1005,7 +1005,7 @@ private void TestFrameworkReferenceProfiles(
 
             if (selfContained)
             {
-                var outputDirectory = buildCommand.GetOutputDirectory(testProject.TargetFrameworks, runtimeIdentifier: testProject.RuntimeIdentifier);
+                var outputDirectory = buildCommand.GetOutputDirectory(runtimeIdentifier: testProject.RuntimeIdentifier);
 
                 //  The output directory should have the DLLs which are not referenced at compile time but are
                 //  still part of the shared framework.
@@ -1110,13 +1110,13 @@ private ResolvedVersionInfo GetResolvedVersions(TestProject testProject,
                 testAsset = testAsset.WithProjectChanges(projectChanges);
             }
 
-            var command = new MSBuildCommand(Log, "WriteResolvedVersions", Path.Combine(testAsset.TestRoot, testProject.Name));
+            var command = new MSBuildCommand(testAsset, "WriteResolvedVersions");
 
             command.ExecuteWithoutRestore()
                 .Should()
                 .Pass();
 
-            var outputDirectory = command.GetOutputDirectory(testProject.TargetFrameworks, runtimeIdentifier: testProject.RuntimeIdentifier);
+            var outputDirectory = command.GetOutputDirectory(runtimeIdentifier: testProject.RuntimeIdentifier);
             var resolvedVersions = ResolvedVersionInfo.ParseFrom(Path.Combine(outputDirectory.FullName, "resolvedversions.txt"));
 
             return resolvedVersions;

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeHaveAPackageReferenceWithAliases.cs
@@ -13,6 +13,7 @@
 using System.Runtime.CompilerServices;
 using Xunit;
 using Xunit.Abstractions;
+using static System.Net.WebRequestMethods;
 
 namespace Microsoft.NET.Build.Tests
 {
@@ -22,7 +23,7 @@ public class GivenThatWeHaveAPackageReferenceWithAliases : SdkTest
         public GivenThatWeHaveAPackageReferenceWithAliases(ITestOutputHelper log) : base(log)
         { }
 
-        [RequiresMSBuildVersionFact("16.8.0")]
+        [RequiresMSBuildVersionFact("16.8.0", Skip = "https://github.com/NuGet/Home/issues/12323")]
         public void CanBuildProjectWithPackageReferencesWithConflictingTypes()
         {
             var targetFramework = ToolsetInfo.CurrentTargetFramework;
@@ -60,7 +61,7 @@ public void CanBuildProjectWithPackageReferencesWithConflictingTypes()
                 .Pass();
         }
 
-        [RequiresMSBuildVersionFact("16.8.0")]
+        [RequiresMSBuildVersionFact("16.8.0", Skip = "https://github.com/NuGet/Home/issues/12323")]
         public void CanBuildProjectWithMultiplePackageReferencesWithAliases()
         {
             var targetFramework = ToolsetInfo.CurrentTargetFramework;
@@ -104,7 +105,7 @@ public void CanBuildProjectWithMultiplePackageReferencesWithAliases()
                 .Pass();
         }
 
-        [RequiresMSBuildVersionFact("16.8.0")]
+        [RequiresMSBuildVersionFact("16.8.0", Skip = "https://github.com/NuGet/Home/issues/12323")]
         public void CanBuildProjectWithAPackageReferenceWithMultipleAliases()
         {
             var targetFramework = ToolsetInfo.CurrentTargetFramework;

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantAllResourcesInSatellite.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantAllResourcesInSatellite.cs
@@ -44,6 +44,14 @@ internal static void TestSatelliteResources(
                 testAsset = testAsset.WithProjectChanges(projectChanges);
             }
 
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                //  Also target desktop on Windows to get more test coverage:
+                //    * Desktop requires satellites to have same public key as parent whereas coreclr does not.
+                //    * Reference path handling of satellite assembly generation used to be incorrect for desktop.
+                testAsset = testAsset.WithTargetFrameworks($"{ToolsetInfo.CurrentTargetFramework};net46");
+            }
+
             var buildCommand = new BuildCommand(testAsset);
 
             if (setup != null)

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantRuntimeConfigInBuiltProjectOutputGroup.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantRuntimeConfigInBuiltProjectOutputGroup.cs
@@ -32,9 +32,7 @@ public void It_has_target_path_and_final_outputput_path_metadata(string targetFr
                 .WithTargetFramework(targetFramework);
 
             var command = new GetValuesCommand(
-                Log,
-                testAsset.TestRoot,
-                targetFramework,
+                testAsset,
                 "BuiltProjectOutputGroupOutput",
                 GetValuesCommand.ValueType.Item)
             {
@@ -44,7 +42,8 @@ public void It_has_target_path_and_final_outputput_path_metadata(string targetFr
 
             command.Execute().Should().Pass();
 
-            var outputDirectory = command.GetOutputDirectory(targetFramework);
+            var outputDirectory = command.GetOutputDirectory();
+
             var runtimeConfigFile = outputDirectory.File("HelloWorld.runtimeconfig.json");
             var (_, metadata) = command.GetValuesWithMetadata().Single(i => i.value == runtimeConfigFile.FullName);
 
@@ -65,12 +64,14 @@ public void It_has_runtime_config_properties_after_partial_build()
             };
             var testAsset = _testAssetsManager.CreateTestProject(testProject, testProject.Name);
 
-            new BuildCommand(testAsset)
+            var buildCommand = new BuildCommand(testAsset);
+
+            buildCommand
                 .Execute("/property:Configuration=Release")
                 .Should()
                 .Pass();
 
-            var configFile = Path.Combine(testAsset.TestRoot, testProject.Name, "bin", "Release", testProject.TargetFrameworks, testProject.RuntimeIdentifier, testProject.Name + ".runtimeconfig.json");
+            var configFile = Path.Combine(buildCommand.GetOutputDirectory(configuration: "Release").FullName, testProject.Name + ".runtimeconfig.json");
 
             File.Exists(configFile).Should().BeTrue();
             File.ReadAllText(configFile).Should().NotContain("\"System.Runtime.TieredCompilation\"");
@@ -120,12 +121,14 @@ public void It_updates_runtime_config_properties_after_partial_build()
                 propertyGroup.Add(new XElement(ns + "ThreadPoolMinThreads", "3"));
             });
 
-            new BuildCommand(testAsset)
+            var buildCommand = new BuildCommand(testAsset);
+
+            buildCommand
                 .Execute("/property:Configuration=Release")
                 .Should()
                 .Pass();
 
-            var configFile = Path.Combine(testAsset.TestRoot, testProject.Name, "bin", "Release", testProject.TargetFrameworks, testProject.RuntimeIdentifier, testProject.Name + ".runtimeconfig.json");
+            var configFile = Path.Combine(buildCommand.GetOutputDirectory(configuration: "Release").FullName, testProject.Name + ".runtimeconfig.json");
 
             File.Exists(configFile).Should().BeTrue();
             File.ReadAllText(configFile).Should().Contain("\"System.Runtime.TieredCompilation\": true");

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantSatelliteAssembliesHaveassemblyVersion.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantSatelliteAssembliesHaveassemblyVersion.cs
@@ -11,6 +11,7 @@
 using FluentAssertions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace Microsoft.NET.Build.Tests
 {
@@ -28,6 +29,14 @@ private void RestoreAndBuildTestAssets([CallerMemberName] string callingMethod =
               .CopyTestAsset("AllResourcesInSatelliteDisableVersionGenerate", callingMethod)
               .WithSource();
 
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                //  Also target desktop on Windows to get more test coverage:
+                //    * Desktop requires satellites to have same public key as parent whereas coreclr does not.
+                //    * Reference path handling of satellite assembly generation used to be incorrect for desktop.
+                testAsset = testAsset.WithTargetFrameworks($"{ToolsetInfo.CurrentTargetFramework};net46");
+            }
+
             var buildCommand = new BuildCommand(testAsset);
             buildCommand
                 .Execute()

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAComServerLibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAComServerLibrary.cs
@@ -33,7 +33,7 @@ public void It_copies_the_comhost_to_the_output_directory()
                 .Should()
                 .Pass();
 
-            var outputDirectory = buildCommand.GetOutputDirectory(ToolsetInfo.CurrentTargetFramework);
+            var outputDirectory = buildCommand.GetOutputDirectory();
 
             outputDirectory.Should().OnlyHaveFiles(new[] {
                 "ComServer.dll",
@@ -69,7 +69,7 @@ public void It_generates_a_regfree_com_manifest_when_requested()
                 .Should()
                 .Pass();
 
-            var outputDirectory = buildCommand.GetOutputDirectory(ToolsetInfo.CurrentTargetFramework);
+            var outputDirectory = buildCommand.GetOutputDirectory();
 
             outputDirectory.Should().OnlyHaveFiles(new[] {
                 "ComServer.dll",
@@ -102,7 +102,7 @@ public void It_embeds_the_clsidmap_in_the_comhost_when_rid_specified(string rid)
                 .Should()
                 .Pass();
 
-            var outputDirectory = buildCommand.GetOutputDirectory(ToolsetInfo.CurrentTargetFramework, runtimeIdentifier: rid);
+            var outputDirectory = buildCommand.GetOutputDirectory(runtimeIdentifier: rid);
 
             outputDirectory.Should().OnlyHaveFiles(new[] {
                 "ComServer.dll",

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACrossTargetedLibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACrossTargetedLibrary.cs
@@ -24,16 +24,16 @@ public GivenThatWeWantToBuildACrossTargetedLibrary(ITestOutputHelper log) : base
         public void It_builds_nondesktop_library_successfully_on_all_platforms()
         {
             var testAsset = _testAssetsManager
-                .CopyTestAsset("CrossTargeting")
+                .CopyTestAsset(Path.Combine("CrossTargeting", "NetStandardAndNetCoreApp"))
                 .WithSource();
 
-            var buildCommand = new BuildCommand(testAsset, "NetStandardAndNetCoreApp");
+            var buildCommand = new BuildCommand(testAsset);
             buildCommand
                 .Execute()
                 .Should()
                 .Pass();
 
-            var outputDirectory = buildCommand.GetOutputDirectory(targetFramework: "");
+            var outputDirectory = new DirectoryInfo(Path.Combine(buildCommand.ProjectRootPath, "bin", "Debug"));
             outputDirectory.Should().OnlyHaveFiles(new[] {
                 $"{ToolsetInfo.CurrentTargetFramework}/NetStandardAndNetCoreApp.dll",
                 $"{ToolsetInfo.CurrentTargetFramework}/NetStandardAndNetCoreApp.pdb",
@@ -61,7 +61,7 @@ public void It_builds_desktop_library_successfully_on_windows()
                 .Should()
                 .Pass();
 
-            var outputDirectory = buildCommand.GetOutputDirectory(targetFramework: "");
+            var outputDirectory = new DirectoryInfo(Path.Combine(buildCommand.ProjectRootPath, "bin", "Debug"));
             outputDirectory.Should().OnlyHaveFiles(new[] {
                 "net40/DesktopAndNetStandard.dll",
                 "net40/DesktopAndNetStandard.pdb",