Merge branch 'nunit_2.6.4'

Concordion.NUnit/Concordion.NUnit.csproj

@@ -32,14 +32,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.core">
-      <HintPath>..\tools\NUnit-2.6.3\nunit.core.dll</HintPath>
+      <HintPath>..\tools\NUnit-2.6.4\nunit.core.dll</HintPath>
     </Reference>
     <Reference Include="nunit.core.interfaces">
-      <HintPath>..\tools\NUnit-2.6.3\nunit.core.interfaces.dll</HintPath>
+      <HintPath>..\tools\NUnit-2.6.4\nunit.core.interfaces.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\tools\NUnit-2.6.3\nunit.framework.dll</HintPath>
+      <HintPath>..\tools\NUnit-2.6.4\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

Concordion.Runners/Concordion.Runners.csproj

@@ -33,7 +33,7 @@
   <ItemGroup>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\tools\NUnit-2.6.3\nunit.framework.dll</HintPath>
+      <HintPath>..\tools\NUnit-2.6.4\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

Concordion.Spec/Concordion.Spec.csproj

@@ -53,9 +53,9 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\tools\NUnit-2.6.3\nunit.framework.dll</HintPath>
+      <HintPath>..\tools\NUnit-2.6.4\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

Concordion.Test/Concordion.Test.csproj

@@ -57,9 +57,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\tools\Moq\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\tools\NUnit-2.6.3\nunit.framework.dll</HintPath>
+      <HintPath>..\tools\NUnit-2.6.4\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

Concordion/Concordion.csproj

@@ -62,7 +62,7 @@
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\tools\NUnit-2.6.3\nunit.framework.dll</HintPath>
+      <HintPath>..\tools\NUnit-2.6.4\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="OGNL, Version=1.0.3982.16799, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\tools\OGNL.NET\OGNL.dll</HintPath>

doc/Concordion/Integration/ReSharper.html

@@ -21,7 +21,7 @@ <h3>ReSharper</h3>
 		  specified NUnit installation (ReSharper -&gt; Options ... -&gt; Tools -&gt; 
 		  Unit Testing -&gt; NUnit), you have to copy Concordion.NUnit.dll into the 
 		  used NUnit installation (&lt;nunit-installation-path&gt;\bin\addins\).</li>
-		  <li>Make sure you use NUnit version 2.6.3 in any setup.</li>
+		  <li>Make sure you use NUnit version 2.6.4 in any setup.</li>
 	  </ul>
 	  </li>
 	  <li>Run your Concordion.NET acceptance tests with ReSharper<ol>

doc/Concordion/Setup.html

@@ -39,14 +39,14 @@ <h2>Setup</h2>
         <ul>
           <li>Concordion.dll</li>
           <li>OGNL.dll</li>
-          <li>nunit.framework.dll (version 2.6.3)</li>
+          <li>nunit.framework.dll (version 2.6.4)</li>
         </ul>
         <p>To be able to 
 		<a href="http://concordion.org/dotnet/RunningTests.html" target="_top">run the Concordion.NET
             tests with NUnit</a> you need to make the Concordion-NUnit addin
           available to your installation of NUnit:</p>
         <ul>
-          <li>copy Concordion.NUnit.dll to &lt;nunit-2.6.3-installation-path&gt;\bin\addins\</li>
+          <li>copy Concordion.NUnit.dll to &lt;nunit-2.6.4-installation-path&gt;\bin\addins\</li>
         </ul>
         <p>These dependencies are included in the distribution.</p>
         <h2>The Basics</h2>

doc/RunningTests.html

@@ -32,7 +32,7 @@ <h1>Run Concordion.NET Acceptance Tests with NUnit</h1>
         <p>Concordion.NET integrates with one of the
           most popular automated testing frameworks. Concordion.NET provides an NUnit Addin 
 		that allows you to run <a href="index.html">acceptance tests</a> with any NUnit environment that supports NUnit Addins 
-		(NUnit version 2.6.3). 
+		(NUnit version 2.6.4). 
 		We describe how to run Concordion.NET tests with </p>
 		  <ul>
 			  <li><a href="#stand-alone">stand alone</a> NUnit test 
@@ -65,7 +65,7 @@ <h2>Prepare your Visual Studio project containing Concordion.NET tests</h2>
 			</ul>
 			<li>Add the attribute [assembly: RequiredAddin("ConcordionNUnitAddin")] to the AssemblyInfo.cs 
 			of your project. This tells NUnit that the
-			<a class="externalLink" href="http://www.nunit.org/index.php?p=requiredAddin&amp;r=2.6.3">Concordion-NUnit-Addin
+			<a class="externalLink" href="http://www.nunit.org/index.php?p=nunitAddins&r=2.6.4">Concordion-NUnit-Addin
               is required</a> to run your Concordion.NET tests.</li>
 			<li>Make sure that you use .NET framework 4.0 or higher as target framework version in your Spec project that
             contains your Concordion.NET fixture classes.</li>
@@ -82,14 +82,14 @@ <h2>Prepare your Visual Studio project containing Concordion.NET tests</h2>
               containing your automated acceptance tests</a>.</li>
         </ol>
 		  <h2 id="stand-alone">Using the standalone NUnit test runner</h2>
-		  <p><a class="externalLink" href="http://nunit.org/index.php?p=runningTests&amp;r=2.6.3">
+		  <p><a class="externalLink" href="http://nunit.org/index.php?p=runningTests&r=2.6.4">
 		  NUnit provides different runners</a>, which can be used to run your 
 		  Concordion.NET tests.</p>
 		  <h3>Run Concordion.NET tests with the NUnit GUI runner</h3>
         <ol>
           <li><a href="Download.html">Download
               Concordion.NET</a>.</li>
-          <li>Download and <a class="externalLink" href="http://www.nunit.org/index.php?p=installation&amp;r=2.6.3">install NUnit version 2.6.3</a>.</li>
+          <li>Download and <a class="externalLink" href="http://www.nunit.org/index.php?p=installation&r=2.6.4">install NUnit version 2.6.4</a>.</li>
 			<li>Copy the Concordion.NUnit.dll from the tools directory of your 
 			Concordion.NET package into the addin directory of 
 		  your NUnit installation
@@ -98,7 +98,7 @@ <h3>Run Concordion.NET tests with the NUnit GUI runner</h3>
 			<li>Load your tests with the NUnit GUI runner.<br>Tip: You can open 
 			your Visual Studio solutions and/or projects in NUnit, when you 
 			activate the
-			<a class="externalLink" href="http://nunit.org/index.php?p=settingsDialog&amp;r=2.6.3">
+			<a class="externalLink" href="http://nunit.org/index.php?p=settingsDialog&r=2.6.4">
 			IDE Support Settings - Visual Studio</a>.</li>
           <li>Select the Concordion.NET test you want to run in the tree view 
 		  and press the Run button.</li>
@@ -112,22 +112,22 @@ <h3>Run Concordion.NET tests with the NUnit GUI runner</h3>
           C:\Users\&lt;your-windows-user&gt;\AppData\Local\Temp).</p>
 		  <h3>Run Concordion.NET tests with the console runner</h3>
 		  <p>NUnit provides a
-		  <a class="externalLink" href="http://nunit.org/index.php?p=nunit-console&amp;r=2.6.3">
+		  <a class="externalLink" href="http://nunit.org/index.php?p=nunit-console&r=2.6.4">
 		  command line client</a> for test execution, which can be useful for 
 		  the automation of test execution and integration into other systems 
 		  (e.g. build systems). You can run your Concordion.NET tests with the 
 		  NUnit console runner as follows:</p>
         <ol>
           <li><a href="Download.html">Download
               Concordion.NET</a>.</li>
-			<li>Download and <a class="externalLink" href="http://www.nunit.org/index.php?p=installation&amp;r=2.6.3">install NUnit version 2.6.3</a>.</li>
+			<li>Download and <a class="externalLink" href="http://www.nunit.org/index.php?p=installation&r=2.6.4">install NUnit version 2.6.4</a>.</li>
             <li>Copy the Concordion.NUnit.dll from the tools directory of your 
 			Concordion.NET package into the addin directory of 
 		  your NUnit installation
             (&lt;NUnit-installation-path&gt;\bin\addins). <br>Please, make sure to use the latest version of this DLL, when
             you update Concordion.NET.</li>
 			<li>In the command line window,
-			<a class="externalLink" href="http://nunit.org/index.php?p=nunit-console&amp;r=2.6.3">run 
+			<a class="externalLink" href="http://nunit.org/index.php?p=nunit-console&r=2.6.4">run 
 			the nunit-console application</a> and pass in the DLL containing your 
 			Concordion.NET specifications and tests.</li>
         </ol>