Skip to content

Commit

Permalink
Changed the build.proj to auto start IIS and utilize a new MSBuild ba…
Browse files Browse the repository at this point in the history
…sed start mechanism

- Removed the old StartIIS.ps1 powershell script, this is now handled
via msbuild.
  • Loading branch information
NTaylorMullen committed Dec 15, 2012
1 parent 42cdfdf commit 965e9ae
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
20 changes: 13 additions & 7 deletions build/Build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@
<NuGetExePath>$(NuGetToolsPath)\nuget.exe</NuGetExePath>
<ToolsPath>$(ProjectRoot)\tools\</ToolsPath>
<XunitPath>$(ToolsPath)xunit\</XunitPath>
<ChutzpahExePath>$(ProjectRoot)\tools\chutzpah\chutzpah.console.exe</ChutzpahExePath>
<JSTestsBridgeFile>$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Client.JS.Tests\CommandLineBridge.js</JSTestsBridgeFile>
<ChutzpahExe>chutzpah.console.exe</ChutzpahExe>
<ChutzpahPath>$(ProjectRoot)\tools\chutzpah</ChutzpahPath>
<ChutzpahExePath>$(ChutzpahPath)\$(ChutzpahExe)</ChutzpahExePath>
<JSTestsURL>http://localhost:1337/signalr</JSTestsURL>
<JSTestsPath>$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Client.JS.Tests</JSTestsPath>
<JSTester>$(JSTestsPath)\default.html</JSTester>
<DocuExePath>$(ToolsPath)docu\docu.exe</DocuExePath>
<ZipExe>$(ToolsPath)7za920\7za.exe</ZipExe>
<ScriptTempPath>$(ArtifactsDir)\Microsoft.AspNet.SignalR.Client.JS\Scripts</ScriptTempPath>
Expand Down Expand Up @@ -140,16 +144,18 @@
<Target Name="RunUnitTests" DependsOnTargets="CreateOutputDir">
<MSBuild Projects="%(UnitTestProjects.Identity)"
Targets="Build"
Properties="Configuration=$(Configuration);ArtifactsDir=$(ArtifactsDir);SolutionDir=$(ProjectRoot)\;$(ExtraProperties)"
Properties="Configuration=$(Configuration);ArtifactsDir=$(ArtifactsDir);SolutionDir=$(ProjectRoot)\;$(ExtraProperties);CommandLineTest=true;TestURL=$(JSTestsURL);"
Condition=" '$(OS)' == 'Windows_NT'"/>
<Exec Command="&quot;$(ChutzpahExePath)&quot; &quot;$(JSTestsBridgeFile)&quot; /silent" Condition=" '$(OS)' == 'Windows_NT'" />
<RemoveDir Directories="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Client.JS.Tests\temp" ContinueOnError="true"></RemoveDir>
<Delete Files="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Client.JS.Tests\CommandLineBridge.js" ContinueOnError="true"></Delete>

<StartIISTask HostLocation="$(JSTestsPath)" />
<!--
<Exec Command="$(ChutzpahExePath) $(JSTester) /silent" Condition=" '$(OS)' == 'Windows_NT'" />
<xunit Assembly="$(ArtifactsDir)\Microsoft.AspNet.SignalR.Tests\Microsoft.AspNet.SignalR.Tests.dll"
Xml="$(TestResultsPath)\Microsoft.AspNet.SignalR.Tests.XunitResults.xml"
Verbose="true" />
<CallTarget Targets="KillIISExpress" />
<OnError ExecuteTargets="KillIISExpress" />-->
</Target>

<Target Name="RunFunctionalTests" DependsOnTargets="CreateOutputDir">
Expand Down
2 changes: 2 additions & 0 deletions build/Build.tasks
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,6 @@
]]></Code>
</Task>
</UsingTask>

<UsingTask TaskName="StartIISTask" AssemblyFile="$(ProjectRoot)\tests\Microsoft.AspNet.SignalR.Tests.Common\bin\$(Configuration)\Microsoft.AspNet.SignalR.Tests.Common.dll"></UsingTask>
</Project>
7 changes: 0 additions & 7 deletions tools/chutzpah/StartIIS.ps1

This file was deleted.

0 comments on commit 965e9ae

Please sign in to comment.