From ec4f41e2b51625705f283cb59b0d04741edcee79 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Wed, 12 May 2021 17:12:57 -0700
Subject: [PATCH 1/2] Fix test projects which reference self-contained Exes

Fix #17579
---
 .../targets/Microsoft.NET.Sdk.targets         |  7 ++++
 .../ReferenceExeTests.cs                      | 36 +++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
index d31b691c3638..48041d8f91d0 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
@@ -1060,6 +1060,13 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ShouldBeValidatedAsExecutableReference>false</ShouldBeValidatedAsExecutableReference>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(IsTestProject)' == 'true' And '$(ValidateExecutableReferencesMatchSelfContained)' == ''">
+    <!-- Don't generate an error if a test project references a self-contained Exe.  Test projects
+         use an OutputType of Exe but will usually call APIs in a referenced Exe rather than try
+         to run it. -->
+    <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
+  </PropertyGroup>
+
   <UsingTask TaskName="ValidateExecutableReferences" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
 
   <Target Name="ValidateExecutableReferences"
diff --git a/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs b/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs
index 7b0c1bc44efe..8a2a25053eea 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs
@@ -259,5 +259,41 @@ public void ReferencedExeCanRunWhenPublishedWithTrimming()
 
             RunTest();
         }
+
+        [Theory]
+        [InlineData("xunit")]
+        [InlineData("mstest")]
+        public void TestProjectCanReferenceExe(string testTemplateName)
+        {
+            var testConsoleProject = new TestProject("ConsoleApp")
+            {
+                IsExe = true,
+                TargetFrameworks = "net5.0",
+                RuntimeIdentifier = EnvironmentInfo.GetCompatibleRid()
+            };
+
+            var testAsset = _testAssetsManager.CreateTestProject(testConsoleProject, identifier: testTemplateName);
+
+            var testProjectDirectory = Path.Combine(testAsset.TestRoot, "TestProject");
+            Directory.CreateDirectory(testProjectDirectory);
+
+            new DotnetCommand(Log, "new", testTemplateName)
+                .WithWorkingDirectory(testProjectDirectory)
+                .Execute()
+                .Should()
+                .Pass();
+
+            new DotnetCommand(Log, "add", "reference", $@"..\{testConsoleProject.Name}")
+                .WithWorkingDirectory(testProjectDirectory)
+                .Execute()
+                .Should()
+                .Pass();
+
+            new BuildCommand(Log, testProjectDirectory)
+                .Execute()
+                .Should()
+                .Pass();
+
+        }
     }
 }

From 6ae5d7581f2332a960118c38112b01e9dc082fd1 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 13 May 2021 09:16:48 -0700
Subject: [PATCH 2/2] Fix path in test

---
 src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs b/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs
index 8a2a25053eea..4a03c4709444 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs
@@ -283,7 +283,7 @@ public void TestProjectCanReferenceExe(string testTemplateName)
                 .Should()
                 .Pass();
 
-            new DotnetCommand(Log, "add", "reference", $@"..\{testConsoleProject.Name}")
+            new DotnetCommand(Log, "add", "reference", ".." + Path.DirectorySeparatorChar + testConsoleProject.Name)
                 .WithWorkingDirectory(testProjectDirectory)
                 .Execute()
                 .Should()