Merge in 'release/8.0.1xx' changes

dotnet-bot · dotnet-bot · commit 9bcead5ab131 · 2024-06-04T18:11:33.000Z
diff --git a/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs b/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs
@@ -289,7 +289,7 @@ public static ToolsetInfo Create(string repoRoot, string repoArtifactsDir, strin
             {
                 if (TryResolveCommand("MSBuild", out string pathToMSBuild))
                 {
-                    ret.FullFrameworkMSBuildPath = Path.GetDirectoryName(pathToMSBuild);
+                    ret.FullFrameworkMSBuildPath = pathToMSBuild;
                 }
                 else
                 {

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public static ToolsetInfo Create(string repoRoot, string repoArtifactsDir, strin`
`289`	`289`	`{`
`290`	`290`	`if (TryResolveCommand("MSBuild", out string pathToMSBuild))`
`291`	`291`	`{`
`292`		`- ret.FullFrameworkMSBuildPath = Path.GetDirectoryName(pathToMSBuild);`
	`292`	`+ ret.FullFrameworkMSBuildPath = pathToMSBuild;`
`293`	`293`	`}`
`294`	`294`	`else`
`295`	`295`	`{`