Respond to ProduceReferenceAssembly default changing to true

.NET projects now produce a reference assembly by default, per a change in MSBuild's common targets. This commit updates a test on the SDK side in response to that change.
dotnet · Apr 13, 2023 · 9ded50a · 9ded50a
1 parent 458cd31
commit 9ded50a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets
@@ -239,11 +239,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <AppendTargetFrameworkToOutputPath Condition="'$(AppendTargetFrameworkToOutputPath)' == ''">true</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <ProduceReferenceAssembly Condition="'$(ProduceReferenceAssembly)' == '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0)) and ('$(ProduceOnlyReferenceAssembly)' != 'true') and '$(MSBuildProjectExtension)' != '.fsproj'" >true</ProduceReferenceAssembly>
-    <ProduceReferenceAssembly Condition="'$(ProduceReferenceAssembly)' == '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 7.0)) and ('$(ProduceOnlyReferenceAssembly)' != 'true') and '$(MSBuildProjectExtension)' == '.fsproj'" >true</ProduceReferenceAssembly>
-  </PropertyGroup>
-
   <!--
     Append $(TargetFramework) directory to output and intermediate paths to prevent bin clashes between
     targets.

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToProduceReferenceAssembly.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToProduceReferenceAssembly.cs
@@ -9,7 +9,6 @@
 using Xunit.Abstractions;
 using Microsoft.NET.TestFramework.Assertions;
 using Microsoft.NET.TestFramework.ProjectConstruction;
-using System.Collections.Generic;
 
 namespace Microsoft.NET.Build.Tests
 {
@@ -18,26 +17,35 @@ public class GivenThatWeWantToProduceReferenceAssembly : SdkTest
         public GivenThatWeWantToProduceReferenceAssembly(ITestOutputHelper log) : base(log)
         {}
 
-        [RequiresMSBuildVersionTheory("16.8.0")]
-        [InlineData("netcoreapp3.1", false)]
-        [InlineData(ToolsetInfo.CurrentTargetFramework, true)]
-        public void It_produces_ref_assembly_for_appropriate_frameworks(string targetFramework, bool expectedExists)
+        [RequiresMSBuildVersionTheory("17.7.0")]
+        [InlineData("netcoreapp3.1", ".csproj")]
+        [InlineData("net5.0", ".csproj")]
+        [InlineData("net5.0", ".fsproj")]
+        [InlineData("net6.0", ".csproj")]
+        [InlineData("net6.0", ".fsproj")]
+        [InlineData("net7.0", ".csproj")]
+        [InlineData("net7.0", ".fsproj")]
+#pragma warning disable xUnit1025 // InlineData duplicates
+        [InlineData(ToolsetInfo.CurrentTargetFramework, ".csproj")]
+        [InlineData(ToolsetInfo.CurrentTargetFramework, ".fsproj")]
+#pragma warning restore xUnit1025 // InlineData duplicates
+        public void It_produces_ref_assembly_for_appropriate_frameworks(string targetFramework, string extension)
         {
-            TestProject testProject = new TestProject()
+            TestProject testProject = new()
             {
                 Name = "ProduceRefAssembly",
                 IsExe = true,
                 TargetFrameworks = targetFramework
             };
 
-            var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework);
+            var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework, targetExtension: extension);
 
             var buildCommand = new BuildCommand(testAsset);
             buildCommand.Execute()
                 .Should()
                 .Pass();
             var filePath = Path.Combine(testAsset.Path, testProject.Name, "obj", "Debug", targetFramework, "ref", $"{testProject.Name}.dll");
-            File.Exists(filePath).Should().Be(expectedExists);
+            File.Exists(filePath).Should().Be(true);
         }
     }
 }