diff options
| author | Joel Hendrix <jhendrix@microsoft.com> | 2015-02-25 19:54:23 +0300 |
|---|---|---|
| committer | Joel Hendrix <jhendrix@microsoft.com> | 2015-02-25 19:54:23 +0300 |
| commit | a05c500717e3ca5592f0d130b2a9877fdb5f14c7 (patch) | |
| tree | 0c33b7becb3dadbf77a5beddfe15eda70b359c38 /src/dir.targets | |
| parent | cfd79523aebbc05e696cb80e42e58c1240ba009e (diff) | |
Fixes for official VSO builds.
Updated build tools package to latest build.
Renamed BuildNumber.props to BuildValues.props and updated content to
align with changes in build tools.
Disable signing of test assemblies as it significantly increases build
time for no value.
Wired in UpdateBuildValues.targets.
Disabled several tests that are failing after moving to the 64-bit
CoreCLR package (issues 1002 and 1011).
Diffstat (limited to 'src/dir.targets')
| -rw-r--r-- | src/dir.targets | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/dir.targets b/src/dir.targets index 12870f6335..bf9b9098b3 100644 --- a/src/dir.targets +++ b/src/dir.targets @@ -89,8 +89,6 @@ <Import Project="$(ToolsDir)versioning.targets" Condition="Exists('$(ToolsDir)versioning.targets')" /> - <Import Project="$(ToolsDir)sign.targets" Condition="Exists('$(ToolsDir)sign.targets')" /> - <Import Project="$(ToolsDir)publishtest.targets" Condition="Exists('$(ToolsDir)publishtest.targets')" /> <PropertyGroup> @@ -101,6 +99,9 @@ <CLSCompliant Condition="'$(IsTestProject)'=='true'">false</CLSCompliant> </PropertyGroup> + <!-- sign.targets relies on the value of IsTestProject so be sure to import it after it's defined --> + <Import Project="$(ToolsDir)sign.targets" Condition="Exists('$(ToolsDir)sign.targets')" /> + <PropertyGroup> <TestRuntimePackageConfig>$(ToolsDir)test-runtime\packages.config</TestRuntimePackageConfig> <TestRuntimePackageSemaphore>$(PackagesDir)Test-Runtime-packages.config</TestRuntimePackageSemaphore> @@ -163,7 +164,7 @@ Condition="'$(RunTestsForProject)'=='true'"> <MakeDir Condition="'$(CoverageEnabledForProject)'=='true'" Directories="$(CoverageReportDir)" /> - + <Exec Command="$(TestHost) $(TestCommandLine)" WorkingDirectory="$(TestPath)%(TestTargetFramework.Folder)" ContinueOnError="True"> |