Merge pull request #46 from nunit/release-3.0-ctp-4

Release 3.0 ctp 4
nunit · Jul 21, 2015 · 49432c2 · 49432c2
2 parents 91272b1 + 19f645d
commit 49432c2
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/demo/NUnitTestDemo/NUnit3TestDemo.csproj b/demo/NUnitTestDemo/NUnit3TestDemo.csproj
@@ -36,9 +36,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.0.5610.33194, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.0.5674.19278, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.3.0.0-beta-2\lib\net45\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.3.0.0-beta-3\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/demo/NUnitTestDemo/packages.config b/demo/NUnitTestDemo/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.0.0-beta-2" targetFramework="net45" />
+  <package id="NUnit" version="3.0.0-beta-3" targetFramework="net45" />
 </packages>
diff --git a/src/NUnitTestAdapter/packages.config b/src/NUnitTestAdapter/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit.Core.Engine" version="3.0.0-beta-3" targetFramework="net35" />
+  <package id="NUnit.Core.Engine" version="3.0.0-beta-2" targetFramework="net35" />
 </packages>
diff --git a/src/NUnitTestAdapterInstall/packages.config b/src/NUnitTestAdapterInstall/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit.Core.Engine" version="3.0.0-beta-3" targetFramework="net45" />
+  <package id="NUnit.Core.Engine" version="3.0.0-beta-2" targetFramework="net45" />
 </packages>
diff --git a/src/NUnitTestAdapterTests/NUnit3TestAdapterTests.csproj b/src/NUnitTestAdapterTests/NUnit3TestAdapterTests.csproj
@@ -47,9 +47,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\NUnit.Core.Engine.3.0.0-beta-2\lib\nunit.core.engine.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.0.5610.33194, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.0.5674.19278, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\NUnit.3.0.0-beta-2\lib\net45\nunit.framework.dll</HintPath>
+      <HintPath>..\..\packages\NUnit.3.0.0-beta-3\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/NUnitTestAdapterTests/TestExecutionTests.cs b/src/NUnitTestAdapterTests/TestExecutionTests.cs
@@ -92,15 +92,15 @@ public void CorrectNumberOfResultsWereReceived()
             const FakeFrameworkHandle.EventType eventType = FakeFrameworkHandle.EventType.RecordResult;
             Assert.That(
                 testLog.Events.FindAll(e => e.EventType == eventType).Count,
-                Is.EqualTo(MockAssembly.ResultCount - TestsUnderBadOrIgnoredFixtures));
+                Is.EqualTo(MockAssembly.ResultCount - BadFixture.Tests));
         }
 
-        readonly TestCaseData[] outcomes =
+        static readonly TestCaseData[] outcomes =
         {
             // NOTE: One inconclusive test is reported as None
             new TestCaseData(TestOutcome.Passed).Returns(MockAssembly.Success),
             new TestCaseData(TestOutcome.Failed).Returns(MockAssembly.ErrorsAndFailures - BadFixture.Tests),
-            new TestCaseData(TestOutcome.Skipped).Returns(MockAssembly.Ignored - IgnoredFixture.Tests),
+            new TestCaseData(TestOutcome.Skipped).Returns(MockAssembly.Ignored),
             new TestCaseData(TestOutcome.None).Returns(1),
             new TestCaseData(TestOutcome.NotFound).Returns(0)
         };

diff --git a/src/NUnitTestAdapterTests/packages.config b/src/NUnitTestAdapterTests/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.0.0-beta-2" targetFramework="net45" />
+  <package id="NUnit" version="3.0.0-beta-3" targetFramework="net45" />
   <package id="NUnit.Core.Engine" version="3.0.0-beta-2" targetFramework="net45" />
 </packages>
diff --git a/src/mock-assembly/mock-assembly.csproj b/src/mock-assembly/mock-assembly.csproj
@@ -79,9 +79,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.0.5610.33194, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>packages\NUnit.3.0.0-beta-2\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.0.5674.19278, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>packages\NUnit.3.0.0-beta-3\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>

diff --git a/src/mock-assembly/packages.config b/src/mock-assembly/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.0.0-beta-2" targetFramework="net45" />
+  <package id="NUnit" version="3.0.0-beta-3" targetFramework="net45" />
 </packages>