diff options
| -rw-r--r-- | BuildToolsVersion.txt | 2 | ||||
| -rw-r--r-- | Tools-Override/tests.targets | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index 06f53a7303..4ae8a71983 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -1.0.27-prerelease-01507-01
\ No newline at end of file +1.0.27-prerelease-01431-02 diff --git a/Tools-Override/tests.targets b/Tools-Override/tests.targets index 30bd6d3991..a835562911 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="CopyDesktopExecutorsConfigFiles" + <Target Name="GenerateDesktopExecutorsConfigFiles" BeforeTargets="GenerateTestExecutionScripts" Condition="'$(BuildingNETFxVertical)' == 'true'"> <PropertyGroup> - <NETFxTestRunnerAppConfig Condition="'$(NETFxTestRunnerAppConfig)' == ''">$(ToolsDir)\DesktopRunnerConfigFile.config</NETFxTestRunnerAppConfig> - <XunitRunnerNETFxConfigFile>$(TestPath)\$(XunitExecutable).config</XunitRunnerNETFxConfigFile> + <XunitRunnerNetfxConfigFile>$(TestPath)\$(XunitExecutable).config</XunitRunnerNetfxConfigFile> <RemoteExecutorConfigFile>$(TestPath)\RemoteExecutorConsoleApp.exe.config</RemoteExecutorConfigFile> </PropertyGroup> - <Copy SourceFiles="$(NETFxTestRunnerAppConfig)" - DestinationFiles="$(XunitRunnerNETFxConfigFile)" - SkipUnchangedFiles="true" - /> + <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 Condition="Exists('$(TestPath)\RemoteExecutorConsoleApp.exe')" - SourceFiles="$(NETFxTestRunnerAppConfig)" - DestinationFiles="$(RemoteExecutorConfigFile)" - SkipUnchangedFiles="true" - /> + <WriteLinesToFile File="$(XunitRunnerNetfxConfigFile)" Lines="@(ConfigFileLines)" Overwrite="true"/> + <WriteLinesToFile Condition="Exists('$(TestPath)\RemoteExecutorConsoleApp.exe')" File="$(RemoteExecutorConfigFile)" Lines="@(ConfigFileLines)" Overwrite="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;CopyDesktopExecutorsConfigFiles"> + DependsOnTargets="DiscoverTestInputs;SetupTestProperties;GenerateDesktopExecutorsConfigFiles"> <PropertyGroup> <TargetOSTrait Condition="'$(TargetOS)'=='Windows_NT'">nonwindowstests</TargetOSTrait> <TargetOSTrait Condition="'$(TargetOS)'=='Linux'">nonlinuxtests</TargetOSTrait> |