Address review comments

Author: Youssef1313

test/Microsoft.NET.Build.Tests/ReferenceExeTests.cs

@@ -381,26 +381,25 @@ public void SelfContainedExecutableCannotBeReferencedByNonSelfContainedMTPTestPr
                 SelfContained = "true",
             };
 
-            var testAssetSelfContained = _testAssetsManager.CreateTestProject(testConsoleProjectSelfContained);
-
             var mtpNotSelfContained = new TestProject("MTPTestProject")
             {
                 TargetFrameworks = ToolsetInfo.CurrentTargetFramework,
                 IsExe = true,
-                IsTestProject = true,
             };
 
+            mtpNotSelfContained.AdditionalProperties["IsTestProject"] = "true";
+
             if (setIsTestingPlatformApplicationEarly)
             {
-                mtpNotSelfContained.IsTestingPlatformApplication = true;
+                mtpNotSelfContained.AdditionalProperties["IsTestingPlatformApplication"] = "true";
             }
 
+            mtpNotSelfContained.ReferencedProjects.Add(testConsoleProjectSelfContained);
+
             var testAssetMTP = _testAssetsManager.CreateTestProject(mtpNotSelfContained);
 
             var mtpProjectDirectory = Path.Combine(testAssetMTP.Path, "MTPTestProject");
-            Assert.True(Directory.Exists(mtpProjectDirectory), $"Expected directory {mtpProjectDirectory} to exist.");
-            Assert.True(File.Exists(Path.Combine(mtpProjectDirectory, "MTPTestProject.csproj")), $"Expected file MTPTestProject.csproj to exist in {mtpProjectDirectory}.");
-
+            
             if (!setIsTestingPlatformApplicationEarly)
             {
                 File.WriteAllText(Path.Combine(mtpProjectDirectory, "Directory.Build.targets"), """
@@ -412,12 +411,6 @@ public void SelfContainedExecutableCannotBeReferencedByNonSelfContainedMTPTestPr
                     """);
             }
 
-            new DotnetCommand(Log, "add", "reference", Path.Combine(testAssetSelfContained.Path, testConsoleProjectSelfContained.Name))
-                .WithWorkingDirectory(mtpProjectDirectory)
-                .Execute()
-                .Should()
-                .Pass();
-
             var result = new BuildCommand(Log, mtpProjectDirectory).Execute();
             result.Should().HaveStdOutContaining("NETSDK1151").And.ExitWith(1);
         }
@@ -437,29 +430,26 @@ public void MTPNonSelfContainedExecutableCannotBeReferencedBySelfContained(bool
                 SelfContained = "true",
             };
 
-            var testAssetSelfContained = _testAssetsManager.CreateTestProject(testConsoleProjectSelfContained);
-
             var mtpNotSelfContained = new TestProject("MTPTestProject")
             {
                 TargetFrameworks = ToolsetInfo.CurrentTargetFramework,
                 IsExe = true,
-                IsTestProject = true,
             };
 
+            mtpNotSelfContained.AdditionalProperties["IsTestProject"] = "true";
+
             if (setIsTestingPlatformApplicationEarly)
             {
-                mtpNotSelfContained.IsTestingPlatformApplication = true;
+                mtpNotSelfContained.AdditionalProperties["IsTestingPlatformApplication"] = "true";
             }
 
-            var testAssetMTP = _testAssetsManager.CreateTestProject(mtpNotSelfContained);
-
-            var mtpProjectDirectory = Path.Combine(testAssetMTP.Path, mtpNotSelfContained.Name);
-            Assert.True(Directory.Exists(mtpProjectDirectory), $"Expected directory {mtpProjectDirectory} to exist.");
-            Assert.True(File.Exists(Path.Combine(mtpProjectDirectory, "MTPTestProject.csproj")), $"Expected file MTPTestProject.csproj to exist in {mtpProjectDirectory}.");
+            testConsoleProjectSelfContained.ReferencedProjects.Add(mtpNotSelfContained);
 
+            var testAssetSelfContained = _testAssetsManager.CreateTestProject(testConsoleProjectSelfContained);
+            
             if (!setIsTestingPlatformApplicationEarly)
             {
-                File.WriteAllText(Path.Combine(mtpProjectDirectory, "Directory.Build.targets"), """
+                File.WriteAllText(Path.Combine(testAssetSelfContained.TestRoot, mtpNotSelfContained.Name, "Directory.Build.targets"), """
                     <Project>
                         <PropertyGroup>
                             <IsTestingPlatformApplication>true</IsTestingPlatformApplication>
@@ -469,14 +459,6 @@ public void MTPNonSelfContainedExecutableCannotBeReferencedBySelfContained(bool
             }
 
             var consoleAppDirectory = Path.Combine(testAssetSelfContained.Path, testConsoleProjectSelfContained.Name);
-            Assert.True(Directory.Exists(consoleAppDirectory), $"Expected directory {consoleAppDirectory} to exist.");
-            Assert.True(File.Exists(Path.Combine(consoleAppDirectory, "ConsoleApp.csproj")), $"Expected file ConsoleApp.csproj to exist in {consoleAppDirectory}.");
-
-            new DotnetCommand(Log, "add", "reference", Path.Combine(testAssetMTP.Path, mtpNotSelfContained.Name))
-                .WithWorkingDirectory(consoleAppDirectory)
-                .Execute()
-                .Should()
-                .Pass();
 
             var result = new BuildCommand(Log, consoleAppDirectory).Execute();
             result.Should().HaveStdOutContaining("NETSDK1150").And.ExitWith(1);
@@ -534,20 +516,19 @@ public void MTPCanBeBuiltAsSelfContained(bool setIsTestingPlatformApplicationEar
             {
                 TargetFrameworks = ToolsetInfo.CurrentTargetFramework,
                 IsExe = true,
-                IsTestProject = true,
                 SelfContained = "true",
             };
 
+            mtpSelfContained.AdditionalProperties["IsTestProject"] = "true";
+
             if (setIsTestingPlatformApplicationEarly)
             {
-                mtpSelfContained.IsTestingPlatformApplication = true;
+                mtpSelfContained.AdditionalProperties["IsTestingPlatformApplication"] = "true";
             }
 
             var testAssetMTP = _testAssetsManager.CreateTestProject(mtpSelfContained);
 
             var mtpProjectDirectory = Path.Combine(testAssetMTP.Path, mtpSelfContained.Name);
-            Assert.True(Directory.Exists(mtpProjectDirectory), $"Expected directory {mtpProjectDirectory} to exist.");
-            Assert.True(File.Exists(Path.Combine(mtpProjectDirectory, "MTPTestProject.csproj")), $"Expected file MTPTestProject.csproj to exist in {mtpProjectDirectory}.");
 
             if (!setIsTestingPlatformApplicationEarly)
             {

test/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs

@@ -34,11 +34,6 @@ public TestProject([CallerMemberName] string? name = null)
         /// </summary>
         public bool IsWinExe { get; set; }
 
-        public bool IsTestingPlatformApplication { get; set; }
-
-        public bool IsTestProject { get; set; }
-
-
         public string? ProjectSdk { get; set; }
 
         /// <summary>
@@ -297,16 +292,6 @@ internal void Create(TestAsset targetTestAsset, string testProjectsSourceFolder)
                 propertyGroup?.Element(ns + "OutputType")?.SetValue("WinExe");
             }
 
-            if (IsTestProject)
-            {
-                propertyGroup?.Add(new XElement(ns + "IsTestProject", "true"));
-            }
-
-            if (IsTestingPlatformApplication)
-            {
-                propertyGroup?.Add(new XElement(ns + "IsTestingPlatformApplication", "true"));
-            }
-
             if (SelfContained != "")
             {
                 propertyGroup?.Add(new XElement(ns + "SelfContained", string.Equals(SelfContained, "true", StringComparison.OrdinalIgnoreCase) ? "true" : "false"));