diff options
author | Eric Mellino <erme@microsoft.com> | 2017-01-04 01:44:58 +0300 |
---|---|---|
committer | Eric Mellino <erme@microsoft.com> | 2017-01-04 01:44:58 +0300 |
commit | f66349f02d4876cde44bc49b782793f3fa4bf090 (patch) | |
tree | edfc76d26e72f69c36a5205cf3f4871ccd34c0e9 /src | |
parent | 4f071905ca223e0ad2950033efc5fc1c4c0eed4d (diff) |
Fix ServiceController native test service project.
This project was not building correctly after recent changes. It now
imports dir.targets, and is marked explicitly as a test assembly so that
it does not get binplaced to the runtime or reference assembly folders.
Diffstat (limited to 'src')
-rw-r--r-- | src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestNativeService/System.ServiceProcess.ServiceController.TestNativeService.vcxproj | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestNativeService/System.ServiceProcess.ServiceController.TestNativeService.vcxproj b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestNativeService/System.ServiceProcess.ServiceController.TestNativeService.vcxproj index 6733d2044c..b1d4b25c07 100644 --- a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestNativeService/System.ServiceProcess.ServiceController.TestNativeService.vcxproj +++ b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestNativeService/System.ServiceProcess.ServiceController.TestNativeService.vcxproj @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <IsTestProject>true</IsTestProject> + </PropertyGroup> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Release|x64"> <Configuration>Release</Configuration> @@ -59,6 +62,7 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> |