Move property values to non rid folder

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, testAsset.TestProject.Name);
+            var properties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework: targetFramework);
             if (expectSelfContained)
             {
                 properties["SelfContained"].ToLowerInvariant().Should().Be("true");

src/Tests/Microsoft.NET.Publish.Tests/RuntimeIdentifiersTests.cs

@@ -231,7 +231,7 @@ public void PublishRuntimeIdentifierSetsRuntimeIdentifierAndDoesOrDoesntOverride
                 .Pass();
 
             string expectedRid = runtimeIdentifierIsGlobal ? runtimeIdentifier : publishRuntimeIdentifier;
-            var properties = testProject.GetPropertyValues(testAsset.TestRoot);
+            var properties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework: tfm);
             var finalRid = properties["RuntimeIdentifier"];
 
             Assert.True(finalRid == expectedRid); // This assert is theoretically worthless as the above code will fail if the RID path is wrong.
@@ -260,7 +260,7 @@ public void PublishRuntimeIdentifierOverridesUseCurrentRuntime()
                 .Should()
                 .Pass();
 
-            var properties = testProject.GetPropertyValues(testAsset.TestRoot);
+            var properties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework: tfm);
             var finalRid = properties["RuntimeIdentifier"];
             var ucrRid = properties["NETCoreSdkPortableRuntimeIdentifier"];
 

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

@@ -51,7 +51,7 @@ public TestProject([CallerMemberName] string name = null)
         public List<TestPackageReference> PackageReferences { get; } = new List<TestPackageReference>();
 
         public List<TestPackageReference> DotNetCliToolReferences { get; } = new List<TestPackageReference>();
-        
+
         public List<CopyFilesTarget> CopyFilesTargets { get; } = new List<CopyFilesTarget>();
 
         public Dictionary<string, string> SourceFiles { get; } = new Dictionary<string, string>();
@@ -60,7 +60,7 @@ public TestProject([CallerMemberName] string name = null)
 
         public Dictionary<string, string> AdditionalProperties { get; } = new Dictionary<string, string>();
 
-        public List<KeyValuePair<string, Dictionary<string, string>>> AdditionalItems { get; } = new ();
+        public List<KeyValuePair<string, Dictionary<string, string>>> AdditionalItems { get; } = new();
 
         public List<Action<XDocument>> ProjectChanges { get; } = new List<Action<XDocument>>();
 
@@ -299,7 +299,7 @@ internal void Create(TestAsset targetTestAsset, string testProjectsSourceFolder,
                         new XAttribute("Include", frameworkReference)));
                 }
             }
-            
+
             if (this.CopyFilesTargets.Any())
             {
                 foreach (var copyFilesTarget in CopyFilesTargets)
@@ -420,7 +420,7 @@ public class {safeThisName}Class
 {propertiesElements}
     </ItemGroup>
     <WriteLinesToFile
-      File=`{targetFolder}\PropertyValues.txt`
+      File=`$(BaseIntermediateOutputPath)\$(Configuration)\$(TargetFramework)\PropertyValues.txt`
       Lines=`@(LinesToWrite)`
       Overwrite=`true`
       Encoding=`Unicode`
@@ -443,7 +443,7 @@ public class {safeThisName}Class
 
         public void AddItem(string itemName, string attributeName, string attributeValue)
         {
-            AddItem(itemName, new Dictionary<string, string>() { { attributeName, attributeValue } } );
+            AddItem(itemName, new Dictionary<string, string>() { { attributeName, attributeValue } });
         }
 
         public void AddItem(string itemName, Dictionary<string, string> attributes)
@@ -456,11 +456,13 @@ public void RecordProperties(params string[] propertyNames)
             PropertiesToRecord.AddRange(propertyNames);
         }
 
-        public Dictionary<string, string> GetPropertyValues(string testRoot, [CallerMemberNameAttribute] string testFolderName = "")
+        public Dictionary<string, string> GetPropertyValues(string testRoot, string configuration = "Debug", string targetFramework = null)
         {
             var propertyValues = new Dictionary<string, string>();
 
-            foreach (var line in File.ReadAllLines(Path.Combine(testRoot, testFolderName, "PropertyValues.txt")))
+            string intermediateOutputPath = Path.Combine(testRoot, Name, "obj", configuration, targetFramework ?? TargetFrameworks);
+
+            foreach (var line in File.ReadAllLines(Path.Combine(intermediateOutputPath, "PropertyValues.txt")))
             {
                 int colonIndex = line.IndexOf(':');
                 if (colonIndex > 0)