diff options
| -rw-r--r-- | BuildToolsVersion.txt | 2 | ||||
| -rw-r--r-- | Tools-Override/tests.targets | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index 4ae8a71983..06f53a7303 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -1.0.27-prerelease-01431-02 +1.0.27-prerelease-01507-01
\ No newline at end of file diff --git a/Tools-Override/tests.targets b/Tools-Override/tests.targets index a835562911..2287e80fed 100644 --- a/Tools-Override/tests.targets +++ b/Tools-Override/tests.targets @@ -125,25 +125,25 @@ <!-- We need to generate a simple config file for desktop test executors to tell them to use DEVPATH environment variable to use their dependencies from there. DEVPATH is being set for desktop runs in RunTests.cmd to the TestHostPath. We need this approach to have desktop Helix runs. --> - <Target Name="GenerateDesktopExecutorsConfigFiles" + <Target Name="CopyDesktopExecutorsConfigFiles" BeforeTargets="GenerateTestExecutionScripts" Condition="'$(BuildingNETFxVertical)' == 'true'"> <PropertyGroup> + <GenericConfigSourceFile>$(ToolsDir)\DesktopRunnerConfigFile.config</GenericConfigSourceFile> <XunitRunnerNetfxConfigFile>$(TestPath)\$(XunitExecutable).config</XunitRunnerNetfxConfigFile> <RemoteExecutorConfigFile>$(TestPath)\RemoteExecutorConsoleApp.exe.config</RemoteExecutorConfigFile> </PropertyGroup> - <ItemGroup> - <ConfigFileLines Include="<?xml version="1.0" encoding="utf-8"?>" /> - <ConfigFileLines Include="<configuration>" /> - <ConfigFileLines Include="<runtime>" /> - <ConfigFileLines Include="<developmentMode developerInstallation="true" />" /> - <ConfigFileLines Include="</runtime>" /> - <ConfigFileLines Include="</configuration>" /> - </ItemGroup> + <Copy SourceFiles="$(GenericConfigSourceFile)" + DestinationFiles="$(XunitRunnerNetfxConfigFile)" + SkipUnchangedFiles="true" + /> - <WriteLinesToFile File="$(XunitRunnerNetfxConfigFile)" Lines="@(ConfigFileLines)" Overwrite="true"/> - <WriteLinesToFile Condition="Exists('$(TestPath)\RemoteExecutorConsoleApp.exe')" File="$(RemoteExecutorConfigFile)" Lines="@(ConfigFileLines)" Overwrite="true" /> + <Copy Condition="Exists('$(TestPath)\RemoteExecutorConsoleApp.exe')" + SourceFiles="$(GenericConfigSourceFile)" + DestinationFiles="$(RemoteExecutorConfigFile)" + SkipUnchangedFiles="true" + /> </Target> <!-- Generate the script to run the tests. The script performs two high-level steps: @@ -152,7 +152,7 @@ directory. 2. Runs the tests. --> <Target Name="GenerateTestExecutionScripts" - DependsOnTargets="DiscoverTestInputs;SetupTestProperties;GenerateDesktopExecutorsConfigFiles"> + DependsOnTargets="DiscoverTestInputs;SetupTestProperties;CopyDesktopExecutorsConfigFiles"> <PropertyGroup> <TargetOSTrait Condition="'$(TargetOS)'=='Windows_NT'">nonwindowstests</TargetOSTrait> <TargetOSTrait Condition="'$(TargetOS)'=='Linux'">nonlinuxtests</TargetOSTrait> |