Move property recording .txt to root test location

Author: nagilson

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

@@ -260,7 +260,7 @@ private static void ValidateProperties(TestAsset testAsset, TestProject testProj
                 expectedRuntimeIdentifier = Path.GetFileName(Directory.GetDirectories(dir).Single());
             }
 
-            var properties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework: targetFramework, runtimeIdentifier: expectedRuntimeIdentifier);
+            var properties = testProject.GetPropertyValues(testAsset.TestRoot, testAsset.TestProject.Name);
             if (expectSelfContained)
             {
                 properties["SelfContained"].ToLowerInvariant().Should().Be("true");

src/Tests/Microsoft.NET.TestFramework/ProjectConstruction/TestProject.cs

@@ -420,7 +420,7 @@ public class {safeThisName}Class
 {propertiesElements}
     </ItemGroup>
     <WriteLinesToFile
-      File=`$(IntermediateOutputPath)\PropertyValues.txt`
+      File=`{targetFolder}\PropertyValues.txt`
       Lines=`@(LinesToWrite)`
       Overwrite=`true`
       Encoding=`Unicode`
@@ -456,17 +456,11 @@ public void RecordProperties(params string[] propertyNames)
             PropertiesToRecord.AddRange(propertyNames);
         }
 
-        public Dictionary<string, string> GetPropertyValues(string testRoot, string configuration = "Debug", string targetFramework = null, string runtimeIdentifier = null)
+        public Dictionary<string, string> GetPropertyValues(string testRoot, [CallerMemberNameAttribute] string testFolderName = "")
         {
             var propertyValues = new Dictionary<string, string>();
 
-            string intermediateOutputPath = Path.Combine(testRoot, Name, "obj", configuration, targetFramework ?? TargetFrameworks);
-            if (!string.IsNullOrEmpty(runtimeIdentifier))
-            {
-                intermediateOutputPath = Path.Combine(intermediateOutputPath, runtimeIdentifier);
-            }
-
-            foreach (var line in File.ReadAllLines(Path.Combine(intermediateOutputPath, "PropertyValues.txt")))
+            foreach (var line in File.ReadAllLines(Path.Combine(testRoot, testFolderName, "PropertyValues.txt")))
             {
                 int colonIndex = line.IndexOf(':');
                 if (colonIndex > 0)