Permalink
Browse files

final updates to build/deployment/test process

  • Loading branch information...
1 parent 002bec8 commit e8a6817dff9b7e31fd7b74421e601a024ee8b43f @jkowalski committed Jul 10, 2011
Showing with 2 additions and 4 deletions.
  1. +2 −4 src/NLog.proj
View
@@ -31,8 +31,8 @@
<BuildAllFrameworks Condition="'$(BuildNetFX40)' == 'true'">false</BuildAllFrameworks>
<BuildAllFrameworks Condition="'$(BuildNetCF20)' == 'true'">false</BuildAllFrameworks>
<BuildAllFrameworks Condition="'$(BuildNetCF35)' == 'true'">false</BuildAllFrameworks>
- <ToolsDir>$(MSBuildProjectDirectory)\..\build\bin\Tools</ToolsDir>
- <SLTestRunner>$(BaseOutputDirectory)\bin\Tools\SilverlightConsoleRunner.exe</SLTestRunner>
+ <ToolsDir>$(BaseOutputDirectory)\bin\Tools</ToolsDir>
+ <SLTestRunner>$(ToolsDir)\SilverlightConsoleRunner.exe</SLTestRunner>
<DeployNetCF>$(ToolsDir)\DeployNetCF.exe</DeployNetCF>
<DumpApiXml>$(ToolsDir)\DumpApiXml.exe</DumpApiXml>
<MergeApiXml>$(ToolsDir)\MergeApiXml.exe</MergeApiXml>
@@ -349,15 +349,13 @@
</Target>
<Target Name="NetCf20Test" DependsOnTargets="DeployNetCf20ToEmulator">
- <Copy SourceFiles="SmartDeviceTestRun.testrunConfig" DestinationFolder="$(BaseOutputDirectory)\bin\$(Configuration)\.NET Compact Framework 2.0" />
<Exec Command='"$(MSTest9)" /nologo /runconfig:SmartDeviceTestRun.testrunConfig /testcontainer:NLog.UnitTests.dll /resultsfile:TestResults.trx'
WorkingDirectory="$(BaseOutputDirectory)\bin\$(Configuration)\.NET Compact Framework 2.0"
Condition="Exists('$(MSTest9)')" IgnoreExitCode="true" />
<Exec Command="TaskKill /f /im DeviceEmulator.exe 2&gt; nul" IgnoreExitCode="true" />
</Target>
<Target Name="NetCf35Test" DependsOnTargets="DeployNetCf35ToEmulator">
- <Copy SourceFiles="SmartDeviceTestRun.testrunConfig" DestinationFolder="$(BaseOutputDirectory)\bin\$(Configuration)\.NET Compact Framework 3.5" />
<Exec Command='"$(MSTest9)" /nologo /runconfig:SmartDeviceTestRun.testrunConfig /testcontainer:NLog.UnitTests.dll /resultsfile:TestResults.trx'
WorkingDirectory="$(BaseOutputDirectory)\bin\$(Configuration)\.NET Compact Framework 3.5"
Condition="Exists('$(MSTest9)')" IgnoreExitCode="true" />

0 comments on commit e8a6817

Please sign in to comment.