From 6ba0034f496f3c9d7ff03d3645003c784656bd28 Mon Sep 17 00:00:00 2001
From: Michal Staszewski <stachu@mlabs.pl>
Date: Tue, 21 Jun 2011 14:34:04 +0200
Subject: [PATCH] CHG: build fixes (cherry picked from commit
 2cd2bcec402a467c974a3106c3b1001dd4ed4ea4)

---
 STPTests/QueueWorkItemHelper.cs | 2 +-
 STPTests/STPTests.csproj        | 5 ++++-
 WorkItemsGroupDemo/Form1.cs     | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/STPTests/QueueWorkItemHelper.cs b/STPTests/QueueWorkItemHelper.cs
index eb72d14..8a8e3d3 100644
--- a/STPTests/QueueWorkItemHelper.cs
+++ b/STPTests/QueueWorkItemHelper.cs
@@ -61,7 +61,7 @@ namespace SmartThreadPoolTests
             wii.WorkItemPriority = WorkItemPriority.AboveNormal;
             WorkItemInfoComparer wiic = new WorkItemInfoComparer(wii, state);
 
-            IWorkItemResult wir = wig.QueueWorkItem(wiic.CompareWorkItemInfo, state, WorkItemPriority.AboveNormal);
+            IWorkItemResult wir = wig.QueueWorkItem((WorkItemCallback) wiic.CompareWorkItemInfo, state, WorkItemPriority.AboveNormal);
 
             bool success = (bool)wir.Result;
 
diff --git a/STPTests/STPTests.csproj b/STPTests/STPTests.csproj
index 47334c5..1ffdffc 100644
--- a/STPTests/STPTests.csproj
+++ b/STPTests/STPTests.csproj
@@ -91,7 +91,10 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.5.2.9222, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
+    <Reference Include="nunit.framework, Version=2.5.1.9189, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
diff --git a/WorkItemsGroupDemo/Form1.cs b/WorkItemsGroupDemo/Form1.cs
index f298d49..3dce606 100644
--- a/WorkItemsGroupDemo/Form1.cs
+++ b/WorkItemsGroupDemo/Form1.cs
@@ -294,7 +294,7 @@ namespace WorkItemsGroupDemo
             spinIdleTimeout.Enabled = !start;
         }
 
-        private object DoNothing(object state)
+        private void DoNothing(WorkItemState state)
         {
             WorkItemState workItemState = (WorkItemState)state;
             _workingStates.Add(workItemState.QueueUsageEntry, workItemState.QueueUsageEntry);
@@ -310,7 +310,7 @@ namespace WorkItemsGroupDemo
             } while (_paused);
             _workingStates.Remove(workItemState.QueueUsageEntry);
             
-            return null;
+            //return null;
         }