diff --git a/build-support/solutions.build.nant b/build-support/solutions.build.nant
index 14fdf29a..7ae39ab9 100644
--- a/build-support/solutions.build.nant
+++ b/build-support/solutions.build.nant
@@ -85,7 +85,7 @@ Rebuilding Solutions using Nant and "solutions.build":
           <exclude name="examples/Spring/Spring.EmsQuickStart/**/*.sln" unless="${build-ems}"/>
           <exclude name="examples/**/Spring.Examples.Pool.2008.sln"/>
 
-		  <!-- TODO: reworked this to use Spring.Scheduling.Quartz20 before we can include it again -->
+		  <!-- TODO: rework this to use Spring.Scheduling.Quartz20 before we can include it again -->
 		  <exclude name="examples/**/Spring.Scheduling.Quartz.Example.2008.sln"/>
 		  
         </items>
@@ -117,7 +117,7 @@ Rebuilding Solutions using Nant and "solutions.build":
           <exclude name="examples/Spring/Spring.EmsQuickStart/**/*.sln" unless="${build-ems}"/>
           <exclude name="examples/**/Spring.Examples.Pool.2010.sln"/>
 		  
-		  <!-- TODO: reworked this to use Spring.Scheduling.Quartz20 before we can include it again -->
+		  <!-- TODO: rework this to use Spring.Scheduling.Quartz20 before we can include it again -->
 		  <exclude name="examples/**/Spring.Scheduling.Quartz.Example.2010.sln"/>
 		  
         </items>
diff --git a/src/Spring/Spring.Scheduling.Quartz20/Spring.Scheduling.Quartz20.2008.csproj b/src/Spring/Spring.Scheduling.Quartz20/Spring.Scheduling.Quartz20.2008.csproj
index 14b6d854..789484aa 100644
--- a/src/Spring/Spring.Scheduling.Quartz20/Spring.Scheduling.Quartz20.2008.csproj
+++ b/src/Spring/Spring.Scheduling.Quartz20/Spring.Scheduling.Quartz20.2008.csproj
@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz20\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0,QUARTZ_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NET_3_0,NET_3_5,QUARTZ_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz\Debug\Spring.Scheduling.Quartz20.XML</DocumentationFile>
@@ -51,69 +51,31 @@
     <Reference Include="System.Data" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Spring.Scheduling.Quartz\JobMethodInvocationFailedException.cs">
-      <Link>JobMethodInvocationFailedException.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\AdaptableJobFactory.cs">
-      <Link>Scheduling\Quartz\AdaptableJobFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\DelegatingJob.cs">
-      <Link>Scheduling\Quartz\DelegatingJob.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\IJobDetailAwareTrigger.cs">
-      <Link>Scheduling\Quartz\IJobDetailAwareTrigger.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\ISchedulerContextAware.cs">
-      <Link>Scheduling\Quartz\ISchedulerContextAware.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\ISchedulingTaskExecutor.cs">
-      <Link>Scheduling\Quartz\ISchedulingTaskExecutor.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\ITaskExecutor.cs">
-      <Link>Scheduling\Quartz\ITaskExecutor.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\LocalDataSourceJobStore.cs">
-      <Link>Scheduling\Quartz\LocalDataSourceJobStore.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\LocalTaskExecutorThreadPool.cs">
-      <Link>Scheduling\Quartz\LocalTaskExecutorThreadPool.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\MethodInvokingJob.cs">
-      <Link>Scheduling\Quartz\MethodInvokingJob.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\MethodInvokingRunnable.cs">
-      <Link>Scheduling\Quartz\MethodInvokingRunnable.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\QuartzJobObject.cs">
-      <Link>Scheduling\Quartz\QuartzJobObject.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\SchedulerAccessorObject.cs">
-      <Link>Scheduling\Quartz\SchedulerAccessorObject.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\SchedulerFactoryObject.cs">
-      <Link>Scheduling\Quartz\SchedulerFactoryObject.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\SchedulingException.cs">
-      <Link>Scheduling\Quartz\SchedulingException.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\SimpleThreadPoolTaskExecutor.cs">
-      <Link>Scheduling\Quartz\SimpleThreadPoolTaskExecutor.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\SpringDbProviderAdapter.cs">
-      <Link>Scheduling\Quartz\SpringDbProviderAdapter.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\SpringObjectJobFactory.cs">
-      <Link>Scheduling\Quartz\SpringObjectJobFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz\Scheduling\Quartz\TaskRejectedException.cs">
-      <Link>Scheduling\Quartz\TaskRejectedException.cs</Link>
-    </Compile>
+    <Compile Include="JobMethodInvocationFailedException.cs" />
+    <Compile Include="Scheduling\Quartz\AdaptableJobFactory.cs" />
     <Compile Include="Scheduling\Quartz\CronTriggerObject.cs" />
+    <Compile Include="Scheduling\Quartz\DelegatingJob.cs" />
+    <Compile Include="Scheduling\Quartz\IJobDetailAwareTrigger.cs" />
+    <Compile Include="Scheduling\Quartz\ISchedulerContextAware.cs" />
+    <Compile Include="Scheduling\Quartz\ISchedulingTaskExecutor.cs" />
+    <Compile Include="Scheduling\Quartz\ITaskExecutor.cs" />
     <Compile Include="Scheduling\Quartz\JobDetailObject.cs" />
+    <Compile Include="Scheduling\Quartz\LocalDataSourceJobStore.cs" />
+    <Compile Include="Scheduling\Quartz\LocalTaskExecutorThreadPool.cs" />
+    <Compile Include="Scheduling\Quartz\MethodInvokingJob.cs" />
     <Compile Include="Scheduling\Quartz\MethodInvokingJobDetailFactoryObject.cs" />
+    <Compile Include="Scheduling\Quartz\MethodInvokingRunnable.cs" />
+    <Compile Include="Scheduling\Quartz\QuartzJobObject.cs" />
     <Compile Include="Scheduling\Quartz\SchedulerAccessor.cs" />
+    <Compile Include="Scheduling\Quartz\SchedulerAccessorObject.cs" />
+    <Compile Include="Scheduling\Quartz\SchedulerFactoryObject.cs" />
+    <Compile Include="Scheduling\Quartz\SchedulingException.cs" />
+    <Compile Include="Scheduling\Quartz\SimpleThreadPoolTaskExecutor.cs" />
     <Compile Include="Scheduling\Quartz\SimpleTriggerObject.cs" />
+    <Compile Include="Scheduling\Quartz\SpringDbProviderAdapter.cs" />
+    <Compile Include="Scheduling\Quartz\SpringObjectJobFactory.cs" />
     <Compile Include="Scheduling\Quartz\StatefulMethodInvokingJob.cs" />
+    <Compile Include="Scheduling\Quartz\TaskRejectedException.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
diff --git a/test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.2008.csproj b/test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.2008.csproj
index 3ffadb88..f25caf08 100644
--- a/test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.2008.csproj
+++ b/test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.2008.csproj
@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz20.Tests\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET_2_0,NET_3_0,NET_3_5,QUARTZ_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>
@@ -49,52 +49,27 @@
       <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\QuartzCompilerOptionsTests.cs">
-      <Link>QuartzCompilerOptionsTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\Scheduling\Quartz\AdaptableJobFactoryTest.cs">
-      <Link>Scheduling\Quartz\AdaptableJobFactoryTest.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\Scheduling\Quartz\CronTriggerObjectTest.cs">
-      <Link>Scheduling\Quartz\CronTriggerObjectTest.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\Scheduling\Quartz\JobDetailObjectTest.cs">
-      <Link>Scheduling\Quartz\JobDetailObjectTest.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\Scheduling\Quartz\MethodInvokingJobDetailFactoryObjectTest.cs">
-      <Link>Scheduling\Quartz\MethodInvokingJobDetailFactoryObjectTest.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\Scheduling\Quartz\MethodInvokingJobTest.cs">
-      <Link>Scheduling\Quartz\MethodInvokingJobTest.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\Scheduling\Quartz\QuartzSupportTests.cs">
-      <Link>Scheduling\Quartz\QuartzSupportTests.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\Scheduling\Quartz\QuartzTestObject.cs">
-      <Link>Scheduling\Quartz\QuartzTestObject.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\Scheduling\Quartz\SchedulerFactoryObjectTest.cs">
-      <Link>Scheduling\Quartz\SchedulerFactoryObjectTest.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\Scheduling\Quartz\SimpleTriggerObjectTest.cs">
-      <Link>Scheduling\Quartz\SimpleTriggerObjectTest.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\Scheduling\Quartz\SpringObjectJobFactoryTest.cs">
-      <Link>Scheduling\Quartz\SpringObjectJobFactoryTest.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\Scheduling\Quartz\TestMethodInvokingTask.cs">
-      <Link>Scheduling\Quartz\TestMethodInvokingTask.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\Scheduling\Quartz\TestUtil.cs">
-      <Link>Scheduling\Quartz\TestUtil.cs</Link>
-    </Compile>
-    <Compile Include="..\Spring.Scheduling.Quartz.Tests\Scheduling\Quartz\TriggerObjectTest.cs">
-      <Link>Scheduling\Quartz\TriggerObjectTest.cs</Link>
-    </Compile>
+    <Compile Include="QuartzCompilerOptionsTests.cs" />
+    <Compile Include="Scheduling\Quartz\AdaptableJobFactoryTest.cs" />
+    <Compile Include="Scheduling\Quartz\CronTriggerObjectTest.cs" />
+    <Compile Include="Scheduling\Quartz\JobDetailObjectTest.cs" />
+    <Compile Include="Scheduling\Quartz\MethodInvokingJobDetailFactoryObjectTest.cs" />
+    <Compile Include="Scheduling\Quartz\MethodInvokingJobTest.cs" />
+    <Compile Include="Scheduling\Quartz\QuartzSupportTests.cs" />
+    <Compile Include="Scheduling\Quartz\QuartzTestObject.cs" />
+    <Compile Include="Scheduling\Quartz\SchedulerFactoryObjectTest.cs" />
+    <Compile Include="Scheduling\Quartz\SimpleTriggerObjectTest.cs" />
+    <Compile Include="Scheduling\Quartz\SpringObjectJobFactoryTest.cs" />
+    <Compile Include="Scheduling\Quartz\TestMethodInvokingTask.cs" />
+    <Compile Include="Scheduling\Quartz\TestUtil.cs" />
+    <Compile Include="Scheduling\Quartz\TriggerObjectTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="job-scheduling-data.xml">