From ad19f5ecb71595232aeb623d75fb2af818e4a31f Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Fri, 14 Oct 2016 16:42:33 -0700
Subject: [PATCH] Prevent paths with escapable characters like `@` (#4418)

Thanks for the investigation, @cdmihai
---
 build/test/RunTest.proj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/test/RunTest.proj b/build/test/RunTest.proj
index 3c9055f42..7f113afa7 100644
--- a/build/test/RunTest.proj
+++ b/build/test/RunTest.proj
@@ -2,11 +2,13 @@
 <Project DefaultTarget="RunTest" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <!-- workaround for https://github.com/Microsoft/msbuild/issues/885 -->
+  <!-- renaming the property because the original property is a global property and therefore
+       cannot be redefined at runtime. -->
   <PropertyGroup>
-    <CLIBuildDll>$([MSBuild]::Unescape($(CLIBuildDll)))</CLIBuildDll>
+    <CLIBuildDllPath>$([MSBuild]::Unescape($(CLIBuildDll)))</CLIBuildDllPath>
   </PropertyGroup>
 
-  <UsingTask TaskName="DotNetTest" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DotNetTest" AssemblyFile="$(CLIBuildDllPath)" />
 
   <Target Name="RunTest">
     <DotNetTest WorkingDirectory="$(WorkingDirectory)"