Merge lp:~simone.busoli/nunitv2/async-support-void-and-task-return-types into lp:nunitv2

[Simone Busoli]

Introduced support for async test methods returning void, Task, and Task<T>.

The first is treated independently of the other two as it is not possible to await on void, therefore it requires relying on a custom SynchronizationContext.

In the other cases instead it is sufficient to just wait on the task returned by the test method and handle the eventual return value/exception accordingly.

Test methods returning Task<T> can be used in conjunction with [TestCase(Result = ...)]. For instance:

[TestCase(Result = 1)]
public async Task<int> MyTest()
{
    return await Task.FromResult(1);
}

Exceptions are handled in a uniform way for both void and Task-returning methods. That is, AggregateException are unwrapped and their first inner exception is returned rethrown. I'm not sure this is the most intuitive way to handle it but at least it makes it consistent between void and non-void. Outside of NUnit normally if you Wait on a task you get back an AggregateException.

[lp:~simone.busoli/nunitv2/async-support-void-and-task-return-types]

3427. By Simone Busoli <simone.busoli@vienna> on 2012-10-01

Explicit type of excpected exception

3428. By Simone Busoli <simone.busoli@vienna> on 2012-10-01

Replaced usages of Task.FromResult with Task.Run as the former create tasks which are already completed and may mistify the tests outcome

3429. By Simone Busoli <simone.busoli@vienna> on 2012-10-02

Improved handling of tests which are not supposed to be run

3430. By Simone Busoli <simone.busoli@vienna> on 2012-10-02

Fixed typo in error message.
Started adding additional tests for parameterized testcases.

3431. By Simone Busoli <simone.busoli@vienna> on 2012-10-03

Support for building for .NET 4.5 and running async tests even when not targeting .NET 4.5 but as long as 4.5 is installed.

[Charlie Poole (charlie.poole)]

This looks very good and I have started the merge...

review: Approve

[Charlie Poole (charlie.poole)]

Changes made in merging this:

1. Added nunit2012.sln alongside nunit.sln. nunit.sln doesn't have the .NET 4.5 projects.
2. Changes to the build script and conditional code to allow building the .NET 1.1 version of the code.
3. Fixed conditional compilation symbols for the two .NET 4.5 assemblies.

Still need (as separate fixes / bugs)

1. Fix RuntimeFramework class to distinguish .NET 4.5 from 4.0 as we do, for example, with 3.5 versus 2.0.
2. Add .NET 4.5 to platform attribute and mark .NET 4.5 tests to only run on that platform
3. Resolve issue with packaging: i.e. the .net 4.5 test should be included in the release package but it should not be automatically run as part of NUnitTests.nunit, since .NET 4.5 may not be installed. The uesr could install it at a later time, however.

[Simone Busoli (simone.busoli)]

Hi Charlie, thanks.

WRT fix 1), I added a piece of code here: http://bazaar.launchpad.net/~simone.busoli/nunitv2/async-support-void-and-task-return-types/revision/3431#src/ClientUtilities/util/RuntimeFrameworkSelector.cs, and a corresponding test here: http://bazaar.launchpad.net/~simone.busoli/nunitv2/async-support-void-and-task-return-types/revision/3431#src/NUnitCore/tests/PlatformDetectionTests.cs.

I must say that I didn't spend much time on the platform/runtime selection/detection thing. I realized it's quite tricky though.

WRT to changes made in merging:

2) I don't have .NET 1.1 so I couldn't test it unfortunately, sorry for that. I would also like to mention that I noticed a problem in the build script when building for all the frameworks (I know it is not something you would do often though). You know that we have now 3 project files for unit tests, v1, v2 and the new v3. The vX is copied during the build to a file with another name, but I noticed that this is done one off when running the build, instead it should be done every time you invoke the test target, otherwise when running multiple frameworks builds you won't get the behavior you expect.

[Charlie Poole (charlie.poole)]

Hi Simone,

You're up late!

I'll look at that, but in fact I'm seeing .NET 4.0 displayed in some
places when I know I'm running under 4.5.

There are a few problems with the build that I want to look at but the
particular issue of copying should not apply, since each build uses a
different target directory. Most likely the V3 file will need to go,
since it only works for test builds and not when the distribution
package is created. I filed a bug on the issue and also on the
platform stuff.

Charlie

On Thu, Oct 4, 2012 at 5:21 PM, Simone Busoli <email address hidden> wrote:
> Hi Charlie, thanks.
>
> WRT fix 1), I added a piece of code here: http://bazaar.launchpad.net/~simone.busoli/nunitv2/async-support-void-and-task-return-types/revision/3431#src/ClientUtilities/util/RuntimeFrameworkSelector.cs, and a corresponding test here: http://bazaar.launchpad.net/~simone.busoli/nunitv2/async-support-void-and-task-return-types/revision/3431#src/NUnitCore/tests/PlatformDetectionTests.cs.
>
> I must say that I didn't spend much time on the platform/runtime selection/detection thing. I realized it's quite tricky though.
>
> WRT to changes made in merging:
>
> 2) I don't have .NET 1.1 so I couldn't test it unfortunately, sorry for that. I would also like to mention that I noticed a problem in the build script when building for all the frameworks (I know it is not something you would do often though). You know that we have now 3 project files for unit tests, v1, v2 and the new v3. The vX is copied during the build to a file with another name, but I noticed that this is done one off when running the build, instead it should be done every time you invoke the test target, otherwise when running multiple frameworks builds you won't get the behavior you expect.
>
> --
> https://code.launchpad.net/~simone.busoli/nunitv2/async-support-void-and-task-return-types/+merge/127183
> You are reviewing the proposed merge of lp:~simone.busoli/nunitv2/async-support-void-and-task-return-types into lp:nunitv2.

=== added file 'NUnitTests.v3.nunit'
--- NUnitTests.v3.nunit	1970-01-01 00:00:00 +0000
+++ NUnitTests.v3.nunit	2012-10-03 23:32:21 +0000
@@ -0,0 +1,15 @@
+<NUnitProject>
+  <Settings appbase="."/>
+  <Config name="Default" binpath="lib;tests;framework">
+    <assembly path="tests/nunit.framework.tests.dll" />
+    <assembly path="tests/nunit.core.tests.dll" />
+    <assembly path="tests/nunit.core.tests.net45.dll" />
+    <assembly path="tests/nunit.util.tests.dll" />
+    <assembly path="tests/nunit.mocks.tests.dll" />
+    <assembly path="tests/nunit-console.tests.dll" />
+    <assembly path="tests/nunit.uiexception.tests.dll" />
+    <assembly path="tests/nunit.uikit.tests.dll" />
+    <assembly path="tests/nunit-gui.tests.dll" />
+    <assembly path="tests/nunit-editor.tests.dll" />
+  </Config>
+</NUnitProject>

=== modified file 'build.bat'
--- build.bat	2012-09-25 20:55:15 +0000
+++ build.bat	2012-10-03 23:32:21 +0000
@@ -1,122 +1,124 @@
-@echo off
-
-rem BUILD - Builds and tests NUnit
-
-setlocal
-
-set NANT=tools\nant\bin\nant.exe
-set OPTIONS=-f:scripts\nunit.build.targets
-set CONFIG=
-set RUNTIME=
-set CLEAN=
-set COMMANDS=
-set PASSTHRU=
-goto start
-
-:shift
-shift /1
-
-:start
-
-IF "%1" EQU "" goto execute
-
-IF "%PASSTHRU%" EQU "TRUE" set COMMANDS=%COMMANDS% %1&goto shift
-
-IF /I "%1" EQU "?"	goto usage
-IF /I "%1" EQU "/h"	goto usage
-IF /I "%1" EQU "/help"	goto usage
-
-IF /I "%1" EQU "debug" set CONFIG=debug&goto shift
-IF /I "%1" EQU "release" set CONFIG=release&goto shift
-
-IF /I "%1" EQU "net" set RUNTIME=net&goto shift
-IF /I "%1" EQU "net-1.0" set RUNTIME=net-1.0&goto shift
-IF /I "%1" EQU "net-1.1" set RUNTIME=net-1.1&goto shift
-IF /I "%1" EQU "net-2.0" set RUNTIME=net-2.0&goto shift
-IF /I "%1" EQU "net-3.0" set RUNTIME=net-3.0&goto shift
-IF /I "%1" EQU "net-3.5" set RUNTIME=net-3.5&goto shift
-IF /I "%1" EQU "net-4.0" set RUNTIME=net-4.0&goto shift
-
-IF /I "%1" EQU "mono" set RUNTIME=mono&goto shift
-IF /I "%1" EQU "mono-1.0" set RUNTIME=mono-1.0&goto shift
-IF /I "%1" EQU "mono-2.0" set RUNTIME=mono-2.0&goto shift
-IF /I "%1" EQU "mono-3.5" set RUNTIME=mono-3.5&goto shift
-IF /I "%1" EQU "mono-4.0" set RUNTIME=mono-4.0&goto shift
-
-if /I "%1" EQU "clean" set CLEAN=clean&goto shift
-if /I "%1" EQU "clean-all" set CLEAN=clean-all&goto shift
-IF /I "%1" EQU "samples" set COMMANDS=%COMMANDS% build-samples&goto shift
-IF /I "%1" EQU "tools" set COMMANDS=%COMMANDS% build-tools&goto shift
-IF /I "%1" EQU "test" set COMMANDS=%COMMANDS% test&goto shift
-IF /I "%1" EQU "gui-test" set COMMANDS=%COMMANDS% gui-test&goto shift
-IF /I "%1" EQU "gen-syntax" set COMMANDS=%COMMANDS% gen-syntax&goto shift
-
-IF "%1" EQU "--" set PASSTHRU=TRUE&goto shift
-
-echo Invalid option: %1
-echo.
-echo Use BUILD /help for more information.
-echo.
-
-goto done
-
-:execute
-
-if "%CONFIG%" NEQ "" set OPTIONS=%OPTIONS% -D:build.config=%CONFIG%
-if "%RUNTIME%" NEQ "" set OPTIONS=%OPTIONS% -D:runtime.config=%RUNTIME%
-
-if "%COMMANDS%" EQU "" set COMMANDS=build
-
-%NANT% %OPTIONS% %CLEAN% %COMMANDS%
-
-goto done
-
-: usage
-
-echo Builds and tests NUnit for various targets
-echo.
-echo usage: BUILD [option [...] ] [ -- nantoptions ]
-echo.
-echo Options may be any of the following, in any order...
-echo.
-echo   debug          Builds debug configuration (default)
-echo   release        Builds release configuration
-echo.
-echo   net-4.0        Builds using .NET 4.0 framework (future)
-echo   net-3.5        Builds using .NET 3.5 framework (default)
-echo   net-2.0        Builds using .NET 2.0 framework
-echo   net-1.1        Builds using .NET 1.1 framework
-echo   net-1.0        Builds using .NET 1.0 framework
-echo   mono-4.0       Builds using Mono 4.0 profile (future)
-echo   mono-3.5       Builds using Mono 3.5 profile (default)
-echo   mono-2.0       Builds using Mono 2.0 profile
-echo   mono-1.0       Builds using Mono 1.0 profile
-echo.
-echo   net            Builds using default .NET version
-echo   mono           Builds using default Mono profile
-echo.
-echo   clean          Cleans the output directory before building
-echo   clean-all      Removes output directories for all runtimes
-echo.
-echo   samples        Builds the NUnit samples
-echo   tools          Builds the NUnit tools
-echo.
-echo   test           Runs tests for a build using the console runner
-echo   gui-test       Runs tests for a build using the NUnit gui
-echo.
-echo   ?, /h, /help   Displays this help message
-echo.
-echo Notes:
-echo.
-echo   1. The default .NET or Mono version to be used is selected
-echo      automatically by the NAnt script from those installed.
-echo.
-echo   2. When building under a framework version of 3.5 or higher,
-echo      the 2.0 framework is targeted for NUnit itself. Tests use
-echo      the specified higher level framework.
-echo.
-echo   3. Any arguments following '--' on the command line are passed
-echo      directly to the NAnt script.
-echo.
-
-: done
+@echo off
+
+rem BUILD - Builds and tests NUnit
+
+setlocal
+
+set NANT=tools\nant\bin\nant.exe
+set OPTIONS=-f:scripts\nunit.build.targets
+set CONFIG=
+set RUNTIME=
+set CLEAN=
+set COMMANDS=
+set PASSTHRU=
+goto start
+
+:shift
+shift /1
+
+:start
+
+IF "%1" EQU "" goto execute
+
+IF "%PASSTHRU%" EQU "TRUE" set COMMANDS=%COMMANDS% %1&goto shift
+
+IF /I "%1" EQU "?"	goto usage
+IF /I "%1" EQU "/h"	goto usage
+IF /I "%1" EQU "/help"	goto usage
+
+IF /I "%1" EQU "debug" set CONFIG=debug&goto shift
+IF /I "%1" EQU "release" set CONFIG=release&goto shift
+
+IF /I "%1" EQU "net" set RUNTIME=net&goto shift
+IF /I "%1" EQU "net-1.0" set RUNTIME=net-1.0&goto shift
+IF /I "%1" EQU "net-1.1" set RUNTIME=net-1.1&goto shift
+IF /I "%1" EQU "net-2.0" set RUNTIME=net-2.0&goto shift
+IF /I "%1" EQU "net-3.0" set RUNTIME=net-3.0&goto shift
+IF /I "%1" EQU "net-3.5" set RUNTIME=net-3.5&goto shift
+IF /I "%1" EQU "net-4.0" set RUNTIME=net-4.0&goto shift
+IF /I "%1" EQU "net-4.5" set RUNTIME=net-4.5&goto shift
+
+IF /I "%1" EQU "mono" set RUNTIME=mono&goto shift
+IF /I "%1" EQU "mono-1.0" set RUNTIME=mono-1.0&goto shift
+IF /I "%1" EQU "mono-2.0" set RUNTIME=mono-2.0&goto shift
+IF /I "%1" EQU "mono-3.5" set RUNTIME=mono-3.5&goto shift
+IF /I "%1" EQU "mono-4.0" set RUNTIME=mono-4.0&goto shift
+
+if /I "%1" EQU "clean" set CLEAN=clean&goto shift
+if /I "%1" EQU "clean-all" set CLEAN=clean-all&goto shift
+IF /I "%1" EQU "samples" set COMMANDS=%COMMANDS% build-samples&goto shift
+IF /I "%1" EQU "tools" set COMMANDS=%COMMANDS% build-tools&goto shift
+IF /I "%1" EQU "test" set COMMANDS=%COMMANDS% test&goto shift
+IF /I "%1" EQU "gui-test" set COMMANDS=%COMMANDS% gui-test&goto shift
+IF /I "%1" EQU "gen-syntax" set COMMANDS=%COMMANDS% gen-syntax&goto shift
+
+IF "%1" EQU "--" set PASSTHRU=TRUE&goto shift
+
+echo Invalid option: %1
+echo.
+echo Use BUILD /help for more information.
+echo.
+
+goto done
+
+: execute
+
+if "%CONFIG%" NEQ "" set OPTIONS=%OPTIONS% -D:build.config=%CONFIG%
+if "%RUNTIME%" NEQ "" set OPTIONS=%OPTIONS% -D:runtime.config=%RUNTIME%
+
+if "%COMMANDS%" EQU "" set COMMANDS=build
+
+%NANT% %OPTIONS% %CLEAN% %COMMANDS%
+
+goto done
+
+: usage
+
+echo Builds and tests NUnit for various targets
+echo.
+echo usage: BUILD [option [...] ] [ -- nantoptions ]
+echo.
+echo Options may be any of the following, in any order...
+echo.
+echo   debug          Builds debug configuration (default)
+echo   release        Builds release configuration
+echo.
+echo   net-4.5        Builds using .NET 4.5 framework (future)
+echo   net-4.0        Builds using .NET 4.0 framework (future)
+echo   net-3.5        Builds using .NET 3.5 framework (default)
+echo   net-2.0        Builds using .NET 2.0 framework
+echo   net-1.1        Builds using .NET 1.1 framework
+echo   net-1.0        Builds using .NET 1.0 framework
+echo   mono-4.0       Builds using Mono 4.0 profile (future)
+echo   mono-3.5       Builds using Mono 3.5 profile (default)
+echo   mono-2.0       Builds using Mono 2.0 profile
+echo   mono-1.0       Builds using Mono 1.0 profile
+echo.
+echo   net            Builds using default .NET version
+echo   mono           Builds using default Mono profile
+echo.
+echo   clean          Cleans the output directory before building
+echo   clean-all      Removes output directories for all runtimes
+echo.
+echo   samples        Builds the NUnit samples
+echo   tools          Builds the NUnit tools
+echo.
+echo   test           Runs tests for a build using the console runner
+echo   gui-test       Runs tests for a build using the NUnit gui
+echo.
+echo   ?, /h, /help   Displays this help message
+echo.
+echo Notes:
+echo.
+echo   1. The default .NET or Mono version to be used is selected
+echo      automatically by the NAnt script from those installed.
+echo.
+echo   2. When building under a framework version of 3.5 or higher,
+echo      the 2.0 framework is targeted for NUnit itself. Tests use
+echo      the specified higher level framework.
+echo.
+echo   3. Any arguments following '--' on the command line are passed
+echo      directly to the NAnt script.
+echo.
+
+: done

=== modified file 'nunit.sln'
--- nunit.sln	2012-08-08 03:34:12 +0000
+++ nunit.sln	2012-10-03 23:32:21 +0000
@@ -1,266 +1,280 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A65042E1-D8BC-48DD-8DE1-F0991F07EA77}"
-	ProjectSection(SolutionItems) = preProject
-		src\nunit.snk = src\nunit.snk
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{A785FC02-6044-4864-BE24-4593CAD23A97}"
-	ProjectSection(SolutionItems) = preProject
-		scripts\nunit.build.targets = scripts\nunit.build.targets
-		scripts\nunit.common.targets = scripts\nunit.common.targets
-		scripts\nunit.package.targets = scripts\nunit.package.targets
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitFramework", "NUnitFramework", "{A2FF9F1B-1854-479A-859C-6ECEBF045E4C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClientUtilities", "ClientUtilities", "{D448BA20-BA70-4F70-AF53-4C0E6C1E97E7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConsoleRunner", "ConsoleRunner", "{1DBAF726-8009-41CC-B82A-4EFE94CBEEFC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GuiRunner", "GuiRunner", "{77D10207-CB02-4C3A-8734-5A5173E3C506}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitCore", "NUnitCore", "{AEAED2BD-F22D-42C8-9047-F293BEF70EAB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GuiComponents", "GuiComponents", "{168F8C38-129C-454A-B112-F456BC7F4FE4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GuiException", "GuiException", "{35A92AA3-A1E6-426E-8D96-322F3EBF1C8D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6142B985-EA14-4DE0-884F-E62D89949E1D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitMocks", "NUnitMocks", "{7740410A-54B5-4334-8DE3-6D6F616BD6A5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PNUnit", "PNUnit", "{979724B8-6FAA-400F-B40D-EB653A815C87}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitTestServer", "NUnitTestServer", "{D029F8FD-84E3-4AD3-8F1B-CCA0C856E659}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectEditor", "ProjectEditor", "{992367F7-9154-4424-B55E-3EF8673A2A36}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.tests", "src\NUnitFramework\tests\nunit.framework.tests.csproj", "{8C326431-AE57-4645-ACC1-A90A0B425129}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.util.tests", "src\ClientUtilities\tests\nunit.util.tests.csproj", "{74EF7165-117E-48ED-98EA-068EAE438E53}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.util.dll", "src\ClientUtilities\util\nunit.util.dll.csproj", "{61CE9CE5-943E-44D4-A381-814DC1406767}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console.tests", "src\ConsoleRunner\tests\nunit-console.tests.csproj", "{8597D2C6-804D-48CB-BFC7-ED2404D389B0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console", "src\ConsoleRunner\nunit-console\nunit-console.csproj", "{9367EC89-6A38-42BA-9607-0DC288E4BC3A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console.exe", "src\ConsoleRunner\nunit-console-exe\nunit-console.exe.csproj", "{53BF8787-CB9C-4BB8-AFB4-605DD3A5CA0E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-gui", "src\GuiRunner\nunit-gui\nunit-gui.csproj", "{3FF340D5-D3B4-4DF0-BAF1-98B3C00B6148}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-gui.tests", "src\GuiRunner\tests\nunit-gui.tests.csproj", "{AAD27267-DE1F-4F61-A1FB-D1680A5B8001}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-gui.exe", "src\GuiRunner\nunit-gui-exe\nunit-gui.exe.csproj", "{AAB186A4-FA3D-404D-AD78-7EB5BB861655}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.tests", "src\NUnitCore\tests\nunit.core.tests.csproj", "{DD758D21-E5D5-4D40-9450-5F65A32F359C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.interfaces.dll", "src\NUnitCore\interfaces\nunit.core.interfaces.dll.csproj", "{435428F8-5995-4CE4-8022-93D595A8CC0F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "src\NUnitCore\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.uikit.tests", "src\GuiComponents\tests\nunit.uikit.tests.csproj", "{63EC3999-FA6B-4C5B-8805-5A88AF4CBD7B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.uikit.dll", "src\GuiComponents\UiKit\nunit.uikit.dll.csproj", "{27531BBF-183D-4C3A-935B-D840B9F1A3A4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.uiexception.tests", "src\GuiException\tests\nunit.uiexception.tests.csproj", "{092486D0-6AB9-4134-932F-0FDA10704455}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.uiexception.dll", "src\GuiException\UiException\nunit.uiexception.dll.csproj", "{3E87A106-EB20-4147-84C8-95B0BB43A1D4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mock-assembly", "src\tests\mock-assembly\mock-assembly.csproj", "{2E368281-3BA8-4050-B05E-0E0E43F8F446}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nonamespace-assembly", "src\tests\nonamespace-assembly\nonamespace-assembly.csproj", "{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test-utilities", "src\tests\test-utilities\test-utilities.csproj", "{3E63AD0F-24D4-46BE-BEE4-5A3299847D86}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test-assembly", "src\tests\test-assembly\test-assembly.csproj", "{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.mocks.tests", "src\NUnitMocks\tests\nunit.mocks.tests.csproj", "{8667C588-1A05-4773-A9E8-272EB302B8AB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.mocks", "src\NUnitMocks\mocks\nunit.mocks.csproj", "{EEE7C98B-23E6-472D-9036-C2D53B0DFE7C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pnunit-agent", "src\PNUnit\agent\pnunit-agent.csproj", "{621C27DA-CC29-4663-9FE4-BF5A67970C18}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pnunit-launcher", "src\PNUnit\launcher\pnunit-launcher.csproj", "{91FC5C92-E801-4446-B4D6-EAC5B56A4DB2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pnunit.tests", "src\PNUnit\tests\pnunit.tests.csproj", "{319B9238-76BE-4335-9B4D-F8E43C4B124F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pnunit.framework", "src\PNUnit\pnunit.framework\pnunit.framework.csproj", "{5261ABA1-98E6-4603-A4F0-59CAC307AC68}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-agent.exe", "src\NUnitTestServer\nunit-agent-exe\nunit-agent.exe.csproj", "{3E469CD9-FED2-4955-AE4C-669A74CA6767}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-editor", "src\ProjectEditor\editor\nunit-editor.csproj", "{ED57DCEC-3C16-4A90-BD3C-4D5BE5AD70FB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-editor.tests", "src\ProjectEditor\tests\nunit-editor.tests.csproj", "{A9E1C1E9-AE97-4510-AD94-EAFADE425FBE}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8C326431-AE57-4645-ACC1-A90A0B425129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C326431-AE57-4645-ACC1-A90A0B425129}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C326431-AE57-4645-ACC1-A90A0B425129}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C326431-AE57-4645-ACC1-A90A0B425129}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.Build.0 = Release|Any CPU
-		{74EF7165-117E-48ED-98EA-068EAE438E53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{74EF7165-117E-48ED-98EA-068EAE438E53}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{74EF7165-117E-48ED-98EA-068EAE438E53}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{74EF7165-117E-48ED-98EA-068EAE438E53}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61CE9CE5-943E-44D4-A381-814DC1406767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61CE9CE5-943E-44D4-A381-814DC1406767}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61CE9CE5-943E-44D4-A381-814DC1406767}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61CE9CE5-943E-44D4-A381-814DC1406767}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8597D2C6-804D-48CB-BFC7-ED2404D389B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8597D2C6-804D-48CB-BFC7-ED2404D389B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8597D2C6-804D-48CB-BFC7-ED2404D389B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8597D2C6-804D-48CB-BFC7-ED2404D389B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{53BF8787-CB9C-4BB8-AFB4-605DD3A5CA0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53BF8787-CB9C-4BB8-AFB4-605DD3A5CA0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53BF8787-CB9C-4BB8-AFB4-605DD3A5CA0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53BF8787-CB9C-4BB8-AFB4-605DD3A5CA0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3FF340D5-D3B4-4DF0-BAF1-98B3C00B6148}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FF340D5-D3B4-4DF0-BAF1-98B3C00B6148}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3FF340D5-D3B4-4DF0-BAF1-98B3C00B6148}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3FF340D5-D3B4-4DF0-BAF1-98B3C00B6148}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AAD27267-DE1F-4F61-A1FB-D1680A5B8001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAD27267-DE1F-4F61-A1FB-D1680A5B8001}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAD27267-DE1F-4F61-A1FB-D1680A5B8001}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AAD27267-DE1F-4F61-A1FB-D1680A5B8001}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AAB186A4-FA3D-404D-AD78-7EB5BB861655}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAB186A4-FA3D-404D-AD78-7EB5BB861655}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAB186A4-FA3D-404D-AD78-7EB5BB861655}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AAB186A4-FA3D-404D-AD78-7EB5BB861655}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DD758D21-E5D5-4D40-9450-5F65A32F359C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD758D21-E5D5-4D40-9450-5F65A32F359C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD758D21-E5D5-4D40-9450-5F65A32F359C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DD758D21-E5D5-4D40-9450-5F65A32F359C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{435428F8-5995-4CE4-8022-93D595A8CC0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{435428F8-5995-4CE4-8022-93D595A8CC0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{435428F8-5995-4CE4-8022-93D595A8CC0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{435428F8-5995-4CE4-8022-93D595A8CC0F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63EC3999-FA6B-4C5B-8805-5A88AF4CBD7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63EC3999-FA6B-4C5B-8805-5A88AF4CBD7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63EC3999-FA6B-4C5B-8805-5A88AF4CBD7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63EC3999-FA6B-4C5B-8805-5A88AF4CBD7B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27531BBF-183D-4C3A-935B-D840B9F1A3A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27531BBF-183D-4C3A-935B-D840B9F1A3A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27531BBF-183D-4C3A-935B-D840B9F1A3A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27531BBF-183D-4C3A-935B-D840B9F1A3A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{092486D0-6AB9-4134-932F-0FDA10704455}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{092486D0-6AB9-4134-932F-0FDA10704455}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{092486D0-6AB9-4134-932F-0FDA10704455}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{092486D0-6AB9-4134-932F-0FDA10704455}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E87A106-EB20-4147-84C8-95B0BB43A1D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E87A106-EB20-4147-84C8-95B0BB43A1D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E87A106-EB20-4147-84C8-95B0BB43A1D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E87A106-EB20-4147-84C8-95B0BB43A1D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E368281-3BA8-4050-B05E-0E0E43F8F446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E368281-3BA8-4050-B05E-0E0E43F8F446}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E368281-3BA8-4050-B05E-0E0E43F8F446}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E368281-3BA8-4050-B05E-0E0E43F8F446}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E63AD0F-24D4-46BE-BEE4-5A3299847D86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E63AD0F-24D4-46BE-BEE4-5A3299847D86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E63AD0F-24D4-46BE-BEE4-5A3299847D86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E63AD0F-24D4-46BE-BEE4-5A3299847D86}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8667C588-1A05-4773-A9E8-272EB302B8AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8667C588-1A05-4773-A9E8-272EB302B8AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8667C588-1A05-4773-A9E8-272EB302B8AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8667C588-1A05-4773-A9E8-272EB302B8AB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEE7C98B-23E6-472D-9036-C2D53B0DFE7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEE7C98B-23E6-472D-9036-C2D53B0DFE7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEE7C98B-23E6-472D-9036-C2D53B0DFE7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEE7C98B-23E6-472D-9036-C2D53B0DFE7C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{621C27DA-CC29-4663-9FE4-BF5A67970C18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{621C27DA-CC29-4663-9FE4-BF5A67970C18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{621C27DA-CC29-4663-9FE4-BF5A67970C18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{621C27DA-CC29-4663-9FE4-BF5A67970C18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91FC5C92-E801-4446-B4D6-EAC5B56A4DB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91FC5C92-E801-4446-B4D6-EAC5B56A4DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91FC5C92-E801-4446-B4D6-EAC5B56A4DB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91FC5C92-E801-4446-B4D6-EAC5B56A4DB2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{319B9238-76BE-4335-9B4D-F8E43C4B124F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{319B9238-76BE-4335-9B4D-F8E43C4B124F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{319B9238-76BE-4335-9B4D-F8E43C4B124F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{319B9238-76BE-4335-9B4D-F8E43C4B124F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5261ABA1-98E6-4603-A4F0-59CAC307AC68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5261ABA1-98E6-4603-A4F0-59CAC307AC68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5261ABA1-98E6-4603-A4F0-59CAC307AC68}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5261ABA1-98E6-4603-A4F0-59CAC307AC68}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E469CD9-FED2-4955-AE4C-669A74CA6767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E469CD9-FED2-4955-AE4C-669A74CA6767}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E469CD9-FED2-4955-AE4C-669A74CA6767}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E469CD9-FED2-4955-AE4C-669A74CA6767}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED57DCEC-3C16-4A90-BD3C-4D5BE5AD70FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED57DCEC-3C16-4A90-BD3C-4D5BE5AD70FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED57DCEC-3C16-4A90-BD3C-4D5BE5AD70FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED57DCEC-3C16-4A90-BD3C-4D5BE5AD70FB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A9E1C1E9-AE97-4510-AD94-EAFADE425FBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9E1C1E9-AE97-4510-AD94-EAFADE425FBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9E1C1E9-AE97-4510-AD94-EAFADE425FBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9E1C1E9-AE97-4510-AD94-EAFADE425FBE}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A785FC02-6044-4864-BE24-4593CAD23A97} = {A65042E1-D8BC-48DD-8DE1-F0991F07EA77}
-		{8C326431-AE57-4645-ACC1-A90A0B425129} = {A2FF9F1B-1854-479A-859C-6ECEBF045E4C}
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382} = {A2FF9F1B-1854-479A-859C-6ECEBF045E4C}
-		{74EF7165-117E-48ED-98EA-068EAE438E53} = {D448BA20-BA70-4F70-AF53-4C0E6C1E97E7}
-		{61CE9CE5-943E-44D4-A381-814DC1406767} = {D448BA20-BA70-4F70-AF53-4C0E6C1E97E7}
-		{8597D2C6-804D-48CB-BFC7-ED2404D389B0} = {1DBAF726-8009-41CC-B82A-4EFE94CBEEFC}
-		{9367EC89-6A38-42BA-9607-0DC288E4BC3A} = {1DBAF726-8009-41CC-B82A-4EFE94CBEEFC}
-		{53BF8787-CB9C-4BB8-AFB4-605DD3A5CA0E} = {1DBAF726-8009-41CC-B82A-4EFE94CBEEFC}
-		{3FF340D5-D3B4-4DF0-BAF1-98B3C00B6148} = {77D10207-CB02-4C3A-8734-5A5173E3C506}
-		{AAD27267-DE1F-4F61-A1FB-D1680A5B8001} = {77D10207-CB02-4C3A-8734-5A5173E3C506}
-		{AAB186A4-FA3D-404D-AD78-7EB5BB861655} = {77D10207-CB02-4C3A-8734-5A5173E3C506}
-		{DD758D21-E5D5-4D40-9450-5F65A32F359C} = {AEAED2BD-F22D-42C8-9047-F293BEF70EAB}
-		{435428F8-5995-4CE4-8022-93D595A8CC0F} = {AEAED2BD-F22D-42C8-9047-F293BEF70EAB}
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {AEAED2BD-F22D-42C8-9047-F293BEF70EAB}
-		{63EC3999-FA6B-4C5B-8805-5A88AF4CBD7B} = {168F8C38-129C-454A-B112-F456BC7F4FE4}
-		{27531BBF-183D-4C3A-935B-D840B9F1A3A4} = {168F8C38-129C-454A-B112-F456BC7F4FE4}
-		{092486D0-6AB9-4134-932F-0FDA10704455} = {35A92AA3-A1E6-426E-8D96-322F3EBF1C8D}
-		{3E87A106-EB20-4147-84C8-95B0BB43A1D4} = {35A92AA3-A1E6-426E-8D96-322F3EBF1C8D}
-		{2E368281-3BA8-4050-B05E-0E0E43F8F446} = {6142B985-EA14-4DE0-884F-E62D89949E1D}
-		{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D} = {6142B985-EA14-4DE0-884F-E62D89949E1D}
-		{3E63AD0F-24D4-46BE-BEE4-5A3299847D86} = {6142B985-EA14-4DE0-884F-E62D89949E1D}
-		{1960CAC4-9A82-47C5-A9B3-55BC37572C3C} = {6142B985-EA14-4DE0-884F-E62D89949E1D}
-		{8667C588-1A05-4773-A9E8-272EB302B8AB} = {7740410A-54B5-4334-8DE3-6D6F616BD6A5}
-		{EEE7C98B-23E6-472D-9036-C2D53B0DFE7C} = {7740410A-54B5-4334-8DE3-6D6F616BD6A5}
-		{621C27DA-CC29-4663-9FE4-BF5A67970C18} = {979724B8-6FAA-400F-B40D-EB653A815C87}
-		{91FC5C92-E801-4446-B4D6-EAC5B56A4DB2} = {979724B8-6FAA-400F-B40D-EB653A815C87}
-		{319B9238-76BE-4335-9B4D-F8E43C4B124F} = {979724B8-6FAA-400F-B40D-EB653A815C87}
-		{5261ABA1-98E6-4603-A4F0-59CAC307AC68} = {979724B8-6FAA-400F-B40D-EB653A815C87}
-		{3E469CD9-FED2-4955-AE4C-669A74CA6767} = {D029F8FD-84E3-4AD3-8F1B-CCA0C856E659}
-		{ED57DCEC-3C16-4A90-BD3C-4D5BE5AD70FB} = {992367F7-9154-4424-B55E-3EF8673A2A36}
-		{A9E1C1E9-AE97-4510-AD94-EAFADE425FBE} = {992367F7-9154-4424-B55E-3EF8673A2A36}
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = src\ConsoleRunner\nunit-console-exe\nunit-console.exe.csproj
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A65042E1-D8BC-48DD-8DE1-F0991F07EA77}"
+	ProjectSection(SolutionItems) = preProject
+		src\nunit.snk = src\nunit.snk
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{A785FC02-6044-4864-BE24-4593CAD23A97}"
+	ProjectSection(SolutionItems) = preProject
+		scripts\nunit.build.targets = scripts\nunit.build.targets
+		scripts\nunit.common.targets = scripts\nunit.common.targets
+		scripts\nunit.package.targets = scripts\nunit.package.targets
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitFramework", "NUnitFramework", "{A2FF9F1B-1854-479A-859C-6ECEBF045E4C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClientUtilities", "ClientUtilities", "{D448BA20-BA70-4F70-AF53-4C0E6C1E97E7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConsoleRunner", "ConsoleRunner", "{1DBAF726-8009-41CC-B82A-4EFE94CBEEFC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GuiRunner", "GuiRunner", "{77D10207-CB02-4C3A-8734-5A5173E3C506}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitCore", "NUnitCore", "{AEAED2BD-F22D-42C8-9047-F293BEF70EAB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GuiComponents", "GuiComponents", "{168F8C38-129C-454A-B112-F456BC7F4FE4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GuiException", "GuiException", "{35A92AA3-A1E6-426E-8D96-322F3EBF1C8D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6142B985-EA14-4DE0-884F-E62D89949E1D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitMocks", "NUnitMocks", "{7740410A-54B5-4334-8DE3-6D6F616BD6A5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PNUnit", "PNUnit", "{979724B8-6FAA-400F-B40D-EB653A815C87}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitTestServer", "NUnitTestServer", "{D029F8FD-84E3-4AD3-8F1B-CCA0C856E659}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectEditor", "ProjectEditor", "{992367F7-9154-4424-B55E-3EF8673A2A36}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.tests", "src\NUnitFramework\tests\nunit.framework.tests.csproj", "{8C326431-AE57-4645-ACC1-A90A0B425129}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.util.tests", "src\ClientUtilities\tests\nunit.util.tests.csproj", "{74EF7165-117E-48ED-98EA-068EAE438E53}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.util.dll", "src\ClientUtilities\util\nunit.util.dll.csproj", "{61CE9CE5-943E-44D4-A381-814DC1406767}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console.tests", "src\ConsoleRunner\tests\nunit-console.tests.csproj", "{8597D2C6-804D-48CB-BFC7-ED2404D389B0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console", "src\ConsoleRunner\nunit-console\nunit-console.csproj", "{9367EC89-6A38-42BA-9607-0DC288E4BC3A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console.exe", "src\ConsoleRunner\nunit-console-exe\nunit-console.exe.csproj", "{53BF8787-CB9C-4BB8-AFB4-605DD3A5CA0E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-gui", "src\GuiRunner\nunit-gui\nunit-gui.csproj", "{3FF340D5-D3B4-4DF0-BAF1-98B3C00B6148}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-gui.tests", "src\GuiRunner\tests\nunit-gui.tests.csproj", "{AAD27267-DE1F-4F61-A1FB-D1680A5B8001}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-gui.exe", "src\GuiRunner\nunit-gui-exe\nunit-gui.exe.csproj", "{AAB186A4-FA3D-404D-AD78-7EB5BB861655}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.tests", "src\NUnitCore\tests\nunit.core.tests.csproj", "{DD758D21-E5D5-4D40-9450-5F65A32F359C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.interfaces.dll", "src\NUnitCore\interfaces\nunit.core.interfaces.dll.csproj", "{435428F8-5995-4CE4-8022-93D595A8CC0F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "src\NUnitCore\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.uikit.tests", "src\GuiComponents\tests\nunit.uikit.tests.csproj", "{63EC3999-FA6B-4C5B-8805-5A88AF4CBD7B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.uikit.dll", "src\GuiComponents\UiKit\nunit.uikit.dll.csproj", "{27531BBF-183D-4C3A-935B-D840B9F1A3A4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.uiexception.tests", "src\GuiException\tests\nunit.uiexception.tests.csproj", "{092486D0-6AB9-4134-932F-0FDA10704455}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.uiexception.dll", "src\GuiException\UiException\nunit.uiexception.dll.csproj", "{3E87A106-EB20-4147-84C8-95B0BB43A1D4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mock-assembly", "src\tests\mock-assembly\mock-assembly.csproj", "{2E368281-3BA8-4050-B05E-0E0E43F8F446}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nonamespace-assembly", "src\tests\nonamespace-assembly\nonamespace-assembly.csproj", "{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test-utilities", "src\tests\test-utilities\test-utilities.csproj", "{3E63AD0F-24D4-46BE-BEE4-5A3299847D86}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test-assembly", "src\tests\test-assembly\test-assembly.csproj", "{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.mocks.tests", "src\NUnitMocks\tests\nunit.mocks.tests.csproj", "{8667C588-1A05-4773-A9E8-272EB302B8AB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.mocks", "src\NUnitMocks\mocks\nunit.mocks.csproj", "{EEE7C98B-23E6-472D-9036-C2D53B0DFE7C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pnunit-agent", "src\PNUnit\agent\pnunit-agent.csproj", "{621C27DA-CC29-4663-9FE4-BF5A67970C18}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pnunit-launcher", "src\PNUnit\launcher\pnunit-launcher.csproj", "{91FC5C92-E801-4446-B4D6-EAC5B56A4DB2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pnunit.tests", "src\PNUnit\tests\pnunit.tests.csproj", "{319B9238-76BE-4335-9B4D-F8E43C4B124F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pnunit.framework", "src\PNUnit\pnunit.framework\pnunit.framework.csproj", "{5261ABA1-98E6-4603-A4F0-59CAC307AC68}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-agent.exe", "src\NUnitTestServer\nunit-agent-exe\nunit-agent.exe.csproj", "{3E469CD9-FED2-4955-AE4C-669A74CA6767}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-editor", "src\ProjectEditor\editor\nunit-editor.csproj", "{ED57DCEC-3C16-4A90-BD3C-4D5BE5AD70FB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-editor.tests", "src\ProjectEditor\tests\nunit-editor.tests.csproj", "{A9E1C1E9-AE97-4510-AD94-EAFADE425FBE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.tests.net45", "src\NUnitCore\tests-net45\nunit.core.tests.net45.csproj", "{689A54F0-2B54-4D15-96A7-D8B6E6FE32B1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test-assembly-net45", "src\tests\test-assembly-net45\test-assembly-net45.csproj", "{74CCEAEA-CDBF-4FE0-BF0D-914C3C44ECE9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8C326431-AE57-4645-ACC1-A90A0B425129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C326431-AE57-4645-ACC1-A90A0B425129}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C326431-AE57-4645-ACC1-A90A0B425129}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C326431-AE57-4645-ACC1-A90A0B425129}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74EF7165-117E-48ED-98EA-068EAE438E53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74EF7165-117E-48ED-98EA-068EAE438E53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74EF7165-117E-48ED-98EA-068EAE438E53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74EF7165-117E-48ED-98EA-068EAE438E53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61CE9CE5-943E-44D4-A381-814DC1406767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61CE9CE5-943E-44D4-A381-814DC1406767}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61CE9CE5-943E-44D4-A381-814DC1406767}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61CE9CE5-943E-44D4-A381-814DC1406767}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8597D2C6-804D-48CB-BFC7-ED2404D389B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8597D2C6-804D-48CB-BFC7-ED2404D389B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8597D2C6-804D-48CB-BFC7-ED2404D389B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8597D2C6-804D-48CB-BFC7-ED2404D389B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53BF8787-CB9C-4BB8-AFB4-605DD3A5CA0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53BF8787-CB9C-4BB8-AFB4-605DD3A5CA0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53BF8787-CB9C-4BB8-AFB4-605DD3A5CA0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53BF8787-CB9C-4BB8-AFB4-605DD3A5CA0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FF340D5-D3B4-4DF0-BAF1-98B3C00B6148}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FF340D5-D3B4-4DF0-BAF1-98B3C00B6148}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FF340D5-D3B4-4DF0-BAF1-98B3C00B6148}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3FF340D5-D3B4-4DF0-BAF1-98B3C00B6148}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AAD27267-DE1F-4F61-A1FB-D1680A5B8001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAD27267-DE1F-4F61-A1FB-D1680A5B8001}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAD27267-DE1F-4F61-A1FB-D1680A5B8001}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAD27267-DE1F-4F61-A1FB-D1680A5B8001}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AAB186A4-FA3D-404D-AD78-7EB5BB861655}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAB186A4-FA3D-404D-AD78-7EB5BB861655}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAB186A4-FA3D-404D-AD78-7EB5BB861655}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAB186A4-FA3D-404D-AD78-7EB5BB861655}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD758D21-E5D5-4D40-9450-5F65A32F359C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD758D21-E5D5-4D40-9450-5F65A32F359C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD758D21-E5D5-4D40-9450-5F65A32F359C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD758D21-E5D5-4D40-9450-5F65A32F359C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{435428F8-5995-4CE4-8022-93D595A8CC0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{435428F8-5995-4CE4-8022-93D595A8CC0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{435428F8-5995-4CE4-8022-93D595A8CC0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{435428F8-5995-4CE4-8022-93D595A8CC0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63EC3999-FA6B-4C5B-8805-5A88AF4CBD7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63EC3999-FA6B-4C5B-8805-5A88AF4CBD7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63EC3999-FA6B-4C5B-8805-5A88AF4CBD7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63EC3999-FA6B-4C5B-8805-5A88AF4CBD7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27531BBF-183D-4C3A-935B-D840B9F1A3A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27531BBF-183D-4C3A-935B-D840B9F1A3A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27531BBF-183D-4C3A-935B-D840B9F1A3A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27531BBF-183D-4C3A-935B-D840B9F1A3A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{092486D0-6AB9-4134-932F-0FDA10704455}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{092486D0-6AB9-4134-932F-0FDA10704455}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{092486D0-6AB9-4134-932F-0FDA10704455}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{092486D0-6AB9-4134-932F-0FDA10704455}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E87A106-EB20-4147-84C8-95B0BB43A1D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E87A106-EB20-4147-84C8-95B0BB43A1D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E87A106-EB20-4147-84C8-95B0BB43A1D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E87A106-EB20-4147-84C8-95B0BB43A1D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E368281-3BA8-4050-B05E-0E0E43F8F446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E368281-3BA8-4050-B05E-0E0E43F8F446}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E368281-3BA8-4050-B05E-0E0E43F8F446}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E368281-3BA8-4050-B05E-0E0E43F8F446}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E63AD0F-24D4-46BE-BEE4-5A3299847D86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E63AD0F-24D4-46BE-BEE4-5A3299847D86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E63AD0F-24D4-46BE-BEE4-5A3299847D86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E63AD0F-24D4-46BE-BEE4-5A3299847D86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8667C588-1A05-4773-A9E8-272EB302B8AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8667C588-1A05-4773-A9E8-272EB302B8AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8667C588-1A05-4773-A9E8-272EB302B8AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8667C588-1A05-4773-A9E8-272EB302B8AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEE7C98B-23E6-472D-9036-C2D53B0DFE7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEE7C98B-23E6-472D-9036-C2D53B0DFE7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEE7C98B-23E6-472D-9036-C2D53B0DFE7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEE7C98B-23E6-472D-9036-C2D53B0DFE7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{621C27DA-CC29-4663-9FE4-BF5A67970C18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{621C27DA-CC29-4663-9FE4-BF5A67970C18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{621C27DA-CC29-4663-9FE4-BF5A67970C18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{621C27DA-CC29-4663-9FE4-BF5A67970C18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91FC5C92-E801-4446-B4D6-EAC5B56A4DB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91FC5C92-E801-4446-B4D6-EAC5B56A4DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91FC5C92-E801-4446-B4D6-EAC5B56A4DB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91FC5C92-E801-4446-B4D6-EAC5B56A4DB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{319B9238-76BE-4335-9B4D-F8E43C4B124F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{319B9238-76BE-4335-9B4D-F8E43C4B124F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{319B9238-76BE-4335-9B4D-F8E43C4B124F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{319B9238-76BE-4335-9B4D-F8E43C4B124F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5261ABA1-98E6-4603-A4F0-59CAC307AC68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5261ABA1-98E6-4603-A4F0-59CAC307AC68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5261ABA1-98E6-4603-A4F0-59CAC307AC68}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5261ABA1-98E6-4603-A4F0-59CAC307AC68}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E469CD9-FED2-4955-AE4C-669A74CA6767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E469CD9-FED2-4955-AE4C-669A74CA6767}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E469CD9-FED2-4955-AE4C-669A74CA6767}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E469CD9-FED2-4955-AE4C-669A74CA6767}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED57DCEC-3C16-4A90-BD3C-4D5BE5AD70FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED57DCEC-3C16-4A90-BD3C-4D5BE5AD70FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED57DCEC-3C16-4A90-BD3C-4D5BE5AD70FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED57DCEC-3C16-4A90-BD3C-4D5BE5AD70FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9E1C1E9-AE97-4510-AD94-EAFADE425FBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9E1C1E9-AE97-4510-AD94-EAFADE425FBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9E1C1E9-AE97-4510-AD94-EAFADE425FBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9E1C1E9-AE97-4510-AD94-EAFADE425FBE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{689A54F0-2B54-4D15-96A7-D8B6E6FE32B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{689A54F0-2B54-4D15-96A7-D8B6E6FE32B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{689A54F0-2B54-4D15-96A7-D8B6E6FE32B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{689A54F0-2B54-4D15-96A7-D8B6E6FE32B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74CCEAEA-CDBF-4FE0-BF0D-914C3C44ECE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74CCEAEA-CDBF-4FE0-BF0D-914C3C44ECE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74CCEAEA-CDBF-4FE0-BF0D-914C3C44ECE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74CCEAEA-CDBF-4FE0-BF0D-914C3C44ECE9}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{A785FC02-6044-4864-BE24-4593CAD23A97} = {A65042E1-D8BC-48DD-8DE1-F0991F07EA77}
+		{8C326431-AE57-4645-ACC1-A90A0B425129} = {A2FF9F1B-1854-479A-859C-6ECEBF045E4C}
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382} = {A2FF9F1B-1854-479A-859C-6ECEBF045E4C}
+		{74EF7165-117E-48ED-98EA-068EAE438E53} = {D448BA20-BA70-4F70-AF53-4C0E6C1E97E7}
+		{61CE9CE5-943E-44D4-A381-814DC1406767} = {D448BA20-BA70-4F70-AF53-4C0E6C1E97E7}
+		{8597D2C6-804D-48CB-BFC7-ED2404D389B0} = {1DBAF726-8009-41CC-B82A-4EFE94CBEEFC}
+		{9367EC89-6A38-42BA-9607-0DC288E4BC3A} = {1DBAF726-8009-41CC-B82A-4EFE94CBEEFC}
+		{53BF8787-CB9C-4BB8-AFB4-605DD3A5CA0E} = {1DBAF726-8009-41CC-B82A-4EFE94CBEEFC}
+		{3FF340D5-D3B4-4DF0-BAF1-98B3C00B6148} = {77D10207-CB02-4C3A-8734-5A5173E3C506}
+		{AAD27267-DE1F-4F61-A1FB-D1680A5B8001} = {77D10207-CB02-4C3A-8734-5A5173E3C506}
+		{AAB186A4-FA3D-404D-AD78-7EB5BB861655} = {77D10207-CB02-4C3A-8734-5A5173E3C506}
+		{DD758D21-E5D5-4D40-9450-5F65A32F359C} = {AEAED2BD-F22D-42C8-9047-F293BEF70EAB}
+		{435428F8-5995-4CE4-8022-93D595A8CC0F} = {AEAED2BD-F22D-42C8-9047-F293BEF70EAB}
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {AEAED2BD-F22D-42C8-9047-F293BEF70EAB}
+		{689A54F0-2B54-4D15-96A7-D8B6E6FE32B1} = {AEAED2BD-F22D-42C8-9047-F293BEF70EAB}
+		{63EC3999-FA6B-4C5B-8805-5A88AF4CBD7B} = {168F8C38-129C-454A-B112-F456BC7F4FE4}
+		{27531BBF-183D-4C3A-935B-D840B9F1A3A4} = {168F8C38-129C-454A-B112-F456BC7F4FE4}
+		{092486D0-6AB9-4134-932F-0FDA10704455} = {35A92AA3-A1E6-426E-8D96-322F3EBF1C8D}
+		{3E87A106-EB20-4147-84C8-95B0BB43A1D4} = {35A92AA3-A1E6-426E-8D96-322F3EBF1C8D}
+		{2E368281-3BA8-4050-B05E-0E0E43F8F446} = {6142B985-EA14-4DE0-884F-E62D89949E1D}
+		{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D} = {6142B985-EA14-4DE0-884F-E62D89949E1D}
+		{3E63AD0F-24D4-46BE-BEE4-5A3299847D86} = {6142B985-EA14-4DE0-884F-E62D89949E1D}
+		{1960CAC4-9A82-47C5-A9B3-55BC37572C3C} = {6142B985-EA14-4DE0-884F-E62D89949E1D}
+		{74CCEAEA-CDBF-4FE0-BF0D-914C3C44ECE9} = {6142B985-EA14-4DE0-884F-E62D89949E1D}
+		{8667C588-1A05-4773-A9E8-272EB302B8AB} = {7740410A-54B5-4334-8DE3-6D6F616BD6A5}
+		{EEE7C98B-23E6-472D-9036-C2D53B0DFE7C} = {7740410A-54B5-4334-8DE3-6D6F616BD6A5}
+		{621C27DA-CC29-4663-9FE4-BF5A67970C18} = {979724B8-6FAA-400F-B40D-EB653A815C87}
+		{91FC5C92-E801-4446-B4D6-EAC5B56A4DB2} = {979724B8-6FAA-400F-B40D-EB653A815C87}
+		{319B9238-76BE-4335-9B4D-F8E43C4B124F} = {979724B8-6FAA-400F-B40D-EB653A815C87}
+		{5261ABA1-98E6-4603-A4F0-59CAC307AC68} = {979724B8-6FAA-400F-B40D-EB653A815C87}
+		{3E469CD9-FED2-4955-AE4C-669A74CA6767} = {D029F8FD-84E3-4AD3-8F1B-CCA0C856E659}
+		{ED57DCEC-3C16-4A90-BD3C-4D5BE5AD70FB} = {992367F7-9154-4424-B55E-3EF8673A2A36}
+		{A9E1C1E9-AE97-4510-AD94-EAFADE425FBE} = {992367F7-9154-4424-B55E-3EF8673A2A36}
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = src\ConsoleRunner\nunit-console-exe\nunit-console.exe.csproj
+	EndGlobalSection
+EndGlobal

=== modified file 'scripts/nunit.build.targets'
--- scripts/nunit.build.targets	2012-07-10 20:38:33 +0000
+++ scripts/nunit.build.targets	2012-10-03 23:32:21 +0000
@@ -106,8 +106,10 @@
     <call target="build-gui" if="${runtime.version >= '2.0'}" />
 
     <!-- Copy test project for this runtime framework -->
+    <property name="runtime.testproj" value="NUnitTests.v3.nunit"
+      if="${framework::exists('net-4.5')}"/>
     <property name="runtime.testproj" value="NUnitTests.v2.nunit"
-      if="${runtime.version >= '2.0'}"/>
+      if="${runtime.version >= '2.0'}" unless="${framework::exists('net-4.5')}"/>
     <property name="runtime.testproj" value="NUnitTests.v1.nunit"
       unless="${runtime.version >= '2.0'}"/>
 
@@ -405,11 +407,13 @@
     <include name="tests/mock-assembly/mock-assembly.build" />
     <include name="tests/nonamespace-assembly/nonamespace-assembly.build" />
     <include name="tests/test-assembly/test-assembly.build" />
+    <include name="tests/test-assembly-net45/test-assembly-net45.build" if="${framework::exists('net-4.5')}" />
     <include name="tests/test-utilities/test-utilities.build" />
 
     <!-- NUnit Base Tests -->
     <include name="NUnitFramework/tests/nunit.framework.tests.build" />
     <include name="NUnitCore/tests/nunit.core.tests.build" />
+    <include name="NUnitCore/tests-net45/nunit.core.tests.net45.build" if="${framework::exists('net-4.5')}" />
     <include name="NUnitMocks/tests/nunit.mocks.tests.build" />
     <include name="ClientUtilities/tests/nunit.util.tests.build" />
 

=== modified file 'scripts/nunit.common.targets'
--- scripts/nunit.common.targets	2012-08-08 03:19:39 +0000
+++ scripts/nunit.common.targets	2012-10-03 23:32:21 +0000
@@ -48,7 +48,7 @@
          The first .NET and Mono frameworks found are the
          respective net and mono defaults. -->
   <property name="supported.frameworks" 
-    value="net-3.5,net-2.0,net-4.0,net-1.1,net-1.0,mono-3.5,mono-2.0,mono-1.0"/>
+    value="net-3.5,net-2.0,net-4.0,net-4.5,net-1.1,net-1.0,mono-3.5,mono-2.0,mono-1.0"/>
 
   <!-- Packages we normally create -->
   <property name="standard.packages" value="net-3.5,net-1.1" 
@@ -239,6 +239,16 @@
     <property name="supported.test.platforms" value="net-4.0"/>
 
   </target>
+  
+  <target name="set-net-4.5-runtime-config">
+
+    <property name="runtime.platform" value="net"/>
+    <property name="runtime.version" value="4.5"/>
+    <property name="target.version" value="2.0"/>
+    <property name="runtime.defines" value="MSNET,CLR_4_0,NET_4_5,CS_5_0"/>
+    <property name="supported.test.platforms" value="net-4.5"/>
+
+  </target>
  	
   <target name="set-mono-1.0-runtime-config">
 

=== modified file 'scripts/nunit.package.targets'
--- scripts/nunit.package.targets	2012-07-10 20:38:33 +0000
+++ scripts/nunit.package.targets	2012-10-03 23:32:21 +0000
@@ -549,11 +549,13 @@
     <include name="tests/mock-assembly/mock-assembly.build" />
     <include name="tests/nonamespace-assembly/nonamespace-assembly.build" />
     <include name="tests/test-assembly/test-assembly.build" />
+	<include name="tests/test-assembly-net45/test-assembly-net45.build" if="${framework::exists('net-4.5')}" />
     <include name="tests/test-utilities/test-utilities.build" />
 
     <!-- NUnit Base Tests -->
     <include name="NUnitFramework/tests/nunit.framework.tests.build" />
     <include name="NUnitCore/tests/nunit.core.tests.build" />
+	<include name="NUnitCore/tests-net45/nunit.core.tests.net45.build" if="${framework::exists('net-4.5')}" />
     <include name="NUnitMocks/tests/nunit.mocks.tests.build" />
     <include name="ClientUtilities/tests/nunit.util.tests.build" />
 

=== modified file 'src/ClientUtilities/util/ProcessRunner.cs'
--- src/ClientUtilities/util/ProcessRunner.cs	2012-09-17 22:23:53 +0000
+++ src/ClientUtilities/util/ProcessRunner.cs	2012-10-03 23:32:21 +0000
@@ -44,8 +44,8 @@
         public override bool Load(TestPackage package)
 		{
             log.Info("Loading " + package.Name);
-			Unload();
-
+			Unload();
+
             runtimeFramework = package.Settings["RuntimeFramework"] as RuntimeFramework;
             if ( runtimeFramework == null )
                  runtimeFramework = RuntimeFramework.CurrentFramework;

=== modified file 'src/ClientUtilities/util/RuntimeFrameworkSelector.cs'
--- src/ClientUtilities/util/RuntimeFrameworkSelector.cs	2011-03-06 02:39:31 +0000
+++ src/ClientUtilities/util/RuntimeFrameworkSelector.cs	2012-10-03 23:32:21 +0000
@@ -3,7 +3,8 @@
 // This is free software licensed under the NUnit license. You may
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
-using System;
+using System;
+using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using NUnit.Core;
@@ -22,8 +23,8 @@
         /// </summary>
         /// <param name="package">A TestPackage</param>
         /// <returns>The selected RuntimeFramework</returns>
-        public RuntimeFramework SelectRuntimeFramework(TestPackage package)
-        {
+        public RuntimeFramework SelectRuntimeFramework(TestPackage package)
+        {
             RuntimeFramework currentFramework = RuntimeFramework.CurrentFramework;
             RuntimeFramework requestedFramework = package.Settings["RuntimeFramework"] as RuntimeFramework;
 

=== modified file 'src/ClientUtilities/util/Services/TestAgency.cs'
--- src/ClientUtilities/util/Services/TestAgency.cs	2012-09-17 22:23:53 +0000
+++ src/ClientUtilities/util/Services/TestAgency.cs	2012-10-03 23:32:21 +0000
@@ -119,8 +119,8 @@
             return GetNUnitBinDirectory(version) != null;
         }
 
-		public TestAgent GetAgent()
-		{
+		public TestAgent GetAgent()
+		{
 			return GetAgent( RuntimeFramework.CurrentFramework, Timeout.Infinite );
 		}
 
@@ -130,8 +130,8 @@
         }
 
         public TestAgent GetAgent(RuntimeFramework framework, int waitTime)
-        {
-            log.Info("Getting agent for use under {0}", framework);
+        {
+			log.Info("Getting agent for use under {0}", framework);
  
             if (!framework.IsAvailable)
                 throw new ArgumentException(

=== modified file 'src/ConsoleRunner/nunit-console/ConsoleUi.cs'
--- src/ConsoleRunner/nunit-console/ConsoleUi.cs	2012-07-08 17:20:44 +0000
+++ src/ConsoleRunner/nunit-console/ConsoleUi.cs	2012-10-03 23:32:21 +0000
@@ -2,8 +2,10 @@
 // This is free software licensed under the NUnit license. You
 // may obtain a copy of the license as well as information regarding
 // copyright ownership at http://nunit.org.
-// ****************************************************************
-
+// ****************************************************************
+
+using System.Diagnostics;
+
 namespace NUnit.ConsoleRunner
 {
 	using System;
@@ -61,8 +63,8 @@
 				StreamWriter errorStreamWriter = new StreamWriter( Path.Combine(workDir, options.err) );
 				errorStreamWriter.AutoFlush = true;
 				errorWriter = errorStreamWriter;
-			}
-
+			}
+
             TestPackage package = MakeTestPackage(options);
 
             ProcessModel processModel = package.Settings.Contains("ProcessModel")

=== modified file 'src/GuiException/tests/Controls/TestCodeBox.cs'
--- src/GuiException/tests/Controls/TestCodeBox.cs	2011-03-30 20:37:44 +0000
+++ src/GuiException/tests/Controls/TestCodeBox.cs	2012-10-03 23:32:21 +0000
@@ -3,7 +3,7 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using NSubstitute;
 using NUnit.Framework;
 using System.Drawing;

=== modified file 'src/GuiException/tests/Controls/TestErrorBrowser.cs'
--- src/GuiException/tests/Controls/TestErrorBrowser.cs	2011-03-30 20:37:44 +0000
+++ src/GuiException/tests/Controls/TestErrorBrowser.cs	2012-10-03 23:32:21 +0000
@@ -3,7 +3,7 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using System;
 using NSubstitute;
 using NUnit.Framework;

=== modified file 'src/GuiException/tests/Controls/TestErrorList.cs'
--- src/GuiException/tests/Controls/TestErrorList.cs	2011-03-30 20:37:44 +0000
+++ src/GuiException/tests/Controls/TestErrorList.cs	2012-10-03 23:32:21 +0000
@@ -3,7 +3,7 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using System;
 using NSubstitute;
 using NUnit.Framework;

=== modified file 'src/GuiException/tests/Controls/TestErrorToolbar.cs'
--- src/GuiException/tests/Controls/TestErrorToolbar.cs	2011-03-30 20:37:44 +0000
+++ src/GuiException/tests/Controls/TestErrorToolbar.cs	2012-10-03 23:32:21 +0000
@@ -3,7 +3,7 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using System;
 using NSubstitute;
 using NUnit.Framework;

=== modified file 'src/GuiException/tests/Controls/TestSourceCodeDisplay.cs'
--- src/GuiException/tests/Controls/TestSourceCodeDisplay.cs	2011-03-30 20:37:44 +0000
+++ src/GuiException/tests/Controls/TestSourceCodeDisplay.cs	2012-10-03 23:32:21 +0000
@@ -3,7 +3,7 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using NSubstitute;
 using NUnit.Framework;
 using NUnit.UiException.Controls;

=== added file 'src/NUnitCore/core/AsyncSynchronizationContext.cs'
--- src/NUnitCore/core/AsyncSynchronizationContext.cs	1970-01-01 00:00:00 +0000
+++ src/NUnitCore/core/AsyncSynchronizationContext.cs	2012-10-03 23:32:21 +0000
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace NUnit.Core
+{
+	public class AsyncSynchronizationContext : SynchronizationContext
+    {
+        private readonly AutoResetEvent _operationCompleted = new AutoResetEvent(false);
+        private readonly IList<Exception> _exceptions = new List<Exception>();
+
+		public IList<Exception> Exceptions
+        {
+            get { return _exceptions; }
+        }
+
+		public override void Send(SendOrPostCallback d, object state)
+		{
+			throw new InvalidOperationException("Sending to this synchronization context is not supported");
+		}
+
+		public override void Post(SendOrPostCallback d, object state)
+        {
+			try
+			{
+				d(state);
+			}
+			catch (Exception e)
+			{
+				_exceptions.Add(e);
+			}
+        }
+
+        public override void OperationCompleted()
+        {
+            base.OperationCompleted();
+            _operationCompleted.Set();
+        }
+
+        public void WaitForOperationCompleted()
+        {
+            _operationCompleted.WaitOne();
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/NUnitCore/core/Builders/NUnitTestCaseBuilder.cs'
--- src/NUnitCore/core/Builders/NUnitTestCaseBuilder.cs	2012-02-19 05:59:50 +0000
+++ src/NUnitCore/core/Builders/NUnitTestCaseBuilder.cs	2012-10-03 23:32:21 +0000
@@ -1,421 +1,432 @@
-// ****************************************************************
-// Copyright 2008, Charlie Poole
-// This is free software licensed under the NUnit license. You may
-// obtain a copy of the license at http://nunit.org.
-// ****************************************************************
-
-using System;
-using System.Reflection;
-using NUnit.Core.Extensibility;
-
-namespace NUnit.Core.Builders
-{
-    /// <summary>
-    /// Class to build ether a parameterized or a normal NUnitTestMethod.
-    /// There are four cases that the builder must deal with:
-    ///   1. The method needs no params and none are provided
-    ///   2. The method needs params and they are provided
-    ///   3. The method needs no params but they are provided in error
-    ///   4. The method needs params but they are not provided
-    /// This could have been done using two different builders, but it
-    /// turned out to be simpler to have just one. The BuildFrom method
-    /// takes a different branch depending on whether any parameters are
-    /// provided, but all four cases are dealt with in lower-level methods
-    /// </summary>
-    public class NUnitTestCaseBuilder : ITestCaseBuilder2
-	{
-        #region ITestCaseBuilder Methods
-        /// <summary>
-        /// Determines if the method can be used to build an NUnit test
-        /// test method of some kind. The method must normally be marked
-        /// with an identifying attriute for this to be true. If the test
-        /// config file sets AllowOldStyleTests to true, then any method beginning 
-        /// "test..." (case-insensitive) is treated as a test unless 
-        /// it is also marked as a setup or teardown method.
-        /// 
-        /// Note that this method does not check that the signature
-        /// of the method for validity. If we did that here, any
-        /// test methods with invalid signatures would be passed
-        /// over in silence in the test run. Since we want such
-        /// methods to be reported, the check for validity is made
-        /// in BuildFrom rather than here.
-        /// </summary>
-        /// <param name="method">A MethodInfo for the method being used as a test method</param>
-        /// <param name="suite">The test suite being built, to which the new test would be added</param>
-        /// <returns>True if the builder can create a test case from this method</returns>
-        public bool CanBuildFrom(MethodInfo method)
-        {
-            return Reflect.HasAttribute(method, NUnitFramework.TestAttribute, false)
-                || Reflect.HasAttribute(method, NUnitFramework.TestCaseAttribute, false)
-                || Reflect.HasAttribute(method, NUnitFramework.TestCaseSourceAttribute, false)
-                || Reflect.HasAttribute(method, NUnitFramework.TheoryAttribute, false);
-        }
-
-		/// <summary>
-        /// Build a Test from the provided MethodInfo. Depending on
-        /// whether the method takes arguments and on the availability
-        /// of test case data, this method may return a single test
-        /// or a group of tests contained in a ParameterizedMethodSuite.
-        /// </summary>
-        /// <param name="method">The MethodInfo for which a test is to be built</param>
-        /// <param name="suite">The test fixture being populated, or null</param>
-        /// <returns>A Test representing one or more method invocations</returns>
-        public Test BuildFrom(MethodInfo method)
-		{
-            return BuildFrom(method, null);
-        }
-
-        #region ITestCaseBuilder2 Members
-
-        public bool CanBuildFrom(MethodInfo method, Test parentSuite)
-        {
-            return CanBuildFrom(method);
-        }
-
-        public Test BuildFrom(MethodInfo method, Test parentSuite)
-        {
-            return CoreExtensions.Host.TestCaseProviders.HasTestCasesFor(method)
-                ? BuildParameterizedMethodSuite(method, parentSuite)
-                : BuildSingleTestMethod(method, parentSuite, null);
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Builds a ParameterizedMetodSuite containing individual
-        /// test cases for each set of parameters provided for
-        /// this method.
-        /// </summary>
-        /// <param name="method">The MethodInfo for which a test is to be built</param>
-        /// <returns>A ParameterizedMethodSuite populated with test cases</returns>
-        public static Test BuildParameterizedMethodSuite(MethodInfo method, Test parentSuite)
-        {
-            ParameterizedMethodSuite methodSuite = new ParameterizedMethodSuite(method);
-            NUnitFramework.ApplyCommonAttributes(method, methodSuite);
-
-            if (parentSuite != null)
-            {
-                if (parentSuite.RunState == RunState.NotRunnable && methodSuite.RunState != RunState.NotRunnable)
-                {
-                    methodSuite.RunState = RunState.NotRunnable;
-                    methodSuite.IgnoreReason = parentSuite.IgnoreReason;
-                }
-
-                if (parentSuite.RunState == RunState.Ignored && methodSuite.RunState != RunState.Ignored && methodSuite.RunState != RunState.NotRunnable)
-                {
-                    methodSuite.RunState = RunState.Ignored;
-                    methodSuite.IgnoreReason = parentSuite.IgnoreReason;
-                }
-            }
-
-            foreach (object source in CoreExtensions.Host.TestCaseProviders.GetTestCasesFor(method, parentSuite))
-            {
-                ParameterSet parms;
-
-                if (source == null)
-                {
-                    parms = new ParameterSet();
-                    parms.Arguments = new object[] { null };
-                }
-                else
-                    parms = source as ParameterSet;
-
-                if (parms == null)
-                {
-                    if (source.GetType().GetInterface("NUnit.Framework.ITestCaseData") != null)
-                        parms = ParameterSet.FromDataSource(source);
-                    else
-                    {
-                        parms = new ParameterSet();
-
-                        ParameterInfo[] parameters = method.GetParameters();
-                        Type sourceType = source.GetType();
-
-                        if (parameters.Length == 1 && parameters[0].ParameterType.IsAssignableFrom(sourceType))
-                            parms.Arguments = new object[] { source };
-                        else if (source is object[])
-                            parms.Arguments = (object[])source;
-                        else if (source is Array)
-                        {
-                            Array array = (Array)source;
-                            if (array.Rank == 1)
-                            {
-                                parms.Arguments = new object[array.Length];
-                                for (int i = 0; i < array.Length; i++)
-                                    parms.Arguments[i] = (object)array.GetValue(i);
-                            }
-                        }
-                        else
-                            parms.Arguments = new object[] { source };
-                    }
-                }
-
-                TestMethod test = BuildSingleTestMethod(method, parentSuite, parms);
-
-                methodSuite.Add(test);
-            }
-
-            return methodSuite;
-        }
-
-        /// <summary>
-        /// Builds a single NUnitTestMethod, either as a child of the fixture 
-        /// or as one of a set of test cases under a ParameterizedTestMethodSuite.
-        /// </summary>
-        /// <param name="method">The MethodInfo from which to construct the TestMethod</param>
-        /// <param name="parms">The ParameterSet to be used, or null</param>
-        /// <returns></returns>
-        public static NUnitTestMethod BuildSingleTestMethod(MethodInfo method, Test parentSuite, ParameterSet parms)
-        {
-            NUnitTestMethod testMethod = new NUnitTestMethod(method);
-
-            string prefix = method.ReflectedType.FullName;
-
-            if (parentSuite != null)
-            {
-                prefix = parentSuite.TestName.FullName;
-                testMethod.TestName.FullName = prefix + "." + testMethod.TestName.Name;
-            }
-
-            if (CheckTestMethodSignature(testMethod, parms))
-            {
-                if (parms == null)
-                    NUnitFramework.ApplyCommonAttributes(method, testMethod);
-                NUnitFramework.ApplyExpectedExceptionAttribute(method, testMethod);
-            }
-
-            if (parms != null)
-            {
-                // NOTE: After the call to CheckTestMethodSignature, the Method
-                // property of testMethod may no longer be the same as the
-                // original MethodInfo, so we reassign it here.
-                method = testMethod.Method;
-
-                if (parms.TestName != null)
-                {
-                    testMethod.TestName.Name = parms.TestName;
-                    testMethod.TestName.FullName = prefix + "." + parms.TestName;
-                }
-                else if (parms.OriginalArguments != null)
-                {
-                    string name = MethodHelper.GetDisplayName(method, parms.OriginalArguments);
-                    testMethod.TestName.Name = name;
-                    testMethod.TestName.FullName = prefix + "." + name;
-                }
-
-                if (parms.Ignored)
-                {
-                    testMethod.RunState = RunState.Ignored;
-                    testMethod.IgnoreReason = parms.IgnoreReason;
-                }
-                else if (parms.Explicit)
-                {
-                    testMethod.RunState = RunState.Explicit;
-                }
-
-                if (parms.ExpectedExceptionName != null)
-                    testMethod.exceptionProcessor = new ExpectedExceptionProcessor(testMethod, parms);
-
-                foreach (string key in parms.Properties.Keys)
-                    testMethod.Properties[key] = parms.Properties[key];
-
-                // Description is stored in parms.Properties
-                if (parms.Description != null)
-                    testMethod.Description = parms.Description;
-            }
-
-            //if (testMethod.BuilderException != null && testMethod.RunState != RunState.NotRunnable)
-            //{
-            //    testMethod.RunState = RunState.NotRunnable;
-            //    testMethod.IgnoreReason = testMethod.BuilderException.Message;
-            //}
-
-            if (parentSuite != null)
-            {
-                if (parentSuite.RunState == RunState.NotRunnable && testMethod.RunState != RunState.NotRunnable)
-                {
-                    testMethod.RunState = RunState.NotRunnable;
-                    testMethod.IgnoreReason = parentSuite.IgnoreReason;
-                }
-
-                if (parentSuite.RunState == RunState.Ignored && testMethod.RunState != RunState.Ignored && testMethod.RunState != RunState.NotRunnable)
-                {
-                    testMethod.RunState = RunState.Ignored;
-                    testMethod.IgnoreReason = parentSuite.IgnoreReason;
-                }
-            }
-
-            return testMethod;
-        }
-		#endregion
-
-        #region Helper Methods
-        /// <summary>
-        /// Helper method that checks the signature of a TestMethod and
-        /// any supplied parameters to determine if the test is valid.
-        /// 
-        /// Currently, NUnitTestMethods are required to be public, 
-        /// non-abstract methods, either static or instance,
-        /// returning void. They may take arguments but the values must
-        /// be provided or the TestMethod is not considered runnable.
-        /// 
-        /// Methods not meeting these criteria will be marked as
-        /// non-runnable and the method will return false in that case.
-        /// </summary>
-        /// <param name="testMethod">The TestMethod to be checked. If it
-        /// is found to be non-runnable, it will be modified.</param>
-        /// <param name="parms">Parameters to be used for this test, or null</param>
-        /// <returns>True if the method signature is valid, false if not</returns>
-        private static bool CheckTestMethodSignature(TestMethod testMethod, ParameterSet parms)
-		{
-            if (testMethod.Method.IsAbstract)
-            {
-                testMethod.RunState = RunState.NotRunnable;
-                testMethod.IgnoreReason = "Method is abstract";
-                return false;
-            }
-
-            if (!testMethod.Method.IsPublic)
-            {
-                testMethod.RunState = RunState.NotRunnable;
-                testMethod.IgnoreReason = "Method is not public";
-                return false;
-            }
-
-            ParameterInfo[] parameters = testMethod.Method.GetParameters();
-            int argsNeeded = parameters.Length;
-
-            object[] arglist = null;
-            int argsProvided = 0;
-
-            if (parms != null)
-            {
-                testMethod.arguments = parms.Arguments;
-                testMethod.hasExpectedResult = parms.HasExpectedResult;
-                if (testMethod.hasExpectedResult)
-                    testMethod.expectedResult = parms.Result;
-                testMethod.RunState = parms.RunState;
-                testMethod.IgnoreReason = parms.IgnoreReason;
-                testMethod.BuilderException = parms.ProviderException;
-
-                arglist = parms.Arguments;
-
-                if (arglist != null)
-                    argsProvided = arglist.Length;
-
-                if (testMethod.RunState != RunState.Runnable)
-                    return false;
-            }
-
-            if (!testMethod.Method.ReturnType.Equals(typeof(void)) &&
-                (parms == null || !parms.HasExpectedResult && parms.ExpectedExceptionName == null))
-            {
-                testMethod.RunState = RunState.NotRunnable;
-                testMethod.IgnoreReason = "Method has non-void return value";
-                return false;
-            }
-
-            if (argsProvided > 0 && argsNeeded == 0)
-            {
-                testMethod.RunState = RunState.NotRunnable;
-                testMethod.IgnoreReason = "Arguments provided for method not taking any";
-                return false;
-            }
-
-            if (argsProvided == 0 && argsNeeded > 0)
-            {
-                testMethod.RunState = RunState.NotRunnable;
-                testMethod.IgnoreReason = "No arguments were provided";
-                return false;
-            }
-
-            //if (argsProvided > argsNeeded)
-            //{
-            //    ParameterInfo lastParameter = parameters[argsNeeded - 1];
-            //    Type lastParameterType = lastParameter.ParameterType;
-
-            //    if (lastParameterType.IsArray && lastParameter.IsDefined(typeof(ParamArrayAttribute), false))
-            //    {
-            //        object[] newArglist = new object[argsNeeded];
-            //        for (int i = 0; i < argsNeeded; i++)
-            //            newArglist[i] = arglist[i];
-
-            //        int length = argsProvided - argsNeeded + 1;
-            //        Array array = Array.CreateInstance(lastParameterType.GetElementType(), length);
-            //        for (int i = 0; i < length; i++)
-            //            array.SetValue(arglist[argsNeeded + i - 1], i);
-
-            //        newArglist[argsNeeded - 1] = array;
-            //        testMethod.arguments = arglist = newArglist;
-            //        argsProvided = argsNeeded;
-            //    }
-            //}
-
-            if (argsProvided != argsNeeded )
-            {
-                testMethod.RunState = RunState.NotRunnable;
-                testMethod.IgnoreReason = "Wrong number of arguments provided";
-                return false;
-            }
-
-#if CLR_2_0 || CLR_4_0
-            if (testMethod.Method.IsGenericMethodDefinition)
-            {
-                Type[] typeArguments = GetTypeArgumentsForMethod(testMethod.Method, arglist);
-                foreach (object o in typeArguments)
-                    if (o == null)
-                    {
-                        testMethod.RunState = RunState.NotRunnable;
-                        testMethod.IgnoreReason = "Unable to determine type arguments for fixture";
-                        return false;
-                    }
-
-                testMethod.method = testMethod.Method.MakeGenericMethod(typeArguments);
-                parameters = testMethod.Method.GetParameters();
-
-                for (int i = 0; i < parameters.Length; i++)
-                {
-                    if (arglist[i].GetType() != parameters[i].ParameterType && arglist[i] is IConvertible)
-                    {
-                        try
-                        {
-                            arglist[i] = Convert.ChangeType(arglist[i], parameters[i].ParameterType);
-                        }
-                        catch (Exception)
-                        {
-                            // Do nothing - the incompatible argument will be reported below
-                        }
-                    }
-                }
-            }
-#endif
-
-            return true;
-        }
-
-#if CLR_2_0 || CLR_4_0
-        private static Type[] GetTypeArgumentsForMethod(MethodInfo method, object[] arglist)
-        {
-            Type[] typeParameters = method.GetGenericArguments();
-            Type[] typeArguments = new Type[typeParameters.Length];
-            ParameterInfo[] parameters = method.GetParameters();
-
-            for (int typeIndex = 0; typeIndex < typeArguments.Length; typeIndex++)
-            {
-                Type typeParameter = typeParameters[typeIndex];
-
-                for (int argIndex = 0; argIndex < parameters.Length; argIndex++)
-                {
-                    if (parameters[argIndex].ParameterType.Equals(typeParameter))
-                        typeArguments[typeIndex] = TypeHelper.BestCommonType(
-                            typeArguments[typeIndex],
-                            arglist[argIndex].GetType());
-                }
-            }
-
-            return typeArguments;
-        }
-#endif
-        #endregion
-    }
-}
+// ****************************************************************
+// Copyright 2008, Charlie Poole
+// This is free software licensed under the NUnit license. You may
+// obtain a copy of the license at http://nunit.org.
+// ****************************************************************
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using NUnit.Core.Extensibility;
+
+namespace NUnit.Core.Builders
+{
+    /// <summary>
+    /// Class to build ether a parameterized or a normal NUnitTestMethod.
+    /// There are four cases that the builder must deal with:
+    ///   1. The method needs no params and none are provided
+    ///   2. The method needs params and they are provided
+    ///   3. The method needs no params but they are provided in error
+    ///   4. The method needs params but they are not provided
+    /// This could have been done using two different builders, but it
+    /// turned out to be simpler to have just one. The BuildFrom method
+    /// takes a different branch depending on whether any parameters are
+    /// provided, but all four cases are dealt with in lower-level methods
+    /// </summary>
+    public class NUnitTestCaseBuilder : ITestCaseBuilder2
+	{
+        #region ITestCaseBuilder Methods
+        /// <summary>
+        /// Determines if the method can be used to build an NUnit test
+        /// test method of some kind. The method must normally be marked
+        /// with an identifying attriute for this to be true. If the test
+        /// config file sets AllowOldStyleTests to true, then any method beginning 
+        /// "test..." (case-insensitive) is treated as a test unless 
+        /// it is also marked as a setup or teardown method.
+        /// 
+        /// Note that this method does not check that the signature
+        /// of the method for validity. If we did that here, any
+        /// test methods with invalid signatures would be passed
+        /// over in silence in the test run. Since we want such
+        /// methods to be reported, the check for validity is made
+        /// in BuildFrom rather than here.
+        /// </summary>
+        /// <param name="method">A MethodInfo for the method being used as a test method</param>
+        /// <param name="suite">The test suite being built, to which the new test would be added</param>
+        /// <returns>True if the builder can create a test case from this method</returns>
+        public bool CanBuildFrom(MethodInfo method)
+        {
+            return Reflect.HasAttribute(method, NUnitFramework.TestAttribute, false)
+                || Reflect.HasAttribute(method, NUnitFramework.TestCaseAttribute, false)
+                || Reflect.HasAttribute(method, NUnitFramework.TestCaseSourceAttribute, false)
+                || Reflect.HasAttribute(method, NUnitFramework.TheoryAttribute, false);
+        }
+
+		/// <summary>
+        /// Build a Test from the provided MethodInfo. Depending on
+        /// whether the method takes arguments and on the availability
+        /// of test case data, this method may return a single test
+        /// or a group of tests contained in a ParameterizedMethodSuite.
+        /// </summary>
+        /// <param name="method">The MethodInfo for which a test is to be built</param>
+        /// <param name="suite">The test fixture being populated, or null</param>
+        /// <returns>A Test representing one or more method invocations</returns>
+        public Test BuildFrom(MethodInfo method)
+		{
+            return BuildFrom(method, null);
+        }
+
+        #region ITestCaseBuilder2 Members
+
+        public bool CanBuildFrom(MethodInfo method, Test parentSuite)
+        {
+            return CanBuildFrom(method);
+        }
+
+        public Test BuildFrom(MethodInfo method, Test parentSuite)
+        {
+            return CoreExtensions.Host.TestCaseProviders.HasTestCasesFor(method)
+                ? BuildParameterizedMethodSuite(method, parentSuite)
+                : BuildSingleTestMethod(method, parentSuite, null);
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Builds a ParameterizedMetodSuite containing individual
+        /// test cases for each set of parameters provided for
+        /// this method.
+        /// </summary>
+        /// <param name="method">The MethodInfo for which a test is to be built</param>
+        /// <returns>A ParameterizedMethodSuite populated with test cases</returns>
+        public static Test BuildParameterizedMethodSuite(MethodInfo method, Test parentSuite)
+        {
+            ParameterizedMethodSuite methodSuite = new ParameterizedMethodSuite(method);
+            NUnitFramework.ApplyCommonAttributes(method, methodSuite);
+
+            if (parentSuite != null)
+            {
+                if (parentSuite.RunState == RunState.NotRunnable && methodSuite.RunState != RunState.NotRunnable)
+                {
+                    methodSuite.RunState = RunState.NotRunnable;
+                    methodSuite.IgnoreReason = parentSuite.IgnoreReason;
+                }
+
+                if (parentSuite.RunState == RunState.Ignored && methodSuite.RunState != RunState.Ignored && methodSuite.RunState != RunState.NotRunnable)
+                {
+                    methodSuite.RunState = RunState.Ignored;
+                    methodSuite.IgnoreReason = parentSuite.IgnoreReason;
+                }
+            }
+
+            foreach (object source in CoreExtensions.Host.TestCaseProviders.GetTestCasesFor(method, parentSuite))
+            {
+                ParameterSet parms;
+
+                if (source == null)
+                {
+                    parms = new ParameterSet();
+                    parms.Arguments = new object[] { null };
+                }
+                else
+                    parms = source as ParameterSet;
+
+                if (parms == null)
+                {
+                    if (source.GetType().GetInterface("NUnit.Framework.ITestCaseData") != null)
+                        parms = ParameterSet.FromDataSource(source);
+                    else
+                    {
+                        parms = new ParameterSet();
+
+                        ParameterInfo[] parameters = method.GetParameters();
+                        Type sourceType = source.GetType();
+
+                        if (parameters.Length == 1 && parameters[0].ParameterType.IsAssignableFrom(sourceType))
+                            parms.Arguments = new object[] { source };
+                        else if (source is object[])
+                            parms.Arguments = (object[])source;
+                        else if (source is Array)
+                        {
+                            Array array = (Array)source;
+                            if (array.Rank == 1)
+                            {
+                                parms.Arguments = new object[array.Length];
+                                for (int i = 0; i < array.Length; i++)
+                                    parms.Arguments[i] = (object)array.GetValue(i);
+                            }
+                        }
+                        else
+                            parms.Arguments = new object[] { source };
+                    }
+                }
+
+                TestMethod test = BuildSingleTestMethod(method, parentSuite, parms);
+
+                methodSuite.Add(test);
+            }
+
+            return methodSuite;
+        }
+
+        /// <summary>
+        /// Builds a single NUnitTestMethod, either as a child of the fixture 
+        /// or as one of a set of test cases under a ParameterizedTestMethodSuite.
+        /// </summary>
+        /// <param name="method">The MethodInfo from which to construct the TestMethod</param>
+        /// <param name="parms">The ParameterSet to be used, or null</param>
+        /// <returns></returns>
+        public static NUnitTestMethod BuildSingleTestMethod(MethodInfo method, Test parentSuite, ParameterSet parms)
+        {
+            NUnitTestMethod testMethod = Reflect.IsAsyncMethod(method) ? 
+                new NUnitAsyncTestMethod(method) : new NUnitTestMethod(method);
+
+            string prefix = method.ReflectedType.FullName;
+
+            if (parentSuite != null)
+            {
+                prefix = parentSuite.TestName.FullName;
+                testMethod.TestName.FullName = prefix + "." + testMethod.TestName.Name;
+            }
+
+            if (CheckTestMethodSignature(testMethod, parms))
+            {
+                if (parms == null)
+                    NUnitFramework.ApplyCommonAttributes(method, testMethod);
+                NUnitFramework.ApplyExpectedExceptionAttribute(method, testMethod);
+            }
+
+            if (parms != null)
+            {
+                // NOTE: After the call to CheckTestMethodSignature, the Method
+                // property of testMethod may no longer be the same as the
+                // original MethodInfo, so we reassign it here.
+                method = testMethod.Method;
+
+                if (parms.TestName != null)
+                {
+                    testMethod.TestName.Name = parms.TestName;
+                    testMethod.TestName.FullName = prefix + "." + parms.TestName;
+                }
+                else if (parms.OriginalArguments != null)
+                {
+                    string name = MethodHelper.GetDisplayName(method, parms.OriginalArguments);
+                    testMethod.TestName.Name = name;
+                    testMethod.TestName.FullName = prefix + "." + name;
+                }
+
+                if (parms.Ignored)
+                {
+                    testMethod.RunState = RunState.Ignored;
+                    testMethod.IgnoreReason = parms.IgnoreReason;
+                }
+                else if (parms.Explicit)
+                {
+                    testMethod.RunState = RunState.Explicit;
+                }
+
+                if (parms.ExpectedExceptionName != null)
+                    testMethod.exceptionProcessor = new ExpectedExceptionProcessor(testMethod, parms);
+
+                foreach (string key in parms.Properties.Keys)
+                    testMethod.Properties[key] = parms.Properties[key];
+
+                // Description is stored in parms.Properties
+                if (parms.Description != null)
+                    testMethod.Description = parms.Description;
+            }
+
+            //if (testMethod.BuilderException != null && testMethod.RunState != RunState.NotRunnable)
+            //{
+            //    testMethod.RunState = RunState.NotRunnable;
+            //    testMethod.IgnoreReason = testMethod.BuilderException.Message;
+            //}
+
+            if (parentSuite != null)
+            {
+                if (parentSuite.RunState == RunState.NotRunnable && testMethod.RunState != RunState.NotRunnable)
+                {
+                    testMethod.RunState = RunState.NotRunnable;
+                    testMethod.IgnoreReason = parentSuite.IgnoreReason;
+                }
+
+                if (parentSuite.RunState == RunState.Ignored && testMethod.RunState != RunState.Ignored && testMethod.RunState != RunState.NotRunnable)
+                {
+                    testMethod.RunState = RunState.Ignored;
+                    testMethod.IgnoreReason = parentSuite.IgnoreReason;
+                }
+            }
+
+            return testMethod;
+        }
+		#endregion
+
+        #region Helper Methods
+        /// <summary>
+        /// Helper method that checks the signature of a TestMethod and
+        /// any supplied parameters to determine if the test is valid.
+        /// 
+        /// Currently, NUnitTestMethods are required to be public, 
+        /// non-abstract methods, either static or instance,
+        /// returning void. They may take arguments but the values must
+        /// be provided or the TestMethod is not considered runnable.
+        /// 
+        /// Methods not meeting these criteria will be marked as
+        /// non-runnable and the method will return false in that case.
+        /// </summary>
+        /// <param name="testMethod">The TestMethod to be checked. If it
+        /// is found to be non-runnable, it will be modified.</param>
+        /// <param name="parms">Parameters to be used for this test, or null</param>
+        /// <returns>True if the method signature is valid, false if not</returns>
+        private static bool CheckTestMethodSignature(TestMethod testMethod, ParameterSet parms)
+		{
+            if (testMethod.Method.IsAbstract)
+            {
+                testMethod.RunState = RunState.NotRunnable;
+                testMethod.IgnoreReason = "Method is abstract";
+                return false;
+            }
+
+            if (!testMethod.Method.IsPublic)
+            {
+                testMethod.RunState = RunState.NotRunnable;
+                testMethod.IgnoreReason = "Method is not public";
+                return false;
+            }
+
+            ParameterInfo[] parameters = testMethod.Method.GetParameters();
+            int argsNeeded = parameters.Length;
+
+            object[] arglist = null;
+            int argsProvided = 0;
+
+            if (parms != null)
+            {
+                testMethod.arguments = parms.Arguments;
+                testMethod.hasExpectedResult = parms.HasExpectedResult;
+                if (testMethod.hasExpectedResult)
+                    testMethod.expectedResult = parms.Result;
+                testMethod.RunState = parms.RunState;
+                testMethod.IgnoreReason = parms.IgnoreReason;
+                testMethod.BuilderException = parms.ProviderException;
+
+                arglist = parms.Arguments;
+
+                if (arglist != null)
+                    argsProvided = arglist.Length;
+
+                if (testMethod.RunState != RunState.Runnable)
+                    return false;
+            }
+
+	        bool isAsyncMethod = Reflect.IsAsyncMethod(testMethod.Method);
+
+	        if (!testMethod.Method.ReturnType.Equals(typeof(void)) && !isAsyncMethod &&
+                (parms == null || !parms.HasExpectedResult && parms.ExpectedExceptionName == null))
+            {
+                testMethod.RunState = RunState.NotRunnable;
+                testMethod.IgnoreReason = "Method has non-void return value";
+                return false;
+            }
+
+			if(isAsyncMethod && !testMethod.Method.ReturnType.IsGenericType && parms != null && parms.HasExpectedResult)
+			{
+				testMethod.RunState = RunState.NotRunnable;
+				testMethod.IgnoreReason = "Async method has void or Task return type when a result was expected";
+				return false;
+			}
+
+            if (argsProvided > 0 && argsNeeded == 0)
+            {
+                testMethod.RunState = RunState.NotRunnable;
+                testMethod.IgnoreReason = "Arguments provided for method not taking any";
+                return false;
+            }
+
+            if (argsProvided == 0 && argsNeeded > 0)
+            {
+                testMethod.RunState = RunState.NotRunnable;
+                testMethod.IgnoreReason = "No arguments were provided";
+                return false;
+            }
+
+            //if (argsProvided > argsNeeded)
+            //{
+            //    ParameterInfo lastParameter = parameters[argsNeeded - 1];
+            //    Type lastParameterType = lastParameter.ParameterType;
+
+            //    if (lastParameterType.IsArray && lastParameter.IsDefined(typeof(ParamArrayAttribute), false))
+            //    {
+            //        object[] newArglist = new object[argsNeeded];
+            //        for (int i = 0; i < argsNeeded; i++)
+            //            newArglist[i] = arglist[i];
+
+            //        int length = argsProvided - argsNeeded + 1;
+            //        Array array = Array.CreateInstance(lastParameterType.GetElementType(), length);
+            //        for (int i = 0; i < length; i++)
+            //            array.SetValue(arglist[argsNeeded + i - 1], i);
+
+            //        newArglist[argsNeeded - 1] = array;
+            //        testMethod.arguments = arglist = newArglist;
+            //        argsProvided = argsNeeded;
+            //    }
+            //}
+
+            if (argsProvided != argsNeeded )
+            {
+                testMethod.RunState = RunState.NotRunnable;
+                testMethod.IgnoreReason = "Wrong number of arguments provided";
+                return false;
+            }
+
+#if CLR_2_0 || CLR_4_0
+            if (testMethod.Method.IsGenericMethodDefinition)
+            {
+                Type[] typeArguments = GetTypeArgumentsForMethod(testMethod.Method, arglist);
+                foreach (object o in typeArguments)
+                    if (o == null)
+                    {
+                        testMethod.RunState = RunState.NotRunnable;
+                        testMethod.IgnoreReason = "Unable to determine type arguments for fixture";
+                        return false;
+                    }
+
+                testMethod.method = testMethod.Method.MakeGenericMethod(typeArguments);
+                parameters = testMethod.Method.GetParameters();
+
+                for (int i = 0; i < parameters.Length; i++)
+                {
+                    if (arglist[i].GetType() != parameters[i].ParameterType && arglist[i] is IConvertible)
+                    {
+                        try
+                        {
+                            arglist[i] = Convert.ChangeType(arglist[i], parameters[i].ParameterType);
+                        }
+                        catch (Exception)
+                        {
+                            // Do nothing - the incompatible argument will be reported below
+                        }
+                    }
+                }
+            }
+#endif
+
+            return true;
+        }
+
+#if CLR_2_0 || CLR_4_0
+        private static Type[] GetTypeArgumentsForMethod(MethodInfo method, object[] arglist)
+        {
+            Type[] typeParameters = method.GetGenericArguments();
+            Type[] typeArguments = new Type[typeParameters.Length];
+            ParameterInfo[] parameters = method.GetParameters();
+
+            for (int typeIndex = 0; typeIndex < typeArguments.Length; typeIndex++)
+            {
+                Type typeParameter = typeParameters[typeIndex];
+
+                for (int argIndex = 0; argIndex < parameters.Length; argIndex++)
+                {
+                    if (parameters[argIndex].ParameterType.Equals(typeParameter))
+                        typeArguments[typeIndex] = TypeHelper.BestCommonType(
+                            typeArguments[typeIndex],
+                            arglist[argIndex].GetType());
+                }
+            }
+
+            return typeArguments;
+        }
+#endif
+        #endregion
+    }
+}

=== added file 'src/NUnitCore/core/NUnitAsyncTestMethod.cs'
--- src/NUnitCore/core/NUnitAsyncTestMethod.cs	1970-01-01 00:00:00 +0000
+++ src/NUnitCore/core/NUnitAsyncTestMethod.cs	2012-10-03 23:32:21 +0000
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Threading;
+
+namespace NUnit.Core
+{
+    public class NUnitAsyncTestMethod : NUnitTestMethod
+    {
+	    private const string TaskWaitMethod = "Wait";
+	    private const string TaskResultProperty = "Result";
+	    private const string SystemAggregateException = "System.AggregateException";
+	    private const string InnerExceptionsProperty = "InnerExceptions";
+	    private const BindingFlags TaskResultPropertyBindingFlags = BindingFlags.GetProperty | BindingFlags.Instance | BindingFlags.Public;
+
+	    public NUnitAsyncTestMethod(MethodInfo method) : base(method)
+        {
+        }
+
+        protected override object RunTestMethod(TestResult testResult)
+        {
+            if (method.ReturnType == typeof (void))
+            {
+                return RunVoidAsyncMethod(testResult);
+            }
+            
+            return RunTaskAsyncMethod(testResult);
+        }
+
+	    private object RunVoidAsyncMethod(TestResult testResult)
+        {
+            var previousContext = SynchronizationContext.Current;
+            var currentContext = new AsyncSynchronizationContext();
+            SynchronizationContext.SetSynchronizationContext(currentContext);
+
+            try
+            {
+                object result = base.RunTestMethod(testResult);
+
+                currentContext.WaitForOperationCompleted();
+
+                if (currentContext.Exceptions.Count > 0)
+                    throw new NUnitException("Rethrown", currentContext.Exceptions[0]);
+
+                return result;
+            }
+            finally
+            {
+                SynchronizationContext.SetSynchronizationContext(previousContext);
+            }
+        }
+
+	    private object RunTaskAsyncMethod(TestResult testResult)
+	    {
+		    try
+		    {
+			    object task = base.RunTestMethod(testResult);
+
+			    Reflect.InvokeMethod(method.ReturnType.GetMethod(TaskWaitMethod, new Type[0]), task);
+			    PropertyInfo resultProperty = Reflect.GetNamedProperty(method.ReturnType, TaskResultProperty, TaskResultPropertyBindingFlags);
+
+			    return resultProperty != null ? resultProperty.GetValue(task, null) : task;
+		    }
+		    catch (NUnitException e)
+		    {
+			    if (e.InnerException != null && 
+					e.InnerException.GetType().FullName.Equals(SystemAggregateException))
+			    {
+				    IList<Exception> inner = (IList<Exception>)e.InnerException.GetType()
+						.GetProperty(InnerExceptionsProperty).GetValue(e.InnerException, null);
+
+				    throw new NUnitException("Rethrown", inner[0]);
+			    }
+
+			    throw;
+		    }
+	    }
+    }
+}
\ No newline at end of file

=== modified file 'src/NUnitCore/core/NUnitTestMethod.cs'
--- src/NUnitCore/core/NUnitTestMethod.cs	2010-09-19 22:47:12 +0000
+++ src/NUnitCore/core/NUnitTestMethod.cs	2012-10-03 23:32:21 +0000
@@ -2,10 +2,10 @@
 // Copyright 2007, Charlie Poole
 // This is free software licensed under the NUnit license. You may
 // obtain a copy of the license at http://nunit.org.
-// ****************************************************************
-using System;
-using System.Reflection;
-
+// ****************************************************************
+
+using System.Reflection;
+
 namespace NUnit.Core
 {
 	/// <summary>
@@ -35,5 +35,5 @@
 			return testResult;
 		}
         #endregion
-	}
+	}
 }

=== modified file 'src/NUnitCore/core/Reflect.cs'
--- src/NUnitCore/core/Reflect.cs	2010-07-20 17:21:45 +0000
+++ src/NUnitCore/core/Reflect.cs	2012-10-03 23:32:21 +0000
@@ -438,6 +438,15 @@
 
 		private Reflect() { }
 
-		#endregion
+		#endregion
+
+	    public static bool IsAsyncMethod(MethodInfo method)
+	    {
+            foreach (object attribute in method.GetCustomAttributes(false))
+                if (attribute.GetType().FullName.Equals("System.Runtime.CompilerServices.AsyncStateMachineAttribute"))
+                    return true;
+
+            return false;
+	    }
 	}
 }

=== modified file 'src/NUnitCore/core/TestMethod.cs'
--- src/NUnitCore/core/TestMethod.cs	2012-09-25 16:39:42 +0000
+++ src/NUnitCore/core/TestMethod.cs	2012-10-03 23:32:21 +0000
@@ -3,8 +3,10 @@
 // may obtain a copy of the license as well as information regarding
 // copyright ownership at http://nunit.org.
 // ****************************************************************
-//#define DEFAULT_APPLIES_TO_TESTCASE
-
+//#define DEFAULT_APPLIES_TO_TESTCASE
+
+using System.Diagnostics;
+
 namespace NUnit.Core
 {
 	using System;
@@ -451,35 +453,36 @@
 		{
             try
             {
-                RunTestMethod(testResult);
+                object result = RunTestMethod(testResult);
+
+                if (this.hasExpectedResult)
+                    NUnitFramework.Assert.AreEqual(expectedResult, result);
+
+                testResult.Success();
+
                 if (testResult.IsSuccess && exceptionProcessor != null)
                     exceptionProcessor.ProcessNoException(testResult);
             }
-            catch (Exception ex)
-            {
-                if (ex is ThreadAbortException)
-                    Thread.ResetAbort();
-
-                if (exceptionProcessor == null)
-                    RecordException(ex, testResult, FailureSite.Test);
-                else
-                    exceptionProcessor.ProcessException(ex, testResult);
-            }
-		}
-
-		private void RunTestMethod(TestResult testResult)
-		{
-		    object fixture = this.method.IsStatic ? null : this.Fixture;
-
-			object result = Reflect.InvokeMethod( this.method, fixture, this.arguments );
-
-            if (this.hasExpectedResult)
-                NUnitFramework.Assert.AreEqual(expectedResult, result);
-
-            testResult.Success();
-        }
-
-		#endregion
+            catch (Exception ex)
+            {
+                if (ex is ThreadAbortException)
+                    Thread.ResetAbort();
+
+                if (exceptionProcessor == null)
+                    RecordException(ex, testResult, FailureSite.Test);
+                else
+                    exceptionProcessor.ProcessException(ex, testResult);
+            }
+		}
+
+	    protected virtual object RunTestMethod(TestResult testResult)
+		{
+            object fixture = this.method.IsStatic ? null : this.Fixture;
+            
+            return Reflect.InvokeMethod(this.method, fixture, this.arguments);
+        }
+
+	    #endregion
 
 		#region Record Info About An Exception
 		protected virtual void RecordException( Exception exception, TestResult testResult, FailureSite failureSite )
@@ -495,5 +498,5 @@
             testResult.SetResult(finalResultState, exception, failureSite);
 		}
 		#endregion
-    }
-}
+    }
+}
\ No newline at end of file

=== modified file 'src/NUnitCore/core/TestSuite.cs'
--- src/NUnitCore/core/TestSuite.cs	2012-09-25 16:39:42 +0000
+++ src/NUnitCore/core/TestSuite.cs	2012-10-03 23:32:21 +0000
@@ -523,8 +523,7 @@
             return type.IsAbstract && type.IsSealed;
         }
 
-        private void RunAllTests(
-			TestResult suiteResult, EventListener listener, ITestFilter filter )
+        private void RunAllTests(TestResult suiteResult, EventListener listener, ITestFilter filter )
 		{
             if (Properties.Contains("Timeout"))
                 TestExecutionContext.CurrentContext.TestCaseTimeout = (int)Properties["Timeout"];

=== modified file 'src/NUnitCore/core/nunit.core.build'
--- src/NUnitCore/core/nunit.core.build	2012-02-04 19:14:14 +0000
+++ src/NUnitCore/core/nunit.core.build	2012-10-03 23:32:21 +0000
@@ -3,6 +3,7 @@
 
   <patternset id="source-files">
     <include name="AbstractTestCaseDecoration.cs"/>
+    <include name="AsyncSynchronizationContext.cs"/>
     <include name="ActionsHelper.cs" />
     <include name="AssemblyInfo.cs"/>
     <include name="AssemblyHelper.cs"/>
@@ -32,6 +33,7 @@
     <include name="NamespaceTreeBuilder.cs"/>
     <include name="NoTestFixturesException.cs"/>
     <include name="NullListener.cs"/>
+	<include name="NUnitAsyncTestMethod.cs"/>
     <include name="NUnitConfiguration.cs"/>
     <include name="NUnitException.cs"/>
     <include name="NUnitFramework.cs"/>

=== modified file 'src/NUnitCore/core/nunit.core.dll.csproj'
--- src/NUnitCore/core/nunit.core.dll.csproj	2012-08-08 03:34:12 +0000
+++ src/NUnitCore/core/nunit.core.dll.csproj	2012-10-03 23:32:21 +0000
@@ -1,226 +1,228 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>nunit.core</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>NUnit.Core</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <PublishUrl>http://localhost/nunit.core/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\bin\Debug\lib\</OutputPath>
-    <BaseAddress>285212672</BaseAddress>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;CLR_2_0,NET_2_0,CS_3_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoWarn>1699</NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\bin\Release\lib\</OutputPath>
-    <BaseAddress>285212672</BaseAddress>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;CLR_2_0,NET_2_0,CS_3_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <FileAlignment>4096</FileAlignment>
-    <NoWarn>1699</NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-    <ProjectReference Include="..\interfaces\nunit.core.interfaces.dll.csproj">
-      <Name>nunit.core.interfaces.dll</Name>
-      <Project>{435428F8-5995-4CE4-8022-93D595A8CC0F}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AbstractTestCaseDecoration.cs" />
-    <Compile Include="AssemblyHelper.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="AssemblyReader.cs" />
-    <Compile Include="AssemblyResolver.cs" />
-    <Compile Include="ActionsHelper.cs" />
-    <Compile Include="Builders\CombinatorialStrategy.cs" />
-    <Compile Include="Builders\CombinatorialTestCaseProvider.cs" />
-    <Compile Include="Builders\CombiningStrategy.cs" />
-    <Compile Include="Builders\DatapointProvider.cs" />
-    <Compile Include="Builders\InlineDataPointProvider.cs" />
-    <Compile Include="Builders\LegacySuiteBuilder.cs" />
-    <Compile Include="Builders\NUnitTestCaseBuilder.cs" />
-    <Compile Include="Builders\NUnitTestFixtureBuilder.cs" />
-    <Compile Include="Builders\PairwiseStrategy.cs" />
-    <Compile Include="Builders\ProviderCache.cs" />
-    <Compile Include="Builders\ProviderInfo.cs" />
-    <Compile Include="Builders\SequentialStrategy.cs" />
-    <Compile Include="Builders\SetUpFixtureBuilder.cs" />
-    <Compile Include="Builders\TestAssemblyBuilder.cs" />
-    <Compile Include="Builders\TestCaseParameterProvider.cs" />
-    <Compile Include="Builders\TestCaseSourceProvider.cs" />
-    <Compile Include="Builders\ValueSourceProvider.cs" />
-    <Compile Include="ContextDictionary.cs" />
-    <Compile Include="CoreExtensions.cs" />
-    <Compile Include="CultureDetector.cs" />
-    <Compile Include="DirectorySwapper.cs" />
-    <Compile Include="DomainAgent.cs" />
-    <Compile Include="EventListenerTextWriter.cs" />
-    <Compile Include="EventPump.cs" />
-    <Compile Include="EventQueue.cs" />
-    <Compile Include="ExpectedExceptionProcessor.cs" />
-    <Compile Include="Extensibility\DataPointProviders.cs" />
-    <Compile Include="Extensibility\EventListenerCollection.cs" />
-    <Compile Include="Extensibility\FrameworkRegistry.cs" />
-    <Compile Include="Extensibility\SuiteBuilderCollection.cs" />
-    <Compile Include="Extensibility\TestCaseBuilderCollection.cs" />
-    <Compile Include="Extensibility\TestCaseProviders.cs" />
-    <Compile Include="Extensibility\TestDecoratorCollection.cs" />
-    <Compile Include="ExtensionHost.cs" />
-    <Compile Include="ExtensionPoint.cs" />
-    <Compile Include="IgnoreDecorator.cs" />
-    <Compile Include="InternalTrace.cs" />
-    <Compile Include="InternalTraceWriter.cs" />
-    <Compile Include="InvalidSuiteException.cs" />
-    <Compile Include="InvalidTestFixtureException.cs" />
-    <Compile Include="LegacySuite.cs" />
-    <Compile Include="Log4NetCapture.cs" />
-    <Compile Include="Logger.cs" />
-    <Compile Include="MethodHelper.cs" />
-    <Compile Include="NamespaceSuite.cs" />
-    <Compile Include="NamespaceTreeBuilder.cs" />
-    <Compile Include="NoTestFixturesException.cs" />
-    <Compile Include="NullListener.cs" />
-    <Compile Include="NUnitConfiguration.cs" />
-    <Compile Include="NUnitException.cs" />
-    <Compile Include="NUnitFramework.cs" />
-    <Compile Include="NUnitTestFixture.cs" />
-    <Compile Include="NUnitTestMethod.cs" />
-    <Compile Include="ParameterizedFixtureSuite.cs" />
-    <Compile Include="ParameterizedTestMethodSuite.cs" />
-    <Compile Include="PlatformHelper.cs" />
-    <Compile Include="ProjectRootSuite.cs" />
-    <Compile Include="ProxyTestRunner.cs" />
-    <Compile Include="QueuingEventListener.cs" />
-    <Compile Include="Reflect.cs" />
-    <Compile Include="RemoteTestRunner.cs" />
-    <Compile Include="SetUpFixture.cs" />
-    <Compile Include="SimpleTestRunner.cs" />
-    <Compile Include="StringTextWriter.cs" />
-    <Compile Include="SuiteBuilderAttribute.cs" />
-    <Compile Include="TestAction.cs" />
-    <Compile Include="TestAssembly.cs" />
-    <Compile Include="TestBuilderAttribute.cs" />
-    <Compile Include="TestCaseBuilderAttribute.cs" />
-    <Compile Include="TestDecoratorAttribute.cs" />
-    <Compile Include="TestExecutionContext.cs" />
-    <Compile Include="TestFixture.cs" />
-    <Compile Include="TestFixtureBuilder.cs" />
-    <Compile Include="TestMethod.cs" />
-    <Compile Include="TestRunnerThread.cs" />
-    <Compile Include="TestSuite.cs" />
-    <Compile Include="TestSuiteBuilder.cs" />
-    <Compile Include="TestThread.cs" />
-    <Compile Include="TextCapture.cs" />
-    <Compile Include="ThreadedTestRunner.cs" />
-    <Compile Include="ThreadUtility.cs" />
-    <Compile Include="TypeHelper.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="nunit.core.build" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>nunit.core</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>NUnit.Core</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <PublishUrl>http://localhost/nunit.core/</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Web</InstallFrom>
+    <UpdateEnabled>true</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\bin\Debug\lib\</OutputPath>
+    <BaseAddress>285212672</BaseAddress>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;CLR_2_0,NET_2_0,CS_3_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoWarn>1699</NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\bin\Release\lib\</OutputPath>
+    <BaseAddress>285212672</BaseAddress>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;CLR_2_0,NET_2_0,CS_3_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <FileAlignment>4096</FileAlignment>
+    <NoWarn>1699</NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+    <ProjectReference Include="..\interfaces\nunit.core.interfaces.dll.csproj">
+      <Name>nunit.core.interfaces.dll</Name>
+      <Project>{435428F8-5995-4CE4-8022-93D595A8CC0F}</Project>
+      <Private>False</Private>
+    </ProjectReference>
+    <Reference Include="System.Configuration" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="AbstractTestCaseDecoration.cs" />
+    <Compile Include="AssemblyHelper.cs" />
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="AssemblyReader.cs" />
+    <Compile Include="AssemblyResolver.cs" />
+    <Compile Include="ActionsHelper.cs" />
+    <Compile Include="AsyncSynchronizationContext.cs" />
+    <Compile Include="Builders\CombinatorialStrategy.cs" />
+    <Compile Include="Builders\CombinatorialTestCaseProvider.cs" />
+    <Compile Include="Builders\CombiningStrategy.cs" />
+    <Compile Include="Builders\DatapointProvider.cs" />
+    <Compile Include="Builders\InlineDataPointProvider.cs" />
+    <Compile Include="Builders\LegacySuiteBuilder.cs" />
+    <Compile Include="Builders\NUnitTestCaseBuilder.cs" />
+    <Compile Include="Builders\NUnitTestFixtureBuilder.cs" />
+    <Compile Include="Builders\PairwiseStrategy.cs" />
+    <Compile Include="Builders\ProviderCache.cs" />
+    <Compile Include="Builders\ProviderInfo.cs" />
+    <Compile Include="Builders\SequentialStrategy.cs" />
+    <Compile Include="Builders\SetUpFixtureBuilder.cs" />
+    <Compile Include="Builders\TestAssemblyBuilder.cs" />
+    <Compile Include="Builders\TestCaseParameterProvider.cs" />
+    <Compile Include="Builders\TestCaseSourceProvider.cs" />
+    <Compile Include="Builders\ValueSourceProvider.cs" />
+    <Compile Include="ContextDictionary.cs" />
+    <Compile Include="CoreExtensions.cs" />
+    <Compile Include="CultureDetector.cs" />
+    <Compile Include="DirectorySwapper.cs" />
+    <Compile Include="DomainAgent.cs" />
+    <Compile Include="EventListenerTextWriter.cs" />
+    <Compile Include="EventPump.cs" />
+    <Compile Include="EventQueue.cs" />
+    <Compile Include="ExpectedExceptionProcessor.cs" />
+    <Compile Include="Extensibility\DataPointProviders.cs" />
+    <Compile Include="Extensibility\EventListenerCollection.cs" />
+    <Compile Include="Extensibility\FrameworkRegistry.cs" />
+    <Compile Include="Extensibility\SuiteBuilderCollection.cs" />
+    <Compile Include="Extensibility\TestCaseBuilderCollection.cs" />
+    <Compile Include="Extensibility\TestCaseProviders.cs" />
+    <Compile Include="Extensibility\TestDecoratorCollection.cs" />
+    <Compile Include="ExtensionHost.cs" />
+    <Compile Include="ExtensionPoint.cs" />
+    <Compile Include="IgnoreDecorator.cs" />
+    <Compile Include="InternalTrace.cs" />
+    <Compile Include="InternalTraceWriter.cs" />
+    <Compile Include="InvalidSuiteException.cs" />
+    <Compile Include="InvalidTestFixtureException.cs" />
+    <Compile Include="LegacySuite.cs" />
+    <Compile Include="Log4NetCapture.cs" />
+    <Compile Include="Logger.cs" />
+    <Compile Include="MethodHelper.cs" />
+    <Compile Include="NamespaceSuite.cs" />
+    <Compile Include="NamespaceTreeBuilder.cs" />
+    <Compile Include="NoTestFixturesException.cs" />
+    <Compile Include="NullListener.cs" />
+    <Compile Include="NUnitAsyncTestMethod.cs" />
+    <Compile Include="NUnitConfiguration.cs" />
+    <Compile Include="NUnitException.cs" />
+    <Compile Include="NUnitFramework.cs" />
+    <Compile Include="NUnitTestFixture.cs" />
+    <Compile Include="NUnitTestMethod.cs" />
+    <Compile Include="ParameterizedFixtureSuite.cs" />
+    <Compile Include="ParameterizedTestMethodSuite.cs" />
+    <Compile Include="PlatformHelper.cs" />
+    <Compile Include="ProjectRootSuite.cs" />
+    <Compile Include="ProxyTestRunner.cs" />
+    <Compile Include="QueuingEventListener.cs" />
+    <Compile Include="Reflect.cs" />
+    <Compile Include="RemoteTestRunner.cs" />
+    <Compile Include="SetUpFixture.cs" />
+    <Compile Include="SimpleTestRunner.cs" />
+    <Compile Include="StringTextWriter.cs" />
+    <Compile Include="SuiteBuilderAttribute.cs" />
+    <Compile Include="TestAction.cs" />
+    <Compile Include="TestAssembly.cs" />
+    <Compile Include="TestBuilderAttribute.cs" />
+    <Compile Include="TestCaseBuilderAttribute.cs" />
+    <Compile Include="TestDecoratorAttribute.cs" />
+    <Compile Include="TestExecutionContext.cs" />
+    <Compile Include="TestFixture.cs" />
+    <Compile Include="TestFixtureBuilder.cs" />
+    <Compile Include="TestMethod.cs" />
+    <Compile Include="TestRunnerThread.cs" />
+    <Compile Include="TestSuite.cs" />
+    <Compile Include="TestSuiteBuilder.cs" />
+    <Compile Include="TestThread.cs" />
+    <Compile Include="TextCapture.cs" />
+    <Compile Include="ThreadedTestRunner.cs" />
+    <Compile Include="ThreadUtility.cs" />
+    <Compile Include="TypeHelper.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="nunit.core.build" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
 </Project>
\ No newline at end of file

=== modified file 'src/NUnitCore/interfaces/RuntimeFramework.cs'
--- src/NUnitCore/interfaces/RuntimeFramework.cs	2011-11-26 18:03:03 +0000
+++ src/NUnitCore/interfaces/RuntimeFramework.cs	2012-10-03 23:32:21 +0000
@@ -79,6 +79,8 @@
 
             if (version.Major == 3)
                 this.clrVersion = new Version(2, 0, 50727);
+			if(version.Major == 4)
+				this.clrVersion = new Version(4, 0, 30319);
             //else if (runtime == RuntimeType.Mono && version.Major == 1)
             //{
             //    if (version.Minor == 0)

=== added directory 'src/NUnitCore/tests-net45'
=== added file 'src/NUnitCore/tests-net45/NUnitAsyncTestMethodTests.cs'
--- src/NUnitCore/tests-net45/NUnitAsyncTestMethodTests.cs	1970-01-01 00:00:00 +0000
+++ src/NUnitCore/tests-net45/NUnitAsyncTestMethodTests.cs	2012-10-03 23:32:21 +0000
@@ -0,0 +1,109 @@
+#if NET_3_5 || NET_4_0 || NET_4_5
+using System;
+using System.Collections;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Threading;
+using NUnit.Core;
+using NUnit.Core.Builders;
+using NUnit.Framework;
+using test_assembly_net45;
+
+namespace nunit.core.tests.net45
+{
+	[TestFixture]
+	public class NUnitAsyncTestMethodTests
+	{
+		private NUnitTestCaseBuilder _builder;
+
+		[SetUp]
+		public void Setup()
+		{
+			_builder = new NUnitTestCaseBuilder();
+		}
+
+		public IEnumerable TestCases
+		{
+			get
+			{
+				yield return new object[] { Method("AsyncVoidSuccess"), ResultState.Success, 1 };
+				yield return new object[] { Method("AsyncVoidFailure"), ResultState.Failure, 1 };
+				yield return new object[] { Method("AsyncVoidError"), ResultState.Error, 0 };
+
+				yield return new object[] { Method("AsyncTaskSuccess"), ResultState.Success, 1 };
+				yield return new object[] { Method("AsyncTaskFailure"), ResultState.Failure, 1 };
+				yield return new object[] { Method("AsyncTaskError"), ResultState.Error, 0 };
+
+				yield return new object[] { Method("AsyncTaskResultSuccess"), ResultState.Success, 1 };
+				yield return new object[] { Method("AsyncTaskResultFailure"), ResultState.Failure, 1 };
+				yield return new object[] { Method("AsyncTaskResultError"), ResultState.Error, 0 };
+
+				yield return new object[] { Method("AsyncTaskResultCheckSuccess"), ResultState.Success, 0 };
+				//yield return new object[] { Method("AsyncVoidTestCaseWithParametersSuccess(0, 0)), ResultState.Success, 1 };
+				yield return new object[] { Method("AsyncTaskResultCheckSuccessReturningNull"), ResultState.Success, 0 };
+				yield return new object[] { Method("AsyncTaskResultCheckFailure"), ResultState.Failure, 0 };
+				yield return new object[] { Method("AsyncTaskResultCheckError"), ResultState.Failure, 0 };
+
+				yield return new object[] { Method("AsyncVoidExpectedException"), ResultState.Success, 0 };
+				yield return new object[] { Method("AsyncTaskExpectedException"), ResultState.Success, 0 };
+				yield return new object[] { Method("AsyncTaskResultExpectedException"), ResultState.Success, 0 };
+
+				yield return new object[] { Method("NestedAsyncVoidSuccess"), ResultState.Success, 1 };
+				yield return new object[] { Method("NestedAsyncVoidFailure"), ResultState.Failure, 1 };
+				yield return new object[] { Method("NestedAsyncVoidError"), ResultState.Error, 0 };
+
+				yield return new object[] { Method("NestedAsyncTaskSuccess"), ResultState.Success, 1 };
+				yield return new object[] { Method("NestedAsyncTaskFailure"), ResultState.Failure, 1 };
+				yield return new object[] { Method("NestedAsyncTaskError"), ResultState.Error, 0 };
+
+				yield return new object[] { Method("AsyncVoidMultipleSuccess"), ResultState.Success, 1 };
+				yield return new object[] { Method("AsyncVoidMultipleFailure"), ResultState.Failure, 1 };
+				yield return new object[] { Method("AsyncVoidMultipleError"), ResultState.Error, 0 };
+
+				yield return new object[] { Method("AsyncTaskMultipleSuccess"), ResultState.Success, 1 };
+				yield return new object[] { Method("AsyncTaskMultipleFailure"), ResultState.Failure, 1 };
+				yield return new object[] { Method("AsyncTaskMultipleError"), ResultState.Error, 0 };
+			}
+		}
+
+		[Test]
+		[TestCaseSource("TestCases")]
+		public void RunTests(MethodInfo testMethod, ResultState resultState, int assertionCount)
+		{
+			var method = _builder.BuildFrom(testMethod);
+
+			var result = method.Run(new NullListener(), TestFilter.Empty);
+
+			Assert.That(result.Executed, Is.True, "Was not executed");
+			Assert.That(result.ResultState, Is.EqualTo(resultState), "Wrong result state");
+			Assert.That(result.AssertCount, Is.EqualTo(assertionCount), "Wrong assertion count");
+		}
+
+		[Test]
+		public void SynchronizationContextSwitching()
+		{
+			var context = new CustomSynchronizationContext();
+
+			SynchronizationContext.SetSynchronizationContext(context);
+
+			var method = _builder.BuildFrom(Method("AsyncVoidAssertSynchrnoizationContext"));
+
+			var result = method.Run(new NullListener(), TestFilter.Empty);
+
+			Assert.AreSame(context, SynchronizationContext.Current);
+			Assert.That(result.Executed, Is.True, "Was not executed");
+			Assert.That(result.ResultState, Is.EqualTo(ResultState.Success), "Wrong result state");
+			Assert.That(result.AssertCount, Is.EqualTo(1), "Wrong assertion count");
+		}
+
+		private static MethodInfo Method(string name)
+		{
+			return typeof (AsyncRealFixture).GetMethod(name);
+		}
+
+		public class CustomSynchronizationContext : SynchronizationContext
+		{
+		}
+	}
+}
+#endif
\ No newline at end of file

=== added file 'src/NUnitCore/tests-net45/NUnitTestCaseBuilderTests.cs'
--- src/NUnitCore/tests-net45/NUnitTestCaseBuilderTests.cs	1970-01-01 00:00:00 +0000
+++ src/NUnitCore/tests-net45/NUnitTestCaseBuilderTests.cs	2012-10-03 23:32:21 +0000
@@ -0,0 +1,108 @@
+#if NET_3_5 || NET_4_0 || NET_4_5
+using System.Reflection;
+using NUnit.Core;
+using NUnit.Core.Builders;
+using NUnit.Framework;
+using test_assembly_net45;
+
+namespace nunit.core.tests.net45
+{
+	[TestFixture]
+	public class NUnitTestCaseBuilderTests
+	{
+		private NUnitTestCaseBuilder _sut;
+
+		[SetUp]
+		public void Setup()
+		{
+			_sut = new NUnitTestCaseBuilder();
+		}
+
+		[Test]
+		public void Async_void()
+		{
+			var built = _sut.BuildFrom(Method("Void"));
+
+			Assert.That(built, Is.InstanceOf<NUnitAsyncTestMethod>());
+			Assert.That(built.RunState, Is.EqualTo(RunState.Runnable));
+		}
+
+		[Test]
+		public void Async_task()
+		{
+			var built = _sut.BuildFrom(Method("PlainTask"));
+
+			Assert.That(built, Is.InstanceOf<NUnitAsyncTestMethod>());
+			Assert.That(built.RunState, Is.EqualTo(RunState.Runnable));
+		}
+
+		[Test]
+		public void Async_task_testcase_result_check()
+		{
+			var built = _sut.BuildFrom(Method("AsyncTaskTestCase"));
+
+			var testMethod = built.Tests[0] as NUnitAsyncTestMethod;
+
+			Assert.IsNotNull(testMethod);
+
+			Assert.That(testMethod.RunState, Is.EqualTo(RunState.NotRunnable));
+		}
+
+		[Test]
+		public void Async_void_testcase_result_check()
+		{
+			var built = _sut.BuildFrom(Method("AsyncTaskTestCase"));
+
+			var testMethod = built.Tests[0] as NUnitAsyncTestMethod;
+
+			Assert.IsNotNull(testMethod);
+
+			Assert.That(testMethod.RunState, Is.EqualTo(RunState.NotRunnable));
+		}
+
+		[Test]
+		public void Async_task_with_result_testcase_result_check()
+		{
+			var built = _sut.BuildFrom(Method("AsyncTaskWithResultTestCase"));
+
+			var testMethod = built.Tests[0] as NUnitAsyncTestMethod;
+
+			Assert.IsNotNull(testMethod);
+
+			Assert.That(testMethod.RunState, Is.EqualTo(RunState.Runnable));
+		}
+
+		[Test]
+		public void Async_task_with_result()
+		{
+			var built = _sut.BuildFrom(Method("TaskWithResult"));
+
+			Assert.That(built, Is.InstanceOf<NUnitAsyncTestMethod>());
+			Assert.That(built.RunState, Is.EqualTo(RunState.Runnable));
+		}
+
+		[Test]
+		public void Non_async_task()
+		{
+			var built = _sut.BuildFrom(Method("NonAsyncTask"));
+
+			Assert.That(built, Is.Not.InstanceOf<NUnitAsyncTestMethod>());
+			Assert.That(built.RunState, Is.EqualTo(RunState.NotRunnable));
+		}
+
+		[Test]
+		public void Non_async_task_with_result()
+		{
+			var built = _sut.BuildFrom(Method("NonAsyncTaskWithResult"));
+
+			Assert.That(built, Is.Not.InstanceOf<NUnitAsyncTestMethod>());
+			Assert.That(built.RunState, Is.EqualTo(RunState.NotRunnable));
+		}
+
+		public MethodInfo Method(string name)
+		{
+			return typeof (AsyncDummyFixture).GetMethod(name);
+		}
+	}
+}
+#endif
\ No newline at end of file

=== added directory 'src/NUnitCore/tests-net45/Properties'
=== added file 'src/NUnitCore/tests-net45/nunit.core.tests.net45.build'
--- src/NUnitCore/tests-net45/nunit.core.tests.net45.build	1970-01-01 00:00:00 +0000
+++ src/NUnitCore/tests-net45/nunit.core.tests.net45.build	2012-10-03 23:32:21 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<project name="NUnitCoreTestsNet45" default="build" basedir=".">
+
+  <patternset id="source-files">
+    <include name="NUnitTestCaseBuilderTests.cs"/>
+    <include name="NUnitAsyncTestMethodTests.cs"/>
+  </patternset>
+
+  <target name="build">
+    <property name="previousFramework" value="${nant.settings.currentframework}"/>
+    <property name="nant.settings.currentframework" value="net-4.5"/>
+    <csc target="library" 
+       output="${current.test.dir}/nunit.core.tests.net45.dll"
+       debug="${build.debug}" 
+       define="${build.defines}">
+      <nowarn>
+        <warning number="618,672"/>
+      </nowarn>
+      <sources>
+        <patternset refid="source-files"/>
+        <include name="../../GeneratedAssemblyInfo.cs"/>
+      </sources>
+      <resources prefix="NUnit.Core.Tests.45">
+        <include name="Results.xsd"/>
+      </resources>
+      <references>
+        <include name="${current.framework.dir}/nunit.framework.dll"/>
+        <include name="${current.lib.dir}/nunit.core.interfaces.dll"/>
+        <include name="${current.lib.dir}/nunit.core.dll"/>
+        <include name="${current.lib.dir}/nunit.util.dll"/>
+        <include name="${current.test.dir}/test-assembly-net45.dll"/>
+      </references>
+    </csc>
+    <property name="nant.settings.currentframework" value="${previousFramework}"/>
+  </target>
+
+  <target name="package">
+    <copy todir="${package.src.dir}/NUnitCore/tests-net45">
+      <fileset>
+        <patternset refid="source-files"/>
+        <include name="Results.xsd"/>
+        <include name="nunit.core.tests.net45.csproj"/>
+        <include name="nunit.core.tests.net45.build"/>
+      </fileset>
+    </copy>
+  </target>
+
+</project>
\ No newline at end of file

=== added file 'src/NUnitCore/tests-net45/nunit.core.tests.net45.csproj'
--- src/NUnitCore/tests-net45/nunit.core.tests.net45.csproj	1970-01-01 00:00:00 +0000
+++ src/NUnitCore/tests-net45/nunit.core.tests.net45.csproj	2012-10-03 23:32:21 +0000
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{689A54F0-2B54-4D15-96A7-D8B6E6FE32B1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>nunit.core.tests.net45</RootNamespace>
+    <AssemblyName>nunit.core.tests.45</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;CLR_2_0,NET_3_5,CS_3_0,CLR_4_0,NET_4_0,NET_4_5</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="NUnitAsyncTestMethodTests.cs" />
+    <Compile Include="NUnitTestCaseBuilderTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="nunit.core.tests.net45.build" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\NUnitFramework\framework\nunit.framework.dll.csproj">
+      <Project>{83dd7e12-a705-4dba-9d71-09c8973d9382}</Project>
+      <Name>nunit.framework.dll</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\tests\test-assembly-net45\test-assembly-net45.csproj">
+      <Project>{74CCEAEA-CDBF-4FE0-BF0D-914C3C44ECE9}</Project>
+      <Name>test-assembly-net45</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\tests\test-assembly\test-assembly.csproj">
+      <Project>{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}</Project>
+      <Name>test-assembly</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\core\nunit.core.dll.csproj">
+      <Project>{ebd43a7f-afca-4281-bb53-5cdd91f966a3}</Project>
+      <Name>nunit.core.dll</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\interfaces\nunit.core.interfaces.dll.csproj">
+      <Project>{435428f8-5995-4ce4-8022-93d595a8cc0f}</Project>
+      <Name>nunit.core.interfaces.dll</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file

=== modified file 'src/NUnitCore/tests/CoreExtensionsTests.cs'
--- src/NUnitCore/tests/CoreExtensionsTests.cs	2011-03-30 20:37:44 +0000
+++ src/NUnitCore/tests/CoreExtensionsTests.cs	2012-10-03 23:32:21 +0000
@@ -6,7 +6,7 @@
 using System;
 using System.Text;
 using System.Reflection;
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using NSubstitute;
 #endif
 using NUnit.Framework;
@@ -123,7 +123,7 @@
             Assert.AreEqual("mock0mock1mock3cmock3bmock3amock5bmock5amock8mock9", sb.ToString());
         }
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
         [Test, Platform("Net-3.5,Mono-3.5,Net-4.0")]
 		public void CanAddDecorator()
 		{

=== modified file 'src/NUnitCore/tests/DatapointTests.cs'
--- src/NUnitCore/tests/DatapointTests.cs	2012-02-21 03:31:35 +0000
+++ src/NUnitCore/tests/DatapointTests.cs	2012-10-03 23:32:21 +0000
@@ -50,7 +50,7 @@
         }
 
 #if CLR_2_0 || CLR_4_0 
-#if CS_3_0 || CS_4_0
+#if CS_3_0 || CS_4_0 || CS_5_0
         [Test]
         public void WorksOnIEnumerableOfT()
         {

=== modified file 'src/NUnitCore/tests/PlatformDetectionTests.cs'
--- src/NUnitCore/tests/PlatformDetectionTests.cs	2011-11-02 23:34:22 +0000
+++ src/NUnitCore/tests/PlatformDetectionTests.cs	2012-10-03 23:32:21 +0000
@@ -5,7 +5,8 @@
 // ****************************************************************
 
 using System;
-using System.Collections;
+using System.Collections;
+using System.Diagnostics;
 using NUnit.Framework;
 
 namespace NUnit.Core.Tests
@@ -39,7 +40,7 @@
 			CheckPlatforms(
 				new PlatformHelper( OSPlatform.CurrentPlatform, runtimeFramework ),
 				expectedPlatforms,
-				PlatformHelper.RuntimePlatforms + ",NET-1.0,NET-1.1,NET-2.0,NET-3.0,NET-3.5,NET-4.0,MONO-1.0,MONO-2.0,MONO-3.0,MONO-3.5,MONO-4.0" );
+				PlatformHelper.RuntimePlatforms + ",NET-1.0,NET-1.1,NET-2.0,NET-3.0,NET-3.5,NET-4.0,NET-4.5,MONO-1.0,MONO-2.0,MONO-3.0,MONO-3.5,MONO-4.0" );
 		}
 
 		private void CheckPlatforms( PlatformHelper helper, 
@@ -239,12 +240,20 @@
         }
 
         [Test]
-        public void DetectNet40()
-        {
+        public void DetectNet40()
+        {
             CheckRuntimePlatforms(
                 new RuntimeFramework(RuntimeType.Net, new Version(4, 0, 30319, 0)),
                 "Net,Net-4.0");
-        }
+        }
+
+		[Test]
+		public void DetectNet45()
+		{
+			CheckRuntimePlatforms(
+				new RuntimeFramework(RuntimeType.Net, new Version(4, 5)),
+				"Net,Net-4.0,Net-4.5");
+		}
 
 		[Test]
 		public void DetectNetCF()

=== modified file 'src/NUnitCore/tests/RuntimeFrameworkTests.cs'
--- src/NUnitCore/tests/RuntimeFrameworkTests.cs	2012-02-21 03:31:35 +0000
+++ src/NUnitCore/tests/RuntimeFrameworkTests.cs	2012-10-03 23:32:21 +0000
@@ -4,7 +4,8 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-using System;
+using System;
+using System.Diagnostics;
 using NUnit.Framework;
 
 namespace NUnit.Core.Tests
@@ -18,9 +19,9 @@
         [Test]
         public void CanGetCurrentFramework()
         {
-            RuntimeFramework framework = RuntimeFramework.CurrentFramework;
+            RuntimeFramework framework = RuntimeFramework.CurrentFramework;
 
-            Assert.That(framework.Runtime, Is.EqualTo(currentRuntime));
+			Assert.That(framework.Runtime, Is.EqualTo(currentRuntime));
             Assert.That(framework.ClrVersion, Is.EqualTo(Environment.Version));
         }
 

=== modified file 'src/NUnitCore/tests/TestRunnerThreadTests.cs'
--- src/NUnitCore/tests/TestRunnerThreadTests.cs	2012-01-10 23:03:38 +0000
+++ src/NUnitCore/tests/TestRunnerThreadTests.cs	2012-10-03 23:32:21 +0000
@@ -4,7 +4,7 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using System;
 using System.Threading;
 using NSubstitute;

=== modified file 'src/NUnitCore/tests/nunit.core.tests.csproj'
--- src/NUnitCore/tests/nunit.core.tests.csproj	2012-08-08 03:34:12 +0000
+++ src/NUnitCore/tests/nunit.core.tests.csproj	2012-10-03 23:32:21 +0000
@@ -1,254 +1,256 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DD758D21-E5D5-4D40-9450-5F65A32F359C}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>nunit.core.tests</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <RootNamespace>NUnit.Core.Tests</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <PublishUrl>http://localhost/nunit.core.tests/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-    <BaseAddress>285212672</BaseAddress>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;CLR_2_0,NET_3_5,CS_3_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoWarn>618</NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\bin\Release\tests\</OutputPath>
-    <BaseAddress>285212672</BaseAddress>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;CLR_2_0,NET_3_5,CS_3_0</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <FileAlignment>4096</FileAlignment>
-    <NoWarn>618</NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-    <ProjectReference Include="..\..\ClientUtilities\util\nunit.util.dll.csproj">
-      <Name>nunit.util.dll</Name>
-      <Project>{61CE9CE5-943E-44D4-A381-814DC1406767}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\NUnitFramework\framework\nunit.framework.dll.csproj">
-      <Name>nunit.framework.dll</Name>
-      <Project>{83DD7E12-A705-4DBA-9D71-09C8973D9382}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\tests\mock-assembly\mock-assembly.csproj">
-      <Name>mock-assembly</Name>
-      <Project>{2E368281-3BA8-4050-B05E-0E0E43F8F446}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\tests\nonamespace-assembly\nonamespace-assembly.csproj">
-      <Name>nonamespace-assembly</Name>
-      <Project>{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\tests\test-assembly\test-assembly.csproj">
-      <Name>test-assembly</Name>
-      <Project>{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\tests\test-utilities\test-utilities.csproj">
-      <Name>test-utilities</Name>
-      <Project>{3E63AD0F-24D4-46BE-BEE4-5A3299847D86}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\core\nunit.core.dll.csproj">
-      <Name>nunit.core.dll</Name>
-      <Project>{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\interfaces\nunit.core.interfaces.dll.csproj">
-      <Name>nunit.core.interfaces.dll</Name>
-      <Project>{435428F8-5995-4CE4-8022-93D595A8CC0F}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <Reference Include="NSubstitute">
-      <HintPath>..\..\..\lib\3.5\NSubstitute.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="ActionAttributeExceptionTests.cs" />
-    <Compile Include="ActionAttributeTests.cs" />
-    <Compile Include="AllTests.cs" />
-    <Compile Include="AssemblyHelperTests.cs" />
-    <Compile Include="AssemblyReaderTests.cs" />
-    <Compile Include="AssemblyResolverTests.cs" />
-    <Compile Include="AssemblyTests.cs" />
-    <Compile Include="AssemblyVersionFixture.cs" />
-    <Compile Include="AssertPassFixture.cs" />
-    <Compile Include="AttributeDescriptionFixture.cs" />
-    <Compile Include="AttributeInheritance.cs" />
-    <Compile Include="BasicRunnerTests.cs" />
-    <Compile Include="CallContextTests.cs" />
-    <Compile Include="CategoryAttributeTests.cs" />
-    <Compile Include="CombinatorialTests.cs" />
-    <Compile Include="CoreExtensionsTests.cs" />
-    <Compile Include="CultureSettingAndDetectionTests.cs" />
-    <Compile Include="DatapointTests.cs" />
-    <Compile Include="DirectorySwapperTests.cs" />
-    <Compile Include="EventQueueTests.cs" />
-    <Compile Include="EventTestFixture.cs" />
-    <Compile Include="ExpectExceptionTest.cs" />
-    <Compile Include="FailFixture.cs" />
-    <Compile Include="FixtureSetUpTearDownTest.cs" />
-    <Compile Include="Generic\DeduceTypeArgsFromArgs.cs" />
-    <Compile Include="Generic\SimpleGenericFixture.cs" />
-    <Compile Include="Generic\SimpleGenericMethods.cs" />
-    <Compile Include="Generic\TypeParameterUsedWithTestMethod.cs" />
-    <Compile Include="IgnoreFixture.cs" />
-    <Compile Include="LegacySuiteTests.cs" />
-    <Compile Include="MaxTimeTests.cs" />
-    <Compile Include="NameFilterTest.cs" />
-    <Compile Include="NamespaceAssemblyTests.cs" />
-    <Compile Include="PairwiseTests.cs" />
-    <Compile Include="ParameterizedTestFixtureTests.cs" />
-    <Compile Include="PlatformDetectionTests.cs" />
-    <Compile Include="PropertyAttributeTests.cs" />
-    <Compile Include="ReflectTests.cs" />
-    <Compile Include="RemoteRunnerTests.cs" />
-    <Compile Include="RepeatedTestFixture.cs" />
-    <Compile Include="RuntimeFrameworkTests.cs" />
-    <Compile Include="SerializationBug.cs" />
-    <Compile Include="SetCultureAttributeTests.cs" />
-    <Compile Include="SetUpFixtureTests.cs" />
-    <Compile Include="SetUpTest.cs" />
-    <Compile Include="SimpleNameFilterTests.cs" />
-    <Compile Include="SimpleTestRunnerTests.cs" />
-    <Compile Include="StackOverflowTestFixture.cs" />
-    <Compile Include="SuiteBuilderTests.cs" />
-    <Compile Include="SuiteBuilderTests_Multiple.cs" />
-    <Compile Include="TestAssemblyBuilderTests.cs" />
-    <Compile Include="TestCaseAttributeTests.cs" />
-    <Compile Include="TestCaseResultFixture.cs" />
-    <Compile Include="TestCaseSourceTests.cs" />
-    <Compile Include="TestCaseTest.cs" />
-    <Compile Include="TestConsole.cs" />
-    <Compile Include="TestContextTests.cs" />
-    <Compile Include="TestDelegateFixture.cs" />
-    <Compile Include="TestExecutionContextTests.cs" />
-    <Compile Include="TestFixtureBuilderTests.cs" />
-    <Compile Include="TestFixtureExtension.cs" />
-    <Compile Include="TestFixtureTests.cs" />
-    <Compile Include="TestFrameworkTests.cs" />
-    <Compile Include="TestIDTests.cs" />
-    <Compile Include="TestInfoTests.cs" />
-    <Compile Include="TestMethodSignatureTests.cs" />
-    <Compile Include="TestNameTests.cs" />
-    <Compile Include="TestNodeTests.cs" />
-    <Compile Include="TestRunnerThreadTests.cs" />
-    <Compile Include="TestSuiteTest.cs" />
-    <Compile Include="TheoryTests.cs" />
-    <Compile Include="ThreadedTestRunnerTests.cs" />
-    <Compile Include="ThreadingTests.cs" />
-    <Compile Include="TypeHelperTests.cs" />
-    <Compile Include="UnhandledExceptionTests.cs" />
-    <Compile Include="ValueSourceTests.cs" />
-    <Compile Include="XmlTest.cs" />
-    <Compile Include="DirectoryChangeTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="nunit.core.tests.build" />
-    <EmbeddedResource Include="Results.xsd" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DD758D21-E5D5-4D40-9450-5F65A32F359C}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>nunit.core.tests</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>NUnit.Core.Tests</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <PublishUrl>http://localhost/nunit.core.tests/</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Web</InstallFrom>
+    <UpdateEnabled>true</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
+    <BaseAddress>285212672</BaseAddress>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;CLR_2_0,NET_3_5,CS_3_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoWarn>618</NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\bin\Release\tests\</OutputPath>
+    <BaseAddress>285212672</BaseAddress>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;CLR_2_0,NET_3_5,CS_3_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <FileAlignment>4096</FileAlignment>
+    <NoWarn>618</NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+    <ProjectReference Include="..\..\ClientUtilities\util\nunit.util.dll.csproj">
+      <Name>nunit.util.dll</Name>
+      <Project>{61CE9CE5-943E-44D4-A381-814DC1406767}</Project>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NUnitFramework\framework\nunit.framework.dll.csproj">
+      <Name>nunit.framework.dll</Name>
+      <Project>{83DD7E12-A705-4DBA-9D71-09C8973D9382}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\tests\mock-assembly\mock-assembly.csproj">
+      <Name>mock-assembly</Name>
+      <Project>{2E368281-3BA8-4050-B05E-0E0E43F8F446}</Project>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\tests\nonamespace-assembly\nonamespace-assembly.csproj">
+      <Name>nonamespace-assembly</Name>
+      <Project>{5110F0D2-8E50-46F8-9E17-7C8EBFECCA9D}</Project>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\tests\test-assembly\test-assembly.csproj">
+      <Name>test-assembly</Name>
+      <Project>{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\tests\test-utilities\test-utilities.csproj">
+      <Name>test-utilities</Name>
+      <Project>{3E63AD0F-24D4-46BE-BEE4-5A3299847D86}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\core\nunit.core.dll.csproj">
+      <Name>nunit.core.dll</Name>
+      <Project>{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}</Project>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\interfaces\nunit.core.interfaces.dll.csproj">
+      <Name>nunit.core.interfaces.dll</Name>
+      <Project>{435428F8-5995-4CE4-8022-93D595A8CC0F}</Project>
+      <Private>False</Private>
+    </ProjectReference>
+    <Reference Include="NSubstitute">
+      <HintPath>..\..\..\lib\3.5\NSubstitute.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="ActionAttributeExceptionTests.cs" />
+    <Compile Include="ActionAttributeTests.cs" />
+    <Compile Include="AllTests.cs" />
+    <Compile Include="AssemblyHelperTests.cs" />
+    <Compile Include="AssemblyReaderTests.cs" />
+    <Compile Include="AssemblyResolverTests.cs" />
+    <Compile Include="AssemblyTests.cs" />
+    <Compile Include="AssemblyVersionFixture.cs" />
+    <Compile Include="AssertPassFixture.cs" />
+    <Compile Include="AttributeDescriptionFixture.cs" />
+    <Compile Include="AttributeInheritance.cs" />
+    <Compile Include="BasicRunnerTests.cs" />
+    <Compile Include="CallContextTests.cs" />
+    <Compile Include="CategoryAttributeTests.cs" />
+    <Compile Include="CombinatorialTests.cs" />
+    <Compile Include="CoreExtensionsTests.cs" />
+    <Compile Include="CultureSettingAndDetectionTests.cs" />
+    <Compile Include="DatapointTests.cs" />
+    <Compile Include="DirectorySwapperTests.cs" />
+    <Compile Include="EventQueueTests.cs" />
+    <Compile Include="EventTestFixture.cs" />
+    <Compile Include="ExpectExceptionTest.cs" />
+    <Compile Include="FailFixture.cs" />
+    <Compile Include="FixtureSetUpTearDownTest.cs" />
+    <Compile Include="Generic\DeduceTypeArgsFromArgs.cs" />
+    <Compile Include="Generic\SimpleGenericFixture.cs" />
+    <Compile Include="Generic\SimpleGenericMethods.cs" />
+    <Compile Include="Generic\TypeParameterUsedWithTestMethod.cs" />
+    <Compile Include="IgnoreFixture.cs" />
+    <Compile Include="LegacySuiteTests.cs" />
+    <Compile Include="MaxTimeTests.cs" />
+    <Compile Include="NameFilterTest.cs" />
+    <Compile Include="NamespaceAssemblyTests.cs" />
+    <Compile Include="PairwiseTests.cs" />
+    <Compile Include="ParameterizedTestFixtureTests.cs" />
+    <Compile Include="PlatformDetectionTests.cs" />
+    <Compile Include="PropertyAttributeTests.cs" />
+    <Compile Include="ReflectTests.cs" />
+    <Compile Include="RemoteRunnerTests.cs" />
+    <Compile Include="RepeatedTestFixture.cs" />
+    <Compile Include="RuntimeFrameworkTests.cs" />
+    <Compile Include="SerializationBug.cs" />
+    <Compile Include="SetCultureAttributeTests.cs" />
+    <Compile Include="SetUpFixtureTests.cs" />
+    <Compile Include="SetUpTest.cs" />
+    <Compile Include="SimpleNameFilterTests.cs" />
+    <Compile Include="SimpleTestRunnerTests.cs" />
+    <Compile Include="StackOverflowTestFixture.cs" />
+    <Compile Include="SuiteBuilderTests.cs" />
+    <Compile Include="SuiteBuilderTests_Multiple.cs" />
+    <Compile Include="TestAssemblyBuilderTests.cs" />
+    <Compile Include="TestCaseAttributeTests.cs" />
+    <Compile Include="TestCaseResultFixture.cs" />
+    <Compile Include="TestCaseSourceTests.cs" />
+    <Compile Include="TestCaseTest.cs" />
+    <Compile Include="TestConsole.cs" />
+    <Compile Include="TestContextTests.cs" />
+    <Compile Include="TestDelegateFixture.cs" />
+    <Compile Include="TestExecutionContextTests.cs" />
+    <Compile Include="TestFixtureBuilderTests.cs" />
+    <Compile Include="TestFixtureExtension.cs" />
+    <Compile Include="TestFixtureTests.cs" />
+    <Compile Include="TestFrameworkTests.cs" />
+    <Compile Include="TestIDTests.cs" />
+    <Compile Include="TestInfoTests.cs" />
+    <Compile Include="TestMethodSignatureTests.cs" />
+    <Compile Include="TestNameTests.cs" />
+    <Compile Include="TestNodeTests.cs" />
+    <Compile Include="TestRunnerThreadTests.cs" />
+    <Compile Include="TestSuiteTest.cs" />
+    <Compile Include="TheoryTests.cs" />
+    <Compile Include="ThreadedTestRunnerTests.cs" />
+    <Compile Include="ThreadingTests.cs" />
+    <Compile Include="TypeHelperTests.cs" />
+    <Compile Include="UnhandledExceptionTests.cs" />
+    <Compile Include="ValueSourceTests.cs" />
+    <Compile Include="XmlTest.cs" />
+    <Compile Include="DirectoryChangeTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="nunit.core.tests.build">
+      <SubType>Designer</SubType>
+    </None>
+    <EmbeddedResource Include="Results.xsd" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
 </Project>
\ No newline at end of file

=== modified file 'src/NUnitFramework/tests/CollectionAssertTest.cs'
--- src/NUnitFramework/tests/CollectionAssertTest.cs	2011-11-02 22:40:46 +0000
+++ src/NUnitFramework/tests/CollectionAssertTest.cs	2012-10-03 23:32:21 +0000
@@ -6,7 +6,7 @@
 
 using System;
 using System.Collections;
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using System.Linq;
 #endif
 

=== modified file 'src/NUnitFramework/tests/Constraints/CollectionConstraintTests.cs'
--- src/NUnitFramework/tests/Constraints/CollectionConstraintTests.cs	2011-11-02 22:40:46 +0000
+++ src/NUnitFramework/tests/Constraints/CollectionConstraintTests.cs	2012-10-03 23:32:21 +0000
@@ -307,7 +307,7 @@
             }
         }
 
-#if CS_3_0 || CS_4_0
+#if CS_3_0 || CS_4_0 || CS_5_0
         [Test]
         public void UsesProvidedLambdaExpression()
         {
@@ -394,7 +394,7 @@
             Assert.That(new CollectionEquivalentConstraint(set1).IgnoreCase.Matches(set2));
         }
 
-#if CS_3_0 || CS_4_0
+#if CS_3_0 || CS_4_0 || CS_5_0
         [Test]
         public void EquivalentHonorsUsing()
         {
@@ -632,7 +632,7 @@
             }
         }
 
-#if CS_3_0 || CS_4_0
+#if CS_3_0 || CS_4_0 || CS_5_0
         [Test]
         public void UsesProvidedLambda()
         {

=== modified file 'src/NUnitFramework/tests/Constraints/ComparisonConstraintTests.cs'
--- src/NUnitFramework/tests/Constraints/ComparisonConstraintTests.cs	2011-04-12 00:17:39 +0000
+++ src/NUnitFramework/tests/Constraints/ComparisonConstraintTests.cs	2012-10-03 23:32:21 +0000
@@ -75,7 +75,7 @@
             }
         }
 
-#if CS_3_0 || CS_4_0
+#if CS_3_0 || CS_4_0 || CS_5_0
         [Test]
         public void UsesProvidedLambda()
         {
@@ -335,7 +335,7 @@
             }
         }
 
-#if CS_3_0 || CS_4_0
+#if CS_3_0 || CS_4_0 || CS_5_0
         [Test]
         public void UsesProvidedLambda()
         {

=== modified file 'src/NUnitFramework/tests/Constraints/EqualConstraintTests.cs'
--- src/NUnitFramework/tests/Constraints/EqualConstraintTests.cs	2011-12-15 23:02:34 +0000
+++ src/NUnitFramework/tests/Constraints/EqualConstraintTests.cs	2012-10-03 23:32:21 +0000
@@ -118,7 +118,7 @@
 
         #region Dictionary Tests
         // TODO: Move these to a separate fixture
-#if CS_3_0 || CS_4_0
+#if CS_3_0 || CS_4_0 || CS_5_0
         [Test]
         public void CanMatchHashtables_SameOrder()
         {
@@ -418,7 +418,7 @@
             }
         }
 
-#if CS_3_0 || CS_4_0
+#if CS_3_0 || CS_4_0 || CS_5_0
         [Test]
         public void UsesProvidedLambda_IntArgs()
         {

=== modified file 'src/NUnitFramework/tests/Syntax/ArbitraryConstraintMatching.cs'
--- src/NUnitFramework/tests/Syntax/ArbitraryConstraintMatching.cs	2012-02-21 03:31:35 +0000
+++ src/NUnitFramework/tests/Syntax/ArbitraryConstraintMatching.cs	2012-10-03 23:32:21 +0000
@@ -50,7 +50,7 @@
             return (num & 1) == 0;
         }
 
-#if CS_3_0 || CS_4_0
+#if CS_3_0 || CS_4_0 || CS_5_0
         [Test]
         public void CanMatchLambda()
         {

=== modified file 'src/NUnitFramework/tests/Syntax/ThrowsTests.cs'
--- src/NUnitFramework/tests/Syntax/ThrowsTests.cs	2012-07-09 19:20:41 +0000
+++ src/NUnitFramework/tests/Syntax/ThrowsTests.cs	2012-10-03 23:32:21 +0000
@@ -160,7 +160,7 @@
 
         // TODO: Move these to AssertThat tests
 #if CLR_2_0 || CLR_4_0
-#if CS_3_0 || CS_4_0
+#if CS_3_0 || CS_4_0 || CS_5_0
         [Test]
         public void DelegateThrowsException()
         {

=== modified file 'src/ProjectEditor/tests/Presenters/AddConfigurationPresenterTests.cs'
--- src/ProjectEditor/tests/Presenters/AddConfigurationPresenterTests.cs	2011-03-30 20:37:44 +0000
+++ src/ProjectEditor/tests/Presenters/AddConfigurationPresenterTests.cs	2012-10-03 23:32:21 +0000
@@ -4,7 +4,7 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using System;
 using System.IO;
 using NSubstitute;

=== modified file 'src/ProjectEditor/tests/Presenters/ConfigurationEditorTests.cs'
--- src/ProjectEditor/tests/Presenters/ConfigurationEditorTests.cs	2011-03-30 20:37:44 +0000
+++ src/ProjectEditor/tests/Presenters/ConfigurationEditorTests.cs	2012-10-03 23:32:21 +0000
@@ -4,7 +4,7 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using System;
 using System.Windows.Forms;
 using NUnit.Framework;

=== modified file 'src/ProjectEditor/tests/Presenters/MainPresenterTests.cs'
--- src/ProjectEditor/tests/Presenters/MainPresenterTests.cs	2012-07-09 19:20:41 +0000
+++ src/ProjectEditor/tests/Presenters/MainPresenterTests.cs	2012-10-03 23:32:21 +0000
@@ -4,7 +4,7 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using System;
 using NSubstitute;
 using NUnit.Framework;

=== modified file 'src/ProjectEditor/tests/Presenters/PropertyPresenterTests.cs'
--- src/ProjectEditor/tests/Presenters/PropertyPresenterTests.cs	2011-03-30 20:37:44 +0000
+++ src/ProjectEditor/tests/Presenters/PropertyPresenterTests.cs	2012-10-03 23:32:21 +0000
@@ -4,7 +4,7 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using System;
 using System.IO;
 using System.Reflection;

=== modified file 'src/ProjectEditor/tests/Presenters/RenameConfigurationPresenterTests.cs'
--- src/ProjectEditor/tests/Presenters/RenameConfigurationPresenterTests.cs	2011-03-30 20:37:44 +0000
+++ src/ProjectEditor/tests/Presenters/RenameConfigurationPresenterTests.cs	2012-10-03 23:32:21 +0000
@@ -4,7 +4,7 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using System;
 using System.Collections.Generic;
 using NSubstitute;

=== modified file 'src/ProjectEditor/tests/Presenters/SelectionStub.cs'
--- src/ProjectEditor/tests/Presenters/SelectionStub.cs	2011-03-30 20:37:44 +0000
+++ src/ProjectEditor/tests/Presenters/SelectionStub.cs	2012-10-03 23:32:21 +0000
@@ -4,7 +4,7 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using System;
 using System.Collections.Generic;
 using NUnit.ProjectEditor.ViewElements;

=== modified file 'src/ProjectEditor/tests/Presenters/XmlPresenterTests.cs'
--- src/ProjectEditor/tests/Presenters/XmlPresenterTests.cs	2011-03-30 20:37:44 +0000
+++ src/ProjectEditor/tests/Presenters/XmlPresenterTests.cs	2012-10-03 23:32:21 +0000
@@ -4,7 +4,7 @@
 // obtain a copy of the license at http://nunit.org
 // ****************************************************************
 
-#if NET_3_5 || NET_4_0
+#if NET_3_5 || NET_4_0 || NET_4_5
 using System;
 using System.Xml;
 using NUnit.Framework;

=== added directory 'src/tests/test-assembly-net45'
=== added file 'src/tests/test-assembly-net45/AsyncDummyFixture.cs'
--- src/tests/test-assembly-net45/AsyncDummyFixture.cs	1970-01-01 00:00:00 +0000
+++ src/tests/test-assembly-net45/AsyncDummyFixture.cs	2012-10-03 23:32:21 +0000
@@ -0,0 +1,56 @@
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace test_assembly_net45
+{
+	public class AsyncDummyFixture
+	{
+		[Test]
+		public async void Void()
+		{
+			
+		}
+
+		[Test]
+		public async Task PlainTask()
+		{
+			await Task.Yield();
+		}
+
+		[Test]
+		public async Task<int> TaskWithResult()
+		{
+			return await Task.FromResult(1);
+		}
+
+		[Test]
+		public Task<int> NonAsyncTaskWithResult()
+		{
+			return Task.FromResult(1);
+		}
+
+		[Test]
+		public Task NonAsyncTask()
+		{
+			return Task.Delay(0);
+		}
+
+		[TestCase(Result = 1)]
+		public async Task AsyncTaskTestCase()
+		{
+			await Task.Run(() => 1);
+		}
+
+		[TestCase(Result = 1)]
+		public async void AsyncVoidTestCase()
+		{
+			await Task.Run(() => 1);
+		}
+
+		[TestCase(Result = 1)]
+		public async Task<int> AsyncTaskWithResultTestCase()
+		{
+			return await Task.Run(() => 1);
+		}
+	}
+}
\ No newline at end of file

=== added file 'src/tests/test-assembly-net45/AsyncRealFixture.cs'
--- src/tests/test-assembly-net45/AsyncRealFixture.cs	1970-01-01 00:00:00 +0000
+++ src/tests/test-assembly-net45/AsyncRealFixture.cs	2012-10-03 23:32:21 +0000
@@ -0,0 +1,289 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Core;
+using NUnit.Framework;
+
+namespace test_assembly_net45
+{
+	public class AsyncRealFixture
+	{
+		[Test]
+		public async void AsyncVoidSuccess()
+		{
+			var result = await ReturnOne();
+
+			Assert.AreEqual(1, result);
+		}
+
+		[Test]
+		public async void AsyncVoidFailure()
+		{
+			var result = await ReturnOne();
+
+			Assert.AreEqual(2, result);
+		}
+
+		[Test]
+		public async void AsyncVoidError()
+		{
+			await ThrowException();
+
+			Assert.Fail("Should never get here");
+		}
+
+		[Test]
+		public async Task AsyncTaskSuccess()
+		{
+			var result = await ReturnOne();
+
+			Assert.AreEqual(1, result);
+		}
+
+		[Test]
+		public async Task AsyncTaskFailure()
+		{
+			var result = await ReturnOne();
+
+			Assert.AreEqual(2, result);
+		}
+
+		[Test]
+		public async Task AsyncTaskError()
+		{
+			await ThrowException();
+
+			Assert.Fail("Should never get here");
+		}
+
+		[Test]
+		public async Task<int> AsyncTaskResultSuccess()
+		{
+			var result = await ReturnOne();
+
+			Assert.AreEqual(1, result);
+
+			return result;
+		}
+
+		[Test]
+		public async Task<int> AsyncTaskResultFailure()
+		{
+			var result = await ReturnOne();
+
+			Assert.AreEqual(2, result);
+
+			return result;
+		}
+
+		[Test]
+		public async Task<int> AsyncTaskResultError()
+		{
+			await ThrowException();
+
+			Assert.Fail("Should never get here");
+
+			return 0;
+		}
+
+		[TestCase(Result = 1)]
+		public async Task<int> AsyncTaskResultCheckSuccess()
+		{
+			return await ReturnOne();
+		}
+
+		[TestCase(Result = 2)]
+		public async Task<int> AsyncTaskResultCheckFailure()
+		{
+			return await ReturnOne();
+		}
+
+		[TestCase(Result = 0)]
+		public async Task<int> AsyncTaskResultCheckError()
+		{
+			return await ThrowException();
+		}
+
+		[TestCase(Result = null)]
+		public async Task<object> AsyncTaskResultCheckSuccessReturningNull()
+		{
+			return await Task.Run(() => (object)null);
+		}
+
+		[Test]
+		[ExpectedException(typeof(InvalidOperationException))]
+		public async void AsyncVoidExpectedException()
+		{
+			await ThrowException();
+		}
+
+		[Test]
+		[ExpectedException(typeof(InvalidOperationException))]
+		public async Task AsyncTaskExpectedException()
+		{
+			await ThrowException();
+		}
+
+		[Test]
+		[ExpectedException(typeof(InvalidOperationException))]
+		public async Task<int> AsyncTaskResultExpectedException()
+		{
+			return await ThrowException();
+		}
+
+		[Test]
+		public async void AsyncVoidAssertSynchrnoizationContext()
+		{
+			Assert.That(SynchronizationContext.Current, Is.InstanceOf<AsyncSynchronizationContext>());
+			await Task.Yield();
+		}
+
+		[Test]
+		public async void NestedAsyncVoidSuccess()
+		{
+			var result = await Task.Run(async () => await ReturnOne());
+
+			Assert.AreEqual(1, result);
+		}
+
+		[Test]
+		public async void NestedAsyncVoidFailure()
+		{
+			var result = await Task.Run(async () => await ReturnOne());
+
+			Assert.AreEqual(2, result);
+		}
+
+		[Test]
+		public async void NestedAsyncVoidError()
+		{
+			await Task.Run(async () => await ThrowException());
+
+			Assert.Fail("Should not get here");
+		}
+
+		[Test]
+		public async Task NestedAsyncTaskSuccess()
+		{
+			var result = await Task.Run(async () => await ReturnOne());
+
+			Assert.AreEqual(1, result);
+		}
+
+		[Test]
+		public async Task NestedAsyncTaskFailure()
+		{
+			var result = await Task.Run(async () => await ReturnOne());
+
+			Assert.AreEqual(2, result);
+		}
+
+		[Test]
+		public async Task NestedAsyncTaskError()
+		{
+			await Task.Run(async () => await ThrowException());
+
+			Assert.Fail("Should never get here");
+		}
+
+		[Test]
+		public async Task<int> NestedAsyncTaskResultSuccess()
+		{
+			var result = await Task.Run(async () => await ReturnOne());
+
+			Assert.AreEqual(1, result);
+
+			return result;
+		}
+
+		[Test]
+		public async Task<int> NestedAsyncTaskResultFailure()
+		{
+			var result = await Task.Run(async () => await ReturnOne());
+
+			Assert.AreEqual(2, result);
+
+			return result;
+		}
+
+		[Test]
+		public async Task<int> NestedAsyncTaskResultError()
+		{
+			var result = await Task.Run(async () => await ThrowException());
+
+			Assert.Fail("Should never get here");
+
+			return result;
+		}
+
+		[Test]
+		public async void AsyncVoidMultipleSuccess()
+		{
+			var result = await ReturnOne();
+
+			Assert.AreEqual(await ReturnOne(), result);
+		}
+
+		[Test]
+		public async void AsyncVoidMultipleFailure()
+		{
+			var result = await ReturnOne();
+
+			Assert.AreEqual(await ReturnOne() + 1, result);
+		}
+
+		[Test]
+		public async void AsyncVoidMultipleError()
+		{
+			var result = await ReturnOne();
+			await ThrowException();
+
+			Assert.Fail("Should never get here");
+		}
+
+		[Test]
+		public async void AsyncTaskMultipleSuccess()
+		{
+			var result = await ReturnOne();
+
+			Assert.AreEqual(await ReturnOne(), result);
+		}
+
+		[Test]
+		public async void AsyncTaskMultipleFailure()
+		{
+			var result = await ReturnOne();
+
+			Assert.AreEqual(await ReturnOne() + 1, result);
+		}
+
+		[Test]
+		public async void AsyncTaskMultipleError()
+		{
+			var result = await ReturnOne();
+			await ThrowException();
+
+			Assert.Fail("Should never get here");
+		}
+
+		[TestCase(1, 2)]
+		public async void AsyncVoidTestCaseWithParametersSuccess(int a, int b)
+		{
+			Assert.AreEqual(await ReturnOne(), b - a);
+		}
+
+		private static Task<int> ReturnOne()
+		{
+			return Task.Run(() => 1);
+		}
+
+		private static Task<int> ThrowException()
+		{
+			return Task.Run(() =>
+			{
+				throw new InvalidOperationException();
+				return 1;
+			});
+		}
+	}
+}
\ No newline at end of file

=== added directory 'src/tests/test-assembly-net45/Properties'
=== added file 'src/tests/test-assembly-net45/test-assembly-net45.build'
--- src/tests/test-assembly-net45/test-assembly-net45.build	1970-01-01 00:00:00 +0000
+++ src/tests/test-assembly-net45/test-assembly-net45.build	2012-10-03 23:32:21 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<project name="TestAssembly" default="build" basedir=".">
+
+  <patternset id="source-files">
+    <include name="AsyncDummyFixture.cs"/>
+    <include name="AsyncRealFixture.cs"/>
+  </patternset>
+
+  <target name="build">
+    <property name="previousFramework" value="${nant.settings.currentframework}"/>
+    <property name="nant.settings.currentframework" value="net-4.5"/>
+    <csc target="library" 
+        output="${current.test.dir}/test-assembly-net45.dll" 
+        debug="${build.debug}" define="${build.defines}">
+      <sources>
+        <patternset refid="source-files"/>
+        <include name="../../GeneratedAssemblyInfo.cs"/>
+      </sources>
+      <nowarn>
+        <warning number="618,672"/>
+      </nowarn>
+      <references>
+        <include name="${current.framework.dir}/nunit.framework.dll"/>
+        <include name="${current.framework.dir}/nunit.framework.extensions.dll"/>
+        <include name="${current.lib.dir}/nunit.core.interfaces.dll"/>
+        <include name="${current.lib.dir}/nunit.core.dll"/>
+      </references>
+    </csc>
+    <property name="nant.settings.currentframework" value="${previousFramework}"/>
+  </target>
+
+  <target name="package">
+    <copy todir="${package.src.dir}/tests/test-assembly-net45">
+      <fileset>
+        <patternset refid="source-files" />
+        <include name="test-assembly.csproj"/>
+        <include name="test-assembly.build"/>
+      </fileset>
+    </copy>
+  </target>
+
+</project>
\ No newline at end of file

=== added file 'src/tests/test-assembly-net45/test-assembly-net45.csproj'
--- src/tests/test-assembly-net45/test-assembly-net45.csproj	1970-01-01 00:00:00 +0000
+++ src/tests/test-assembly-net45/test-assembly-net45.csproj	2012-10-03 23:32:21 +0000
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{74CCEAEA-CDBF-4FE0-BF0D-914C3C44ECE9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>test_assembly_net45</RootNamespace>
+    <AssemblyName>test-assembly-net45</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="AsyncDummyFixture.cs" />
+    <Compile Include="AsyncRealFixture.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="test-assembly-net45.build">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\NUnitCore\core\nunit.core.dll.csproj">
+      <Project>{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}</Project>
+      <Name>nunit.core.dll</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\NUnitFramework\framework\nunit.framework.dll.csproj">
+      <Project>{83DD7E12-A705-4DBA-9D71-09C8973D9382}</Project>
+      <Name>nunit.framework.dll</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file

=== modified file 'src/tests/test-assembly/DatapointFixture.cs'
--- src/tests/test-assembly/DatapointFixture.cs	2012-02-21 03:31:35 +0000
+++ src/tests/test-assembly/DatapointFixture.cs	2012-10-03 23:32:21 +0000
@@ -50,7 +50,7 @@
         public double[] values = new double[] { 0.0, 1.0, -1.0, double.MaxValue, double.PositiveInfinity };
     }
 
-#if CS_3_0 || CS_4_0
+#if CS_3_0 || CS_4_0 || CS_5_0
     public class SquareRootTest_Field_IEnumerableOfDouble : SquareRootTest
     {
         [Datapoints]

=== modified file 'tools/nant/bin/NAnt.exe.config'
--- tools/nant/bin/NAnt.exe.config	2012-09-25 20:55:15 +0000
+++ tools/nant/bin/NAnt.exe.config	2012-10-03 23:32:21 +0000
@@ -886,7 +886,341 @@
                         </task>
                     </tasks>
                 </framework>
-                <framework 
+				<framework
+					name="net-4.5"
+					family="net"
+					version="4.5"
+					description="Microsoft .NET Framework 4.5"
+					sdkdirectory="${sdkInstallRoot}"
+					frameworkdirectory="${path::combine(installRoot, 'v4.0.30319')}"
+					frameworkassemblydirectory="${path::combine(installRoot, 'v4.0.30319')}"
+					clrversion="4.0.30319"
+					clrtype="Desktop"
+					vendor="Microsoft"
+					  >
+				  <runtime>
+					<probing-paths>
+					  <directory name="lib/common/2.0" />
+					  <directory name="lib/common/neutral" />
+					</probing-paths>
+					<modes>
+					  <strict>
+						<environment>
+						  <variable name="COMPLUS_VERSION" value="v4.0.30319" />
+						</environment>
+					  </strict>
+					</modes>
+				  </runtime>
+				  <reference-assemblies basedir="${path::combine(installRoot, 'v4.0.30319')}">
+					<include name="Accessibility.dll" />
+					<include name="Microsoft.Build.Conversion.v4.0.dll" />
+					<include name="Microsoft.Build.dll" />
+					<include name="Microsoft.Build.Engine.dll" />
+					<include name="Microsoft.Build.Framework.dll" />
+					<include name="Microsoft.Build.Tasks.v4.0.dll" />
+					<include name="Microsoft.Build.Utilities.v4.0.dll" />
+					<include name="Microsoft.CSharp.dll" />
+					<include name="Microsoft.Data.Entity.Build.Tasks.dll" />
+					<include name="Microsoft.JScript.dll" />
+					<include name="Microsoft.Transactions.Bridge.dll" />
+					<include name="Microsoft.Transactions.Bridge.Dtc.dll" />
+					<include name="Microsoft.VisualBasic.Activities.Compiler.dll" />
+					<include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
+					<include name="Microsoft.VisualBasic.Compatibility.dll" />
+					<include name="Microsoft.VisualBasic.dll" />
+					<include name="Microsoft.VisualC.dll" />
+					<include name="Microsoft.VisualC.STLCLR.dll" />
+					<include name="mscorlib.dll" />
+					<include name="System.Activities.Core.Presentation.dll" />
+					<include name="System.Activities.dll" />
+					<include name="System.Activities.DurableInstancing.dll" />
+					<include name="System.Activities.Presentation.dll" />
+					<include name="System.AddIn.Contract" />
+					<include name="System.AddIn.dll" />
+					<include name="System.ComponentModel.Composition.dll" />
+					<include name="System.ComponentModel.DataAnnotations.dll" />
+					<include name="System.Configuration.dll" />
+					<include name="System.Configuration.Install.dll" />
+					<include name="System.Core.dll" />
+					<include name="System.Data.DataSetExtensions.dll" />
+					<include name="System.Data.dll" />
+					<include name="System.Data.Entity.Design.dll" />
+					<include name="System.Data.Entity.dll" />
+					<include name="System.Data.Linq.dll" />
+					<include name="System.Data.OracleClient.dll" />
+					<include name="System.Data.Services.Client.dll" />
+					<include name="System.Data.Services.Design.dll" />
+					<include name="System.Data.Services.dll" />
+					<include name="System.Data.SqlXml.dll" />
+					<include name="System.Deployment.dll" />
+					<include name="System.Design.dll" />
+					<include name="System.Device.dll" />
+					<include name="System.DirectoryServices.dll" />
+					<include name="System.DirectoryServices.Protocols.dll" />
+					<include name="System.dll" />
+					<include name="System.Drawing.Design.dll" />
+					<include name="System.Drawing.dll" />
+					<include name="System.Dynamic.dll" />
+					<include name="System.EnterpriseServices.dll" />
+					<include name="System.EnterpriseServices.Thunk.dll" />
+					<include name="System.EnterpriseServices.Wrapper.dll" />
+					<include name="System.IdentityModel.dll" />
+					<include name="System.IdentityModel.Selectors.dll" />
+					<include name="System.IO.Log.dll" />
+					<include name="System.Management.dll" />
+					<include name="System.Management.Instrumentation.dll" />
+					<include name="System.Messaging.dll" />
+					<include name="System.Net.dll" />
+					<include name="System.Numerics.dll" />
+					<include name="System.Runtime.Caching.dll" />
+					<include name="System.Runtime.DurableInstancing.dll" />
+					<include name="System.Runtime.Remoting.dll" />
+					<include name="System.Runtime.Serialization.dll" />
+					<include name="System.Runtime.Serialization.Formatters.Soap.dll" />
+					<include name="System.Security.dll" />
+					<include name="System.ServiceModel.Activation.dll" />
+					<include name="System.ServiceModel.Activities.dll" />
+					<include name="System.ServiceModel.Channels.dll" />
+					<include name="System.ServiceModel.Discovery.dll" />
+					<include name="System.ServiceModel.dll" />
+					<include name="System.ServiceModel.Routing.dll" />
+					<include name="System.ServiceModel.ServiceMoniker40.dll" />
+					<include name="System.ServiceModel.WasHosting.dll" />
+					<include name="System.ServiceModel.Web.dll" />
+					<include name="System.ServiceProcess.dll" />
+					<include name="System.Transactions.dll" />
+					<include name="System.Web.Abstractions.dll" />
+					<include name="System.Web.ApplicationServices.dll" />
+					<include name="System.Web.DataVisualization.Design.dll" />
+					<include name="System.Web.DataVisualization.dll" />
+					<include name="System.Web.dll" />
+					<include name="System.Web.DynamicData.Design.dll" />
+					<include name="System.Web.DynamicData.dll" />
+					<include name="System.Web.Entity.Design.dll" />
+					<include name="System.Web.Entity.dll" />
+					<include name="System.Web.Extensions.Design.dll" />
+					<include name="System.Web.Extensions.dll" />
+					<include name="System.Web.Mobile.dll" />
+					<include name="System.Web.RegularExpressions.dll" />
+					<include name="System.Web.Routing.dll" />
+					<include name="System.Web.Services.dll" />
+					<include name="System.Windows.Forms.DataVisualization.Design.dll" />
+					<include name="System.Windows.Forms.DataVisualization.dll" />
+					<include name="System.Windows.Forms.dll" />
+					<include name="System.Workflow.Activities.dll" />
+					<include name="System.Workflow.ComponentModel.dll" />
+					<include name="System.Workflow.Runtime.dll" />
+					<include name="System.WorkflowServices.dll" />
+					<include name="System.Xaml.dll" />
+					<include name="System.Xaml.Hosting.dll" />
+					<include name="System.Xml.dll" />
+					<include name="System.Xml.Linq.dll" />
+				  </reference-assemblies>
+				  <!-- WPF Assemblies -->
+				  <reference-assemblies basedir="${path::combine(installRoot, 'v4.0.30319')}/WPF">
+					<include name="NaturalLanguage6.dll" />
+					<include name="NlsData0009.dll" />
+					<include name="NlsLexicons0009.dll" />
+					<include name="PenIMC.dll" />
+					<include name="PresentationCore.dll" />
+					<include name="PresentationFramework.Aero.dll" />
+					<include name="PresentationFramework.Classic.dll" />
+					<include name="PresentationFramework.dll" />
+					<include name="PresentationFramework.Luna.dll" />
+					<include name="PresentationFramework.Royale.dll" />
+					<include name="PresentationHost_v0400.dll" />
+					<include name="PresentationNative_v0400.dll" />
+					<include name="PresentationUI.dll" />
+					<include name="ReachFramework.dll" />
+					<include name="System.Printing.dll" />
+					<include name="System.Speech.dll" />
+					<include name="System.Windows.Input.Manipulations.dll" />
+					<include name="System.Windows.Presentation.dll" />
+					<include name="UIAutomationClient.dll" />
+					<include name="UIAutomationClientsideProviders.dll" />
+					<include name="UIAutomationProvider.dll" />
+					<include name="UIAutomationTypes.dll" />
+					<include name="WindowsBase.dll" />
+					<include name="WindowsFormsIntegration.dll" />
+					<include name="wpfgfx_v0400.dll" />
+					<include name="wpftxt_v0400.dll" />
+				  </reference-assemblies>
+				  <reference-assemblies basedir="${environment::get-folder-path('ProgramFiles')}/Reference Assemblies/Microsoft/Framework/.NETFramework/v4.5">
+					<include name="Microsoft.Build.Conversion.v4.0.dll" />
+					<include name="Microsoft.Build.dll" />
+					<include name="Microsoft.Build.Engine.dll" />
+					<include name="Microsoft.Build.Framework.dll" />
+					<include name="Microsoft.Build.Tasks.v4.0.dll" />
+					<include name="Microsoft.Build.Utilities.v4.0.dll" />
+					<include name="Microsoft.CSharp.dll" />
+					<include name="Microsoft.JScript.dll" />
+					<include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
+					<include name="Microsoft.VisualBasic.Comptatibility.dll" />
+					<include name="Microsoft.VisualBasic.dll" />
+					<include name="Microsoft.VisualC.dll" />
+					<include name="Microsoft.VisualC.STLCLR.dll" />
+					<include name="mscorlib.dll" />
+					<include name="PresentationBuildTasks.dll" />
+					<include name="PresentationCore.dll" />
+					<include name="WindowsBase.dll" />
+					<include name="PresentationFramework.dll" />
+					<include name="PresentationFramework.Aero.dll" />
+					<include name="PresentationFramework.Classic.dll" />
+					<include name="PresentationFramework.Luna.dll" />
+					<include name="PresentationFramework.Royale.dll" />
+					<include name="ReachFramework.dll" />
+					<include name="System.Activities.Core.Presentation.dll" />
+					<include name="System.Activities.dll" />
+					<include name="System.Activities.DurableInstancing.dll" />
+					<include name="System.Activities.Presentation.dll" />
+					<include name="System.AddIn.Contract.dll" />
+					<include name="System.AddIn.dll" />
+					<include name="System.ComponentModel.Composition.dll" />
+					<include name="System.ComponentModel.DataAnnotations.dll" />
+					<include name="System.Configuration.dll" />
+					<include name="System.Core.dll" />
+					<include name="System.Data.DataSetExtension.dll" />
+					<include name="System.Data.dll" />
+					<include name="System.Data.Entity.Design.dll" />
+					<include name="System.Data.Entity.dll" />
+					<include name="System.Data.Linq.dll" />
+					<include name="System.Data.OracleClient.dll" />
+					<include name="System.Data.Services.Client.dll" />
+					<include name="System.Data.Services.Design.dll" />
+					<include name="System.Data.Services.dll" />
+					<include name="System.Data.SqlXml.dll" />
+					<include name="System.Deployment.dll" />
+					<include name="System.Design.dll" />
+					<include name="System.Device.dll" />
+					<include name="System.DirectoryServices.AccountManagement.dll" />
+					<include name="System.DirectoryServices.dll" />
+					<include name="System.DirectoryServices.Protocols.dll" />
+					<include name="System.dll" />
+					<include name="System.Drawing.Design.dll" />
+					<include name="System.Drawing.dll" />
+					<include name="System.EnterpriseServices.dll" />
+					<include name="System.EnterpriseServices.Thunk.dll" />
+					<include name="System.EnterpriseServices.Wrapper.dll" />
+					<include name="System.IdentityModel.dll" />
+					<include name="System.IdentityModel.Selectors.dll" />
+					<include name="System.IO.Log.dll" />
+					<include name="System.Management.dll" />
+					<include name="System.Management.Instrumentation.dll" />
+					<include name="System.Messaging.dll" />
+					<include name="System.Net.dll" />
+					<include name="System.Numerics.dll" />
+					<include name="System.Printing.dll" />
+					<include name="System.Runtime.Caching.dll" />
+					<include name="System.Runtime.DurableInstancing.dll" />
+					<include name="System.Runtime.Remoting.dll" />
+					<include name="System.Runtime.Serialization.dll" />
+					<include name="System.Runtime.Serialization.Formatters.Soap.dll" />
+					<include name="System.Security.dll" />
+					<include name="System.ServiceModel.Activation.dll" />
+					<include name="System.ServiceModel.Activities.dll" />
+					<include name="System.ServiceModel.Channels.dll" />
+					<include name="System.ServiceModel.Discovery.dll" />
+					<include name="System.ServiceModel.dll" />
+					<include name="System.ServiceModel.Routing.dll" />
+					<include name="System.ServiceModel.Web.dll" />
+					<include name="System.ServiceProcess.dll" />
+					<include name="System.Speech.dll" />
+					<include name="System.Transactions.dll" />
+					<include name="System.Web.Abstractions.dll" />
+					<include name="System.Web.ApplicationServices.dll" />
+					<include name="System.Web.DataVisualization.Design.dll" />
+					<include name="System.Web.DataVisualization.dll" />
+					<include name="System.Web.dll" />
+					<include name="System.Web.DynamicData.Design.dll" />
+					<include name="System.Web.DynamicData.dll" />
+					<include name="System.Web.Entity.Design.dll" />
+					<include name="System.Web.Entity.dll" />
+					<include name="System.Web.Extensions.Design.dll" />
+					<include name="System.Web.Extensions.dll" />
+					<include name="System.Web.Mobile.dll" />
+					<include name="System.Web.RegularExpressions.dll" />
+					<include name="System.Web.Routing.dll" />
+					<include name="System.Web.Services.dll" />
+					<include name="System.Windows.Forms.DataVisualization.Design.dll" />
+					<include name="System.Windows.Forms.DataVisualization.dll" />
+					<include name="System.Windows.Forms.dll" />
+					<include name="System.Windows.Input.Manipulations.dll" />
+					<include name="System.Windows.Presentation.dll" />
+					<include name="System.Workflow.Activities.dll" />
+					<include name="System.Workflow.ComponentModel.dll" />
+					<include name="System.Workflow.Runtime.dll" />
+					<include name="System.WorkflowServices.dll" />
+					<include name="System.Xaml.dll" />
+					<include name="System.Xml.dll" />
+					<include name="System.Xml.Linq.dll" />
+				  </reference-assemblies>
+				  <task-assemblies>
+					<!-- include MS.NET version-neutral assemblies -->
+					<include name="extensions/net/neutral/**/*.dll" />
+					<!-- include MS.NET 4.0 specific assemblies -->
+					<include name="extensions/net/4.0/**/*.dll" />
+					<!-- include MS.NET specific task assembly -->
+					<include name="NAnt.MSNetTasks.dll" />
+					<!-- include MS.NET specific test assembly -->
+					<include name="NAnt.MSNet.Tests.dll" />
+					<!-- include .NET 4.0 specific assemblies -->
+					<include name="extensions/common/4.0/**/*.dll" />
+				  </task-assemblies>
+				  <tool-paths>
+					<directory name="${sdkInstallRoot}"
+						if="${property::exists('sdkInstallRoot')}" />
+					<directory name="${path::combine(installRoot, 'v4.0.30319')}" />
+				  </tool-paths>
+				  <project>
+					<readregistry
+						property="installRoot"
+						key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+						hive="LocalMachine" />
+					<locatesdk property="sdkInstallRoot" minwinsdkver="v7.0A" minnetfxver="4.0" maxnetfxver="4.0.99999" failonerror="false" />
+				  </project>
+				  <tasks>
+					<task name="csc">
+					  <attribute name="supportsnowarnlist">true</attribute>
+					  <attribute name="supportswarnaserrorlist">true</attribute>
+					  <attribute name="supportskeycontainer">true</attribute>
+					  <attribute name="supportskeyfile">true</attribute>
+					  <attribute name="supportsdelaysign">true</attribute>
+					  <attribute name="supportsplatform">true</attribute>
+					  <attribute name="supportslangversion">true</attribute>
+					</task>
+					<task name="vbc">
+					  <attribute name="supportsdocgeneration">true</attribute>
+					  <attribute name="supportsnostdlib">true</attribute>
+					  <attribute name="supportsnowarnlist">true</attribute>
+					  <attribute name="supportskeycontainer">true</attribute>
+					  <attribute name="supportskeyfile">true</attribute>
+					  <attribute name="supportsdelaysign">true</attribute>
+					  <attribute name="supportsplatform">true</attribute>
+					  <attribute name="supportswarnaserrorlist">true</attribute>
+					</task>
+					<task name="jsc">
+					  <attribute name="supportsplatform">true</attribute>
+					</task>
+					<task name="vjc">
+					  <attribute name="supportsnowarnlist">true</attribute>
+					  <attribute name="supportskeycontainer">true</attribute>
+					  <attribute name="supportskeyfile">true</attribute>
+					  <attribute name="supportsdelaysign">true</attribute>
+					</task>
+					<task name="resgen">
+					  <attribute name="supportsassemblyreferences">true</attribute>
+					  <attribute name="supportsexternalfilereferences">true</attribute>
+					</task>
+					<task name="delay-sign">
+					  <attribute name="exename">sn</attribute>
+					</task>
+					<task name="license">
+					  <attribute name="exename">lc</attribute>
+					  <attribute name="supportsassemblyreferences">true</attribute>
+					</task>
+				  </tasks>
+				</framework>                
+				<framework 
                     name="netcf-1.0"
                     family="netcf"
                     version="1.0"
@@ -2921,9 +3255,11 @@
         <NetFx40_LegacySecurityPolicy enabled="true"/>
     </runtime>
     <startup>
-        <!-- .NET Framework 4.0 -->
-        <supportedRuntime version="v4.0.30319" />
-        <!-- .NET Framework 2.0 -->
-        <supportedRuntime version="v2.0.50727" />
-    </startup>
+		<!-- .NET Framework 4.5 -->
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+		<!-- .NET Framework 4.0 -->
+		<supportedRuntime version="v4.0.30319" />
+		<!-- .NET Framework 2.0 -->
+		<supportedRuntime version="v2.0.50727" />
+	</startup>
 </configuration>