← Back to team overview

nunit-core team mailing list archive

[Merge] lp:~charlie.poole/nunit-3.0/net-3.5-support into lp:nunit-3.0

 

Charlie Poole has proposed merging lp:~charlie.poole/nunit-3.0/net-3.5-support into lp:nunit-3.0.

Requested reviews:
    NUnit Developers (nunit-dev)

This merge includes support or .NET 3.5, Mono 3.5 and .NET CF 3.5 as build targets.
-- 
https://code.launchpad.net/~charlie.poole/nunit-3.0/net-3.5-support/+merge/12127
Your team NUnit Developers is subscribed to branch lp:nunit-3.0.
=== modified file 'nunit.build'
--- nunit.build	2009-09-15 17:41:09 +0000
+++ nunit.build	2009-09-19 21:42:56 +0000
@@ -60,7 +60,7 @@
          The first .NET and Mono frameworks found are the
          respective net and mono defaults. -->
   <property name="supported.frameworks" 
-    value="net-2.0,net-1.1,net-1.0,mono-2.0,mono-1.0,netcf-1.0,netcf-2.0"/>
+    value="net-3.5,net-2.0,net-1.1,net-1.0,mono-3.5,mono-2.0,mono-1.0,netcf-3.5,netcf-2.0,netcf-1.0"/>
 
   <!-- Packages we normally create -->
   <!--<property name="standard.packages" value="std,mono" />-->
@@ -100,12 +100,18 @@
   <target name="net-2.0" depends="set-net-2.0-runtime-config"
     description="Set runtime to .NET 2.0 for commands that follow"/>
       
+  <target name="net-3.5" depends="set-net-3.5-runtime-config"
+    description="Set runtime to .NET 3.5 for commands that follow"/>
+
   <target name="netcf-1.0" depends="set-netcf-1.0-runtime-config"
     description="Set runtime to CF 1.0 for commands that follow"/>
       
   <target name="netcf-2.0" depends="set-netcf-2.0-runtime-config"
     description="Set runtime to CF 2.0 for commands that follow"/>
       
+  <target name="netcf-3.5" depends="set-netcf-3.5-runtime-config"
+    description="Set runtime to CF 3.5 for commands that follow"/>
+      
   <target name="mono" depends="set-default-mono-runtime-config"
     description="Set runtime to default Mono version"/>
 
@@ -115,6 +121,9 @@
   <target name="mono-2.0" depends="set-mono-2.0-runtime-config"
     description="Set runtime to Mono 2.0 for commands that follow"/>
 
+  <target name="mono-3.5" depends="set-mono-3.5-runtime-config"
+    description="Set runtime to Mono 3.5 for commands that follow"/>
+
 <!-- ***************************************************************** -->
 <!-- ***             Targets that clean directories                *** -->
 <!-- ***************************************************************** -->
@@ -233,11 +242,11 @@
 
     <property name="nunit.console.dir"
       value="${nunit.dir}/bin/net-2.0"
-      if="${runtime.version=='2.0'}"/>
+      if="${runtime.version>='2.0'}"/>
 
     <property name="nunit.console.dir"
       value="${nunit.dir}/bin/net-1.1"
-      unless="${runtime.version=='2.0'}"/>
+      unless="${runtime.version>='2.0'}"/>
 
     <property name="result.file" 
       value="TestResult-${nant.settings.currentframework}"/>
@@ -316,11 +325,20 @@
 
   </target>
 
-  <target name="gui-test" depends="build,init-test"
-    description="Run tests for a build using gui runner">
+  <target name="gui-test" depends="build,run-gui-test"
+    description="Run tests for a build using gui runner"/>
+
+  <target name="run-gui-test">
+
+    <call target="nunit-gui-test" unless="${runtime.platform=='netcf'}"/>
+    <call target="nunitlite-gui-test"/>
+
+  </target>
+
+  <target name="nunit-gui-test" depends="init-test">
 
     <echo message="*"/>
-    <echo message="* Starting ${runtime.config} ${build.config} gui test run"/>
+    <echo message="* Testing the nunit.framework ${runtime.config} ${build.config} build"/>
     <echo message="*"/>
 
     <exec basedir="${nunit.dir}/bin/net-2.0" 
@@ -330,6 +348,19 @@
 
   </target>
 
+  <target name="nunitlite-gui-test" depends="init-test">
+
+    <echo message="*"/>
+    <echo message="* Testing the NUnitite ${runtime.config} ${build.config} build"/>
+    <echo message="*"/>
+
+    <exec basedir="${nunit.dir}/bin/net-2.0" 
+      workingdir="${current.build.dir}" 
+      program="nunit.exe" 
+      commandline="nunitlite.tests.exe -run"/>
+
+  </target>
+
 <!-- ***************************************************************** -->
 <!-- *       Build the NUnit samples - not part of normal build    *** -->
 <!-- ***************************************************************** -->

=== modified file 'nunit.common.include'
--- nunit.common.include	2009-09-15 17:41:09 +0000
+++ nunit.common.include	2009-09-19 21:42:56 +0000
@@ -188,8 +188,7 @@
     <property name="runtime.platform" value="net"/>
     <property name="runtime.version" value="1.0"/>
     <property name="runtime.config" value="net-1.0"/>
-    <property name="runtime.defines" value="MSNET,NET_1_0"/>
-    <property name="runtime.testproj" value="NUnitTests.v1.nunit"/>
+    <property name="runtime.defines" value="MSNET,NET_1_0,CLR_1_0"/>
     <property name="nant.settings.currentframework" value="net-1.0"/>
   </target>
 	
@@ -200,7 +199,7 @@
     <property name="runtime.platform" value="net"/>
     <property name="runtime.version" value="1.1"/>
     <property name="runtime.config" value="net-1.1"/>
-    <property name="runtime.defines" value="MSNET,NET_1_1"/>
+    <property name="runtime.defines" value="MSNET,NET_1_1,CLR_1_1"/>
     <property name="nant.settings.currentframework" value="net-1.1"/>
   </target>
 	
@@ -211,11 +210,10 @@
     <property name="runtime.platform" value="net"/>
     <property name="runtime.version" value="2.0"/>
     <property name="runtime.config" value="net-2.0"/>
-    <property name="runtime.defines" value="MSNET,NET_2_0"/>
+    <property name="runtime.defines" value="MSNET,NET_2_0,CLR_2_0"/>
     <property name="nant.settings.currentframework" value="net-2.0"/>
   </target>
    
-<!--     
   <target name="set-net-3.0-runtime-config">
     <fail unless="${framework::exists('net-3.0') and framework::sdk-exists('net-3.0')}"
       message="The .NET 3.0 SDK is not configured or not installed"/>
@@ -223,7 +221,7 @@
     <property name="runtime.platform" value="net"/>
     <property name="runtime.version" value="3.0"/>
     <property name="runtime.config" value="net-3.0"/>
-    <property name="runtime.defines" value="MSNET,NET_3_0"/>
+    <property name="runtime.defines" value="MSNET,NET_3_0,CLR_2_0"/>
     <property name="nant.settings.currentframework" value="net-3.0"/>
   </target>
 	
@@ -234,10 +232,9 @@
     <property name="runtime.platform" value="net"/>
     <property name="runtime.version" value="3.5"/>
     <property name="runtime.config" value="net-3.5"/>
-    <property name="runtime.defines" value="MSNET,NET_3_5"/>
+    <property name="runtime.defines" value="MSNET,NET_3_5,CLR_2_0"/>
     <property name="nant.settings.currentframework" value="net-3.5"/>
   </target>
- -->
  	
   <target name="set-netcf-1.0-runtime-config">
     <fail unless="${framework::exists('netcf-1.0') and framework::sdk-exists('netcf-1.0')}"
@@ -257,10 +254,21 @@
     <property name="runtime.platform" value="netcf"/>
     <property name="runtime.version" value="2.0"/>
     <property name="runtime.config" value="netcf-2.0"/>
-    <property name="runtime.defines" value="NETCF,NETCF_2_0"/>
+    <property name="runtime.defines" value="NETCF,NETCF_2_0,CLR_2_0"/>
     <property name="nant.settings.currentframework" value="netcf-2.0"/>
   </target>
 
+  <target name="set-netcf-3.5-runtime-config">
+    <fail unless="${framework::exists('netcf-3.5') and framework::sdk-exists('netcf-3.5')}"
+      message="The NETCF 3.5 SDK is not configured or not installed"/>
+
+    <property name="runtime.platform" value="netcf"/>
+    <property name="runtime.version" value="3.5"/>
+    <property name="runtime.config" value="netcf-3.5"/>
+    <property name="runtime.defines" value="NETCF,NETCF_3_5,CLR_2_0"/>
+    <property name="nant.settings.currentframework" value="netcf-3.5"/>
+  </target>
+
   <target name="set-mono-1.0-runtime-config">
     <fail unless="${framework::exists('mono-1.0') and framework::sdk-exists('mono-1.0')}"
       message="The Mono 1.0 SDK is not configured or not installed"/>
@@ -268,7 +276,7 @@
     <property name="runtime.platform" value="mono"/>
     <property name="runtime.version" value="1.0"/>
     <property name="runtime.config" value="mono-1.0"/>
-    <property name="runtime.defines" value="MONO,NET_1_1"/>
+    <property name="runtime.defines" value="MONO,MONO_1_0,CLR_1_1"/>
     <property name="runtime.testproj" value="NUnitTests.v1.nunit"/>
     <property name="nant.settings.currentframework" value="mono-1.0"/>
   </target>
@@ -280,11 +288,21 @@
     <property name="runtime.platform" value="mono"/>
     <property name="runtime.version" value="2.0"/>
     <property name="runtime.config" value="mono-2.0"/>
-    <property name="runtime.defines" value="MONO,NET_2_0"/>
-    <property name="runtime.testproj" value="NUnitTests.v2.nunit"/>
+    <property name="runtime.defines" value="MONO,MONO_2_0,CLR_2_0"/>
     <property name="nant.settings.currentframework" value="mono-2.0"/>
   </target>
 
+  <target name="set-mono-3.5-runtime-config">
+    <fail unless="${framework::exists('mono-3.5') and framework::sdk-exists('mono-3.5')}"
+      message="The Mono 3.5 SDK is not configured or not installed"/>
+
+    <property name="runtime.platform" value="mono"/>
+    <property name="runtime.version" value="3.5"/>
+    <property name="runtime.config" value="mono-3.5"/>
+    <property name="runtime.defines" value="MONO,MONO_3_5,CLR_2_0"/>
+    <property name="nant.settings.currentframework" value="mono-3.5"/>
+  </target>
+
 <!-- ***************************************************************** -->
 <!-- ***    Targets for setting the package configuration          *** -->
 <!-- ***************************************************************** -->

=== modified file 'solutions/vs2005/framework/nunit.framework.csproj'
--- solutions/vs2005/framework/nunit.framework.csproj	2009-09-11 21:12:38 +0000
+++ solutions/vs2005/framework/nunit.framework.csproj	2009-09-18 00:52:27 +0000
@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET_2_0;CLR_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\bin\Debug\nunit.framework.XML</DocumentationFile>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NET_2_0;CLR_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

=== modified file 'solutions/vs2005/tests/nunit.framework.tests.csproj'
--- solutions/vs2005/tests/nunit.framework.tests.csproj	2009-09-11 21:12:38 +0000
+++ solutions/vs2005/tests/nunit.framework.tests.csproj	2009-09-18 00:52:27 +0000
@@ -17,7 +17,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET_2_0;CLR_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -25,7 +25,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NET_2_0;CLR_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

=== modified file 'solutions/vs2005_CF/nunitlite.tests/nunitlite.tests.csproj'
--- solutions/vs2005_CF/nunitlite.tests/nunitlite.tests.csproj	2009-09-19 02:55:26 +0000
+++ solutions/vs2005_CF/nunitlite.tests/nunitlite.tests.csproj	2009-09-19 18:18:45 +0000
@@ -22,7 +22,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WindowsCE;NETCF;NUNITLITE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;WindowsCE;NETCF;NETCF_2_0;CLR_2_0;NUNITLITE</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
@@ -34,7 +34,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;$(PlatformFamilyName)</DefineConstants>
+    <DefineConstants>TRACE;WindowsCE;NETCF;NETCF_2_0;CLR_2_0;NUNITLITE</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>

=== modified file 'solutions/vs2005_CF/nunitlite/nunitlite.csproj'
--- solutions/vs2005_CF/nunitlite/nunitlite.csproj	2009-09-19 02:55:26 +0000
+++ solutions/vs2005_CF/nunitlite/nunitlite.csproj	2009-09-19 18:18:45 +0000
@@ -22,7 +22,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PocketPC;NETCF;NUNITLITE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;WindowsCE;NETCF;NETCF_2_0;CLR_2_0;NUNITLITE</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
@@ -35,7 +35,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;PocketPC;NETCF;NUNITLITE</DefineConstants>
+    <DefineConstants>TRACE;WindowsCE;NETCF;NETCF_2_0;CLR_2_0;NUNITLITE</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>

=== modified file 'solutions/vs2008/framework/nunit.framework.csproj'
--- solutions/vs2008/framework/nunit.framework.csproj	2009-09-08 05:53:41 +0000
+++ solutions/vs2008/framework/nunit.framework.csproj	2009-09-18 00:52:27 +0000
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NUnit</RootNamespace>
     <AssemblyName>nunit.framework</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject>
     </StartupObject>
@@ -24,7 +24,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;CSHARP_3_0</DefineConstants>
+    <DefineConstants>NET_3_5;CLR_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\bin\Debug\nunit.framework.XML</DocumentationFile>
@@ -34,7 +34,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0;CSHARP_3_0</DefineConstants>
+    <DefineConstants>TRACE;NET_3_5;CLR_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\bin\Release\nunit.framework.XML</DocumentationFile>
@@ -342,6 +342,9 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>

=== modified file 'solutions/vs2008/nunitlite.tests/nunitlite.tests.csproj'
--- solutions/vs2008/nunitlite.tests/nunitlite.tests.csproj	2009-09-11 21:12:38 +0000
+++ solutions/vs2008/nunitlite.tests/nunitlite.tests.csproj	2009-09-19 18:18:45 +0000
@@ -22,7 +22,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;CSHARP_3_0;NUNITLITE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET_3_5;CLR_2_0;NUNITLITE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0;CSHARP_3_0;NUNITLITE</DefineConstants>
+    <DefineConstants>TRACE;NET_3_5;CLR_2_0;NUNITLITE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\bin\Release\nunitlite.tests.XML</DocumentationFile>

=== modified file 'solutions/vs2008/nunitlite/nunitlite.csproj'
--- solutions/vs2008/nunitlite/nunitlite.csproj	2009-09-18 19:06:58 +0000
+++ solutions/vs2008/nunitlite/nunitlite.csproj	2009-09-19 18:18:45 +0000
@@ -20,7 +20,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;CSHARP_3_0;NUNITLITE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET_3_5;CLR_2_0;NUNITLITE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\bin\Debug\nunitlite.XML</DocumentationFile>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0;CSHARP_3_0;NUNITLITE</DefineConstants>
+    <DefineConstants>TRACE;NET_3_5;CLR_2_0;NUNITLITE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\bin\Release\nunitlite.XML</DocumentationFile>

=== modified file 'solutions/vs2008/tests/nunit.framework.tests.csproj'
--- solutions/vs2008/tests/nunit.framework.tests.csproj	2009-09-11 21:12:38 +0000
+++ solutions/vs2008/tests/nunit.framework.tests.csproj	2009-09-18 00:52:27 +0000
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NUnit.Framework.Tests</RootNamespace>
     <AssemblyName>nunit.framework.tests</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject>
     </StartupObject>
@@ -22,7 +22,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET_2_0;CSHARP_3_0</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET_3_5;CLR_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NET_2_0;CSHARP_3_0</DefineConstants>
+    <DefineConstants>TRACE;NET_3_5;CLR_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>
@@ -269,6 +269,9 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.XML" />

=== modified file 'solutions/vs2008_CF/nunitlite.tests/nunitlite.tests.csproj'
--- solutions/vs2008_CF/nunitlite.tests/nunitlite.tests.csproj	2009-09-19 02:55:26 +0000
+++ solutions/vs2008_CF/nunitlite.tests/nunitlite.tests.csproj	2009-09-19 19:13:24 +0000
@@ -14,7 +14,7 @@
     <PlatformID>3C41C503-53EF-4c2a-8DD4-A8217CAD115E</PlatformID>
     <OSVersion>4.20</OSVersion>
     <DeployDirSuffix>nunitlite</DeployDirSuffix>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <NativePlatformName>Pocket PC 2003</NativePlatformName>
     <FormFactorID>
     </FormFactorID>
@@ -24,7 +24,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PocketPC;NETCF;NUNITLITE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;PocketPC;NETCF;NETCF_3_5;CLR_2_0;NUNITLITE</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
@@ -36,7 +36,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;PocketPC;NETCF;NUNITLITE</DefineConstants>
+    <DefineConstants>TRACE;PocketPC;NETCF;NETCF_3_5;CLR_2_0;NUNITLITE</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>

=== modified file 'solutions/vs2008_CF/nunitlite/nunitlite.csproj'
--- solutions/vs2008_CF/nunitlite/nunitlite.csproj	2009-09-19 02:55:26 +0000
+++ solutions/vs2008_CF/nunitlite/nunitlite.csproj	2009-09-19 19:13:24 +0000
@@ -14,7 +14,7 @@
     <PlatformID>3C41C503-53EF-4c2a-8DD4-A8217CAD115E</PlatformID>
     <OSVersion>4.20</OSVersion>
     <DeployDirSuffix>nuntlite</DeployDirSuffix>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <NativePlatformName>Pocket PC 2003</NativePlatformName>
     <FormFactorID>
     </FormFactorID>
@@ -24,7 +24,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PocketPC;NETCF;NUNITLITE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;PocketPC;NETCF;NETCF_3_5;CLR_2_0;NUNITLITE</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
@@ -37,7 +37,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;$(PlatformFamilyName)</DefineConstants>
+    <DefineConstants>TRACE;PocketPC;NETCF;NETCF_3_5;CLR_2_0;NUNITLITE</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>

=== modified file 'src/framework/NUnit/Framework/Assume.cs'
--- src/framework/NUnit/Framework/Assume.cs	2009-09-06 20:54:07 +0000
+++ src/framework/NUnit/Framework/Assume.cs	2009-09-18 00:52:27 +0000
@@ -157,7 +157,7 @@
         #endregion
 
         #region ref Object
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Apply a constraint to a referenced value, succeeding if the constraint
         /// is satisfied and throwing an InconclusiveException on failure.

=== modified file 'src/framework/NUnit/Framework/Constraints/DelayedConstraint.cs'
--- src/framework/NUnit/Framework/Constraints/DelayedConstraint.cs	2009-09-06 20:54:07 +0000
+++ src/framework/NUnit/Framework/Constraints/DelayedConstraint.cs	2009-09-18 00:52:27 +0000
@@ -96,7 +96,7 @@
 			return baseConstraint.Matches(actual);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Test whether the constraint is satisfied by a given reference.
         /// Overridden to wait for the specified delay period before

=== modified file 'src/framework/NUnit/Framework/Constraints/PredicateConstraint.cs'
--- src/framework/NUnit/Framework/Constraints/PredicateConstraint.cs	2009-09-06 20:54:07 +0000
+++ src/framework/NUnit/Framework/Constraints/PredicateConstraint.cs	2009-09-18 00:52:27 +0000
@@ -21,7 +21,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ***********************************************************************
 
-#if NET_2_0
+#if CLR_2_0
 using System;
 using System.Collections.Generic;
 

=== modified file 'src/framework/NUnitLite/Runner/MethodHelper.cs'
--- src/framework/NUnitLite/Runner/MethodHelper.cs	2009-09-18 21:12:39 +0000
+++ src/framework/NUnitLite/Runner/MethodHelper.cs	2009-09-19 18:18:45 +0000
@@ -35,7 +35,7 @@
         {
             StringBuilder sb = new StringBuilder(method.Name);
 
-#if NET_2_0
+#if CLR_2_0
             if (method.IsGenericMethod)
             {
                 sb.Append("<");

=== modified file 'src/framework/Shared/Framework/Assert.cs'
--- src/framework/Shared/Framework/Assert.cs	2009-09-18 19:25:33 +0000
+++ src/framework/Shared/Framework/Assert.cs	2009-09-18 21:19:09 +0000
@@ -375,7 +375,7 @@
         #endregion
 
         #region ref Object
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Apply a constraint to a referenced value, succeeding if the constraint
         /// is satisfied and throwing an assertion exception on failure.
@@ -598,7 +598,7 @@
         #endregion
 
         #region Throws<T>
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Verifies that a delegate throws a particular exception when called.
         /// </summary>
@@ -706,7 +706,7 @@
         #endregion
 
         #region Catch<T>
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Verifies that a delegate throws an exception of a certain Type
         /// or one derived from it when called and returns it.
@@ -1100,7 +1100,7 @@
             Assert.That(aDouble, Is.NaN ,null, null);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Verifies that the double that is passed in is an <code>NaN</code> value.
         /// If the object is not <code>NaN</code> then an <see cref="AssertionException"/>
@@ -1383,7 +1383,7 @@
         #region IsAssignableFrom<T>
 
 #if !NUNITLITE
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Asserts that an object may be assigned a  value of a given Type.
         /// </summary>
@@ -1459,7 +1459,7 @@
         #region IsNotAssignableFrom<T>
 
 #if !NUNITLITE
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Asserts that an object may not be assigned a  value of a given Type.
         /// </summary>
@@ -1569,7 +1569,7 @@
         #region IsInstanceOf<T>
 
 #if !NUNITLITE
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Asserts that an object is an instance of a given type.
         /// </summary>
@@ -1679,7 +1679,7 @@
         #region IsNotInstanceOf<T>
 
 #if !NUNITLITE
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Asserts that an object is not an instance of a given type.
         /// </summary>
@@ -1943,7 +1943,7 @@
             AssertDoublesAreEqual(expected, actual, delta ,null, null);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Verifies that two doubles are equal considering a delta. If the
         /// expected value is infinity then the delta value is ignored. If 

=== modified file 'src/framework/Shared/Framework/AssertionHelper.cs'
--- src/framework/Shared/Framework/AssertionHelper.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/AssertionHelper.cs	2009-09-18 00:52:27 +0000
@@ -127,7 +127,7 @@
         #endregion
 
         #region ref Object
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Apply a constraint to a referenced value, succeeding if the constraint
         /// is satisfied and throwing an assertion exception on failure.

=== modified file 'src/framework/Shared/Framework/Constraints/CollectionConstraints.cs'
--- src/framework/Shared/Framework/Constraints/CollectionConstraints.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Constraints/CollectionConstraints.cs	2009-09-18 00:52:27 +0000
@@ -25,7 +25,7 @@
 using System.Collections;
 using System.Reflection;
 using System.Text;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 
@@ -135,7 +135,7 @@
             return this;
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Flag the constraint to use the supplied IComparer object.
         /// </summary>
@@ -510,7 +510,7 @@
             return this;
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Modifies the constraint to use an IComparer&lt;T&gt; and returns self.
         /// </summary>

=== modified file 'src/framework/Shared/Framework/Constraints/ComparisonAdapter.cs'
--- src/framework/Shared/Framework/Constraints/ComparisonAdapter.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Constraints/ComparisonAdapter.cs	2009-09-18 00:52:27 +0000
@@ -24,7 +24,7 @@
 using System;
 using System.Collections;
 using System.Reflection;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 
@@ -54,7 +54,7 @@
             return new ComparerAdapter(comparer);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a ComparisonAdapter that wraps an IComparer&lt;T&gt;
         /// </summary>
@@ -109,7 +109,7 @@
             }
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// ComparisonAdapter&lt;T&gt; extends ComparisonAdapter and
         /// allows use of an IComparer&lt;T&gt; or Comparison&lt;T&gt;

=== modified file 'src/framework/Shared/Framework/Constraints/ComparisonConstraints.cs'
--- src/framework/Shared/Framework/Constraints/ComparisonConstraints.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Constraints/ComparisonConstraints.cs	2009-09-18 00:52:27 +0000
@@ -23,7 +23,7 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 
@@ -119,7 +119,7 @@
             return this;
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Modifies the constraint to use an IComparer&lt;T&gt; and returns self
         /// </summary>

=== modified file 'src/framework/Shared/Framework/Constraints/Constraint.cs'
--- src/framework/Shared/Framework/Constraints/Constraint.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Constraints/Constraint.cs	2009-09-18 00:52:27 +0000
@@ -186,7 +186,7 @@
             return Matches(del());
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Test whether the constraint is satisfied by a given reference.
         /// The default implementation simply dereferences the value but

=== modified file 'src/framework/Shared/Framework/Constraints/ConstraintBuilder.cs'
--- src/framework/Shared/Framework/Constraints/ConstraintBuilder.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Constraints/ConstraintBuilder.cs	2009-09-18 00:52:27 +0000
@@ -23,7 +23,7 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 
@@ -45,7 +45,7 @@
         /// </summary>
         public class OperatorStack
         {
-#if NET_2_0
+#if CLR_2_0
             private Stack<ConstraintOperator> stack = new Stack<ConstraintOperator>();
 #else
 		    private Stack stack = new Stack();
@@ -102,7 +102,7 @@
         /// </summary>
         public class ConstraintStack
         {
-#if NET_2_0
+#if CLR_2_0
             private Stack<Constraint> stack = new Stack<Constraint>();
 #else
 		    private Stack stack = new Stack();

=== modified file 'src/framework/Shared/Framework/Constraints/ConstraintExpression.cs'
--- src/framework/Shared/Framework/Constraints/ConstraintExpression.cs	2009-09-17 20:45:00 +0000
+++ src/framework/Shared/Framework/Constraints/ConstraintExpression.cs	2009-09-18 00:52:27 +0000
@@ -200,7 +200,7 @@
             return this.Append(new AttributeOperator(expectedType));
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a new AttributeConstraint checking for the
         /// presence of a particular attribute on an object.
@@ -237,7 +237,7 @@
             return this.Append(constraint);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns the constraint provided as an argument - used to allow custom
         /// custom constraints to easily participate in the syntax.
@@ -457,7 +457,7 @@
             return (ExactTypeConstraint)this.Append(new ExactTypeConstraint(expectedType));
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual
         /// value is of the exact type supplied as an argument.
@@ -481,7 +481,7 @@
             return (InstanceOfTypeConstraint)this.Append(new InstanceOfTypeConstraint(expectedType));
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual value
         /// is of the type supplied as an argument or a derived type.
@@ -502,7 +502,7 @@
             return (InstanceOfTypeConstraint)this.Append(new InstanceOfTypeConstraint(expectedType));
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual value
         /// is of the type supplied as an argument or a derived type.
@@ -527,7 +527,7 @@
             return (AssignableFromConstraint)this.Append(new AssignableFromConstraint(expectedType));
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual value
         /// is assignable from the type supplied as an argument.
@@ -551,7 +551,7 @@
             return (AssignableToConstraint)this.Append(new AssignableToConstraint(expectedType));
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual value
         /// is assignable from the type supplied as an argument.

=== modified file 'src/framework/Shared/Framework/Constraints/ConstraintFactory.cs'
--- src/framework/Shared/Framework/Constraints/ConstraintFactory.cs	2009-09-17 20:45:00 +0000
+++ src/framework/Shared/Framework/Constraints/ConstraintFactory.cs	2009-09-18 00:52:27 +0000
@@ -183,7 +183,7 @@
             return Has.Attribute(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a new AttributeConstraint checking for the
         /// presence of a particular attribute on an object.
@@ -402,7 +402,7 @@
             return new ExactTypeConstraint(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual
         /// value is of the exact type supplied as an argument.
@@ -426,7 +426,7 @@
             return new InstanceOfTypeConstraint(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual value
         /// is of the type supplied as an argument or a derived type.
@@ -447,7 +447,7 @@
             return new InstanceOfTypeConstraint(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual value
         /// is of the type supplied as an argument or a derived type.
@@ -472,7 +472,7 @@
             return new AssignableFromConstraint(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual value
         /// is assignable from the type supplied as an argument.
@@ -496,7 +496,7 @@
             return new AssignableToConstraint(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual value
         /// is assignable from the type supplied as an argument.

=== modified file 'src/framework/Shared/Framework/Constraints/ConstraintOperators.cs'
--- src/framework/Shared/Framework/Constraints/ConstraintOperators.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Constraints/ConstraintOperators.cs	2009-09-18 00:52:27 +0000
@@ -23,7 +23,7 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 

=== modified file 'src/framework/Shared/Framework/Constraints/EqualConstraint.cs'
--- src/framework/Shared/Framework/Constraints/EqualConstraint.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Constraints/EqualConstraint.cs	2009-09-18 00:52:27 +0000
@@ -24,7 +24,7 @@
 using System;
 using System.IO;
 using System.Collections;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 
@@ -275,7 +275,7 @@
             return this;
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Flag the constraint to use the supplied IComparer object.
         /// </summary>

=== modified file 'src/framework/Shared/Framework/Constraints/EqualityAdapter.cs'
--- src/framework/Shared/Framework/Constraints/EqualityAdapter.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Constraints/EqualityAdapter.cs	2009-09-18 00:52:27 +0000
@@ -23,7 +23,7 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 
@@ -49,7 +49,7 @@
             return new ComparisonAdapterAdapter(ComparisonAdapter.For(comparer));
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns an EqualityAdapter that wraps an IEqualityComparer.
         /// </summary>

=== modified file 'src/framework/Shared/Framework/Constraints/NUnitComparer.cs'
--- src/framework/Shared/Framework/Constraints/NUnitComparer.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Constraints/NUnitComparer.cs	2009-09-18 00:52:27 +0000
@@ -25,7 +25,7 @@
 using System.IO;
 using System.Reflection;
 using System.Collections;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 

=== modified file 'src/framework/Shared/Framework/Constraints/NUnitEqualityComparer.cs'
--- src/framework/Shared/Framework/Constraints/NUnitEqualityComparer.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Constraints/NUnitEqualityComparer.cs	2009-09-18 00:52:27 +0000
@@ -24,7 +24,7 @@
 using System;
 using System.IO;
 using System.Collections;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 

=== modified file 'src/framework/Shared/Framework/Constraints/RangeConstraint.cs'
--- src/framework/Shared/Framework/Constraints/RangeConstraint.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Constraints/RangeConstraint.cs	2009-09-18 00:52:27 +0000
@@ -23,7 +23,7 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 
@@ -86,7 +86,7 @@
             return this;
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Modifies the constraint to use an IComparer&lt;T&gt; and returns self.
         /// </summary>

=== modified file 'src/framework/Shared/Framework/Constraints/ThrowsConstraint.cs'
--- src/framework/Shared/Framework/Constraints/ThrowsConstraint.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Constraints/ThrowsConstraint.cs	2009-09-18 00:52:27 +0000
@@ -82,7 +82,7 @@
             return baseConstraint == null || baseConstraint.Matches(caughtException);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Converts an ActualValueDelegate to a TestDelegate
         /// before calling the primary overload.

=== modified file 'src/framework/Shared/Framework/Has.cs'
--- src/framework/Shared/Framework/Has.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Has.cs	2009-09-18 00:52:27 +0000
@@ -175,7 +175,7 @@
             return new ConstraintExpression().Attribute(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a new AttributeConstraint checking for the
         /// presence of a particular attribute on an object.

=== modified file 'src/framework/Shared/Framework/Is.cs'
--- src/framework/Shared/Framework/Is.cs	2009-09-17 20:45:00 +0000
+++ src/framework/Shared/Framework/Is.cs	2009-09-18 00:52:27 +0000
@@ -274,7 +274,7 @@
             return new ExactTypeConstraint(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual
         /// value is of the exact type supplied as an argument.
@@ -298,7 +298,7 @@
             return new InstanceOfTypeConstraint(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual value
         /// is of the type supplied as an argument or a derived type.
@@ -319,7 +319,7 @@
             return new InstanceOfTypeConstraint(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual value
         /// is of the type supplied as an argument or a derived type.
@@ -344,7 +344,7 @@
             return new AssignableFromConstraint(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual value
         /// is assignable from the type supplied as an argument.
@@ -368,7 +368,7 @@
             return new AssignableToConstraint(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Returns a constraint that tests whether the actual value
         /// is assignable from the type supplied as an argument.

=== modified file 'src/framework/Shared/Framework/TestFixtureAttribute.cs'
--- src/framework/Shared/Framework/TestFixtureAttribute.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/TestFixtureAttribute.cs	2009-09-18 00:52:27 +0000
@@ -39,7 +39,7 @@
         private bool isIgnored;
         private string ignoreReason;
 
-#if NET_2_0
+#if CLR_2_0
         private Type[] typeArgs;
         private bool argsSeparated;
 #endif
@@ -78,7 +78,7 @@
         {
             get 
             {
-#if NET_2_0
+#if CLR_2_0
                 if (!argsSeparated)
                     SeparateArgs();
 #endif
@@ -110,7 +110,7 @@
             }
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Get or set the type arguments. If not set
         /// explicitly, any leading arguments that are

=== modified file 'src/framework/Shared/Framework/Throws.cs'
--- src/framework/Shared/Framework/Throws.cs	2009-09-06 20:54:07 +0000
+++ src/framework/Shared/Framework/Throws.cs	2009-09-18 00:52:27 +0000
@@ -131,7 +131,7 @@
             return Exception.TypeOf(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Creates a constraint specifying the exact type of exception expected
         /// </summary>
@@ -153,7 +153,7 @@
             return Exception.InstanceOf(expectedType);
         }
 
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Creates a constraint specifying the type of exception expected
         /// </summary>

=== modified file 'src/tests/NUnit/Framework/AssertThrowsTests.cs'
--- src/tests/NUnit/Framework/AssertThrowsTests.cs	2009-09-07 17:36:10 +0000
+++ src/tests/NUnit/Framework/AssertThrowsTests.cs	2009-09-18 00:52:27 +0000
@@ -31,7 +31,7 @@
 		[Test]
 		public void CorrectExceptionThrown()
 		{
-#if NET_2_0
+#if CLR_2_0
             Assert.Throws(typeof(ArgumentException), TestDelegates.ThrowsArgumentException);
             Assert.Throws(typeof(ArgumentException),
                 delegate { throw new ArgumentException(); });
@@ -61,7 +61,7 @@
             Assert.That(ex.Message, Is.StringStarting("myMessage"));
             Assert.That(ex.ParamName, Is.EqualTo("myParam"));
 
-#if NET_2_0
+#if CLR_2_0
             ex = Assert.Throws<ArgumentException>(
                 delegate { throw new ArgumentException("myMessage", "myParam"); }) as ArgumentException;
 
@@ -90,7 +90,7 @@
 			expectedMessage =
 				"  Expected: <System.ArgumentException>" + Environment.NewLine +
 				"  But was:  null" + Environment.NewLine;
-#if NET_2_0
+#if CLR_2_0
             Assert.Throws<ArgumentException>(TestDelegates.ThrowsNothing);
 #else
 			Assert.Throws( typeof(ArgumentException),
@@ -104,7 +104,7 @@
             expectedMessage =
                 "  Expected: <System.ArgumentException>" + Environment.NewLine +
                 "  But was:  <System.ApplicationException>" + Environment.NewLine;
-#if NET_2_0
+#if CLR_2_0
             Assert.Throws<ArgumentException>(TestDelegates.ThrowsApplicationException);
 #else
 			Assert.Throws( typeof(ArgumentException),
@@ -118,7 +118,7 @@
             expectedMessage =
                 "  Expected: <System.ArgumentException>" + Environment.NewLine +
                 "  But was:  <System.Exception>" + Environment.NewLine;
-#if NET_2_0
+#if CLR_2_0
             Assert.Throws<ArgumentException>(TestDelegates.ThrowsSystemException);
 #else
             Assert.Throws( typeof(ArgumentException),
@@ -132,7 +132,7 @@
             expectedMessage =
                 "  Expected: <System.Exception>" + Environment.NewLine +
                 "  But was:  <System.ArgumentException>" + Environment.NewLine;
-#if NET_2_0
+#if CLR_2_0
             Assert.Throws<Exception>(TestDelegates.ThrowsArgumentException);
 #else
             Assert.Throws( typeof(Exception),
@@ -143,7 +143,7 @@
         [Test]
         public void DoesNotThrowSuceeds()
         {
-#if NET_2_0
+#if CLR_2_0
             Assert.DoesNotThrow(TestDelegates.ThrowsNothing);
 #else
             Assert.DoesNotThrow( new TestDelegate( TestDelegates.ThrowsNothing ) );
@@ -155,7 +155,7 @@
         [Test, ExpectedException(typeof(AssertionException))]
         public void DoesNotThrowFails()
         {
-#if NET_2_0
+#if CLR_2_0
             Assert.DoesNotThrow(TestDelegates.ThrowsArgumentException);
 #else
             Assert.DoesNotThrow( new TestDelegate( TestDelegates.ThrowsArgumentException ) );

=== modified file 'src/tests/NUnit/Framework/CollectionAssertTest.cs'
--- src/tests/NUnit/Framework/CollectionAssertTest.cs	2009-09-07 17:36:10 +0000
+++ src/tests/NUnit/Framework/CollectionAssertTest.cs	2009-09-18 00:52:27 +0000
@@ -212,7 +212,7 @@
 			CollectionAssert.AreEqual(array1, array2, new AlwaysEqualComparer());
 		}
 
-#if NET_2_0
+#if CLR_2_0
         [Test]
         public void AreEqual_UsingIterator()
         {

=== modified file 'src/tests/NUnit/Framework/EqualsFixture.cs'
--- src/tests/NUnit/Framework/EqualsFixture.cs	2009-09-07 17:36:10 +0000
+++ src/tests/NUnit/Framework/EqualsFixture.cs	2009-09-18 00:52:27 +0000
@@ -304,7 +304,7 @@
 			Assert.AreEqual( 35, i21  );
 			Assert.AreEqual( 35, i22  );
 
-#if NET_2_0
+#if CLR_2_0
             byte? b23 = 35;
             sbyte? sb24 = 35;
             decimal? d25 = 35;

=== modified file 'src/tests/NUnit/Framework/NullableTypesTests.cs'
--- src/tests/NUnit/Framework/NullableTypesTests.cs	2009-09-07 17:36:10 +0000
+++ src/tests/NUnit/Framework/NullableTypesTests.cs	2009-09-18 00:52:27 +0000
@@ -25,7 +25,7 @@
 
 namespace NUnit.Framework.Tests
 {
-#if NET_2_0 && !MONO
+#if CLR_2_0 && !MONO
     [TestFixture, Category("Generics")]
     public class NullableTypesTests
     {

=== modified file 'src/tests/NUnit/Framework/Syntax/AfterTests.cs'
--- src/tests/NUnit/Framework/Syntax/AfterTests.cs	2009-09-07 17:36:10 +0000
+++ src/tests/NUnit/Framework/Syntax/AfterTests.cs	2009-09-18 00:52:27 +0000
@@ -63,7 +63,7 @@
 		}
 	}
 
-#if NET_2_0
+#if CLR_2_0
     public abstract class AfterSyntaxTests
     {
         protected bool flag;

=== modified file 'src/tests/NUnit/Framework/Syntax/ArbitraryConstraintMatching.cs'
--- src/tests/NUnit/Framework/Syntax/ArbitraryConstraintMatching.cs	2009-09-07 17:36:10 +0000
+++ src/tests/NUnit/Framework/Syntax/ArbitraryConstraintMatching.cs	2009-09-18 00:52:27 +0000
@@ -53,7 +53,7 @@
             Assert.That(constraint.Resolve().ToString(), Is.EqualTo("<all <and <custom> <another>>>")); 
         }
 
-#if NET_2_0
+#if CLR_2_0
         [Test]
         public void CanMatchPredicate()
         {
@@ -67,7 +67,7 @@
             return (num & 1) == 0;
         }
 
-#if CSHARP_3_0
+#if NET_3_5 || MONO_3_5
         [Test]
         public void CanMatchLambda()
         {

=== modified file 'src/tests/NUnit/Framework/Syntax/InvalidCodeTests.cs'
--- src/tests/NUnit/Framework/Syntax/InvalidCodeTests.cs	2009-09-07 17:36:10 +0000
+++ src/tests/NUnit/Framework/Syntax/InvalidCodeTests.cs	2009-09-18 00:52:27 +0000
@@ -25,7 +25,7 @@
 using System.Collections;
 using System.CodeDom.Compiler;
 using NUnit.Framework.Constraints;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 

=== modified file 'src/tests/NUnit/Framework/Syntax/TestCompiler.cs'
--- src/tests/NUnit/Framework/Syntax/TestCompiler.cs	2009-09-07 17:36:10 +0000
+++ src/tests/NUnit/Framework/Syntax/TestCompiler.cs	2009-09-18 00:52:27 +0000
@@ -29,7 +29,7 @@
     class TestCompiler
     {
         Microsoft.CSharp.CSharpCodeProvider provider;
-#if !NET_2_0
+#if !CLR_2_0
 		ICodeCompiler compiler;
 #endif
 		CompilerParameters options;
@@ -41,7 +41,7 @@
 		public TestCompiler( string[] assemblyNames, string outputName )
 		{
 			this.provider = new Microsoft.CSharp.CSharpCodeProvider();
-#if !NET_2_0
+#if !CLR_2_0
 			this.compiler = provider.CreateCompiler();
 #endif
 			this.options = new CompilerParameters();
@@ -63,7 +63,7 @@
 
 		public CompilerResults CompileCode( string code )
 		{
-#if NET_2_0
+#if CLR_2_0
 			return provider.CompileAssemblyFromSource( options, code );
 #else
             return compiler.CompileAssemblyFromSource(options, code);

=== modified file 'src/tests/NUnit/Framework/TypeAssertTest.cs'
--- src/tests/NUnit/Framework/TypeAssertTest.cs	2009-09-07 17:36:10 +0000
+++ src/tests/NUnit/Framework/TypeAssertTest.cs	2009-09-18 00:52:27 +0000
@@ -51,7 +51,7 @@
 
 			Assert.IsInstanceOf(typeof(System.Exception), ex );
             Assert.That( ex, Is.InstanceOf(typeof(Exception)));
-#if NET_2_0
+#if CLR_2_0
             Assert.IsInstanceOf<Exception>( ex );
 #endif
 		}
@@ -70,7 +70,7 @@
 		{
 			Assert.IsNotInstanceOf(typeof(System.Int32), "abc123" );
 			Assert.That( "abc123", Is.Not.InstanceOf(typeof(System.Int32)) );
-#if NET_2_0
+#if CLR_2_0
 			Assert.IsNotInstanceOf<System.Int32>("abc123");
 #endif
 		}
@@ -91,7 +91,7 @@
 
             Assert.IsAssignableFrom(typeof(int[]), array10);
             Assert.That(array10, Is.AssignableFrom(typeof(int[])));
-#if NET_2_0
+#if CLR_2_0
             Assert.IsAssignableFrom<int[]>(array10);
 #endif
         }
@@ -115,7 +115,7 @@
 
 			Assert.IsNotAssignableFrom( typeof(int[,] ),array10);
 			Assert.That( array10, Is.Not.AssignableFrom( typeof(int[,] ) ) );
-#if NET_2_0
+#if CLR_2_0
 			Assert.IsNotAssignableFrom<int[,]>(array10);
 #endif
 		}

=== modified file 'src/tests/Shared/Framework/Constraints/CollectionConstraintTests.cs'
--- src/tests/Shared/Framework/Constraints/CollectionConstraintTests.cs	2009-09-11 21:12:38 +0000
+++ src/tests/Shared/Framework/Constraints/CollectionConstraintTests.cs	2009-09-19 19:13:56 +0000
@@ -23,7 +23,7 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 using NUnit.Framework.Tests;
@@ -65,7 +65,7 @@
             Assert.That(c, new AllItemsConstraint(new RangeConstraint(10, 100).Using(Comparer.Default)));
         }
 
-#if NET_2_0
+#if CLR_2_0
         [Test]
         public void AllItemsAreInRange_UsingIComparerOfT()
         {
@@ -157,7 +157,7 @@
             Assert.That(new string[] { "Hello", "World" }, 
                 new CollectionContainsConstraint("WORLD").IgnoreCase);
         }
-#if CSHARP_3_0
+#if NET_3_5 || MONO_3_5 || NETCF_3_5
         [Test]
         public void UsingIsHonored()
         {
@@ -243,7 +243,7 @@
             Assert.That(new CollectionEquivalentConstraint(set1).IgnoreCase.Matches(set2));
         }
 
-#if CSHARP_3_0
+#if NET_3_5 || MONO_3_5 || NETCF_3_5
         [Test]
         public void EquivalentHonorsUsing()
         {
@@ -389,7 +389,7 @@
             Assert.That(comparer.Called, "TestComparer was not called");
         }
 
-#if NET_2_0
+#if CLR_2_0
         [Test]
         public void UsesProvidedComparerOfT()
         {
@@ -436,7 +436,7 @@
             }
         }
 
-#if CSHARP_3_0
+#if NET_3_5 || MONO_3_5 || NETCF_3_5
         [Test]
         public void UsesProvidedLambda()
         {

=== modified file 'src/tests/Shared/Framework/Constraints/ComparerTests.cs'
--- src/tests/Shared/Framework/Constraints/ComparerTests.cs	2009-09-06 16:12:27 +0000
+++ src/tests/Shared/Framework/Constraints/ComparerTests.cs	2009-09-18 00:52:27 +0000
@@ -38,7 +38,7 @@
         [TestCase(4.0f, 4)]
         [TestCase(4.0f, 4.0d)]
         [TestCase(SpecialValue.Null, SpecialValue.Null)]
-#if NET_2_0
+#if CLR_2_0
         [TestCase(null, null)]
 #endif
         public void EqualItems(object x, object y)
@@ -59,7 +59,7 @@
 #if !NUNITLITE
         [TestCase(4, SpecialValue.Null)]
 #endif
-#if NET_2_0
+#if CLR_2_0
         [TestCase(4, null)]
 #endif
         public void UnequalItems(object greater, object lesser)

=== modified file 'src/tests/Shared/Framework/Constraints/ComparisonConstraintTests.cs'
--- src/tests/Shared/Framework/Constraints/ComparisonConstraintTests.cs	2009-09-06 16:12:27 +0000
+++ src/tests/Shared/Framework/Constraints/ComparisonConstraintTests.cs	2009-09-19 19:13:56 +0000
@@ -23,7 +23,7 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 
@@ -53,7 +53,7 @@
             }
         }
 
-#if NET_2_0
+#if CLR_2_0
         [Test]
         public void UsesProvidedComparerOfT()
         {
@@ -92,7 +92,7 @@
             }
         }
 
-#if CSHARP_3_0
+#if NET_3_5 || MONO_3_5 || NETCF_3_5
         [Test]
         public void UsesProvidedLambda()
         {
@@ -130,7 +130,7 @@
             Assert.That(actual, Is.GreaterThan(expected));
         }
 
-#if NET_2_0
+#if CLR_2_0
         [Test]
         public void CanCompareIComparablesOfT()
         {
@@ -168,7 +168,7 @@
             Assert.That(actual, Is.GreaterThanOrEqualTo(expected));
         }
 
-#if NET_2_0
+#if CLR_2_0
         [Test]
         public void CanCompareIComparablesOfT()
         {
@@ -206,7 +206,7 @@
             Assert.That(actual, Is.LessThan(expected));
         }
 
-#if NET_2_0
+#if CLR_2_0
         [Test]
         public void CanCompareIComparablesOfT()
         {
@@ -244,7 +244,7 @@
             Assert.That(actual, Is.LessThanOrEqualTo(expected));
         }
 
-#if NET_2_0
+#if CLR_2_0
         [Test]
         public void CanCompareIComparablesOfT()
         {
@@ -295,7 +295,7 @@
             }
         }
 
-#if NET_2_0
+#if CLR_2_0
         [Test]
         public void UsesProvidedComparerOfT()
         {
@@ -334,7 +334,7 @@
             }
         }
 
-#if CSHARP_3_0
+#if NET_3_5 || MONO_3_5 || NETCF_3_5
         [Test]
         public void UsesProvidedLambda()
         {
@@ -366,7 +366,7 @@
         }
     }
 
-#if NET_2_0
+#if CLR_2_0
     class ClassWithIComparableOfT : IComparable<ClassWithIComparableOfT>
     {
         private int val;

=== modified file 'src/tests/Shared/Framework/Constraints/EmptyConstraintTest.cs'
--- src/tests/Shared/Framework/Constraints/EmptyConstraintTest.cs	2009-09-06 16:12:27 +0000
+++ src/tests/Shared/Framework/Constraints/EmptyConstraintTest.cs	2009-09-18 00:52:27 +0000
@@ -42,7 +42,7 @@
             string.Empty,
             new object[0],
             new ArrayList(),
-#if NET_2_0
+#if CLR_2_0
             new System.Collections.Generic.List<int>()
 #endif  
         };

=== modified file 'src/tests/Shared/Framework/Constraints/EqualTest.cs'
--- src/tests/Shared/Framework/Constraints/EqualTest.cs	2009-09-11 21:12:38 +0000
+++ src/tests/Shared/Framework/Constraints/EqualTest.cs	2009-09-19 19:13:56 +0000
@@ -25,7 +25,7 @@
 using System.IO;
 using System.Drawing;
 using System.Collections;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 
@@ -295,7 +295,7 @@
             }
         }
 
-#if NET_2_0
+#if CLR_2_0
         [Test]
         public void UsesProvidedEqualityComparer()
         {
@@ -382,7 +382,7 @@
             }
         }
 
-#if CSHARP_3_0
+#if NET_3_5 || MONO_3_5 || NETCF_3_5
         [Test]
         public void UsesProvidedLambda_IntArgs()
         {
@@ -497,7 +497,7 @@
             }
         }
 
-#if NET_2_0
+#if CLR_2_0
         [Test]
         public void TestPropertyWithPrivateSetter()
         {

=== modified file 'src/tests/Shared/Framework/Constraints/MsgUtilTests.cs'
--- src/tests/Shared/Framework/Constraints/MsgUtilTests.cs	2009-09-18 20:31:35 +0000
+++ src/tests/Shared/Framework/Constraints/MsgUtilTests.cs	2009-09-18 21:19:09 +0000
@@ -41,7 +41,7 @@
         [TestCase("\n\r", "\\n\\r")]
         [TestCase("This is a\rtest message", "This is a\\rtest message")]
         [TestCase("", "")]
-#if NET_2_0
+#if CLR_2_0
 		[TestCase(null, null)]
 #endif
         [TestCase("\t", "\\t")]

=== modified file 'src/tests/Shared/Framework/Constraints/XmlSerializableTest.cs'
--- src/tests/Shared/Framework/Constraints/XmlSerializableTest.cs	2009-09-11 21:12:38 +0000
+++ src/tests/Shared/Framework/Constraints/XmlSerializableTest.cs	2009-09-19 18:18:45 +0000
@@ -25,7 +25,7 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 
@@ -44,7 +44,7 @@
 
         object[] SuccessData = new object[] { 1, "a", new ArrayList() };
 
-#if NET_2_0
+#if CLR_2_0
         object[] FailureData = new object[] { 
             new TestCaseData( new Dictionary<string, string>(), "<Dictionary`2>" ),
             new TestCaseData( new InternalClass(), "<InternalClass>" ),

=== modified file 'src/tests/Shared/Framework/Syntax/CollectionTests.cs'
--- src/tests/Shared/Framework/Syntax/CollectionTests.cs	2009-07-16 20:05:38 +0000
+++ src/tests/Shared/Framework/Syntax/CollectionTests.cs	2009-09-17 23:53:44 +0000
@@ -23,7 +23,7 @@
 
 using System;
 using System.Collections;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 

=== modified file 'src/tests/Shared/Framework/Syntax/EqualityTests.cs'
--- src/tests/Shared/Framework/Syntax/EqualityTests.cs	2009-07-16 20:05:38 +0000
+++ src/tests/Shared/Framework/Syntax/EqualityTests.cs	2009-09-17 23:53:44 +0000
@@ -22,7 +22,7 @@
 // ***********************************************************************
 
 using System;
-#if NET_2_0
+#if CLR_2_0
 using System.Collections.Generic;
 #endif
 
@@ -79,7 +79,7 @@
             Assert.That(i3, Is.EqualTo(d3));
             Assert.That(2 + 2, Is.Not.EqualTo(5));
             Assert.That(i3, Is.Not.EqualTo(iunequal));
-#if NET_2_0
+#if CLR_2_0
             List<string> list = new List<string>();
             list.Add("foo");
             list.Add("bar");

=== modified file 'src/tests/Shared/Framework/Syntax/ThrowsTests.cs'
--- src/tests/Shared/Framework/Syntax/ThrowsTests.cs	2009-07-16 20:05:38 +0000
+++ src/tests/Shared/Framework/Syntax/ThrowsTests.cs	2009-09-19 19:13:56 +0000
@@ -110,8 +110,8 @@
                 expr.Resolve().ToString());
         }
 
-#if NET_2_0
-#if CSHARP_3_0
+#if CLR_2_0
+#if NET_3_5 || MONO_3_5 || NETCF_3_5
         [Test]
         public void DelegateThrowsException()
         {
@@ -128,6 +128,7 @@
                 Throws.InstanceOf<ArgumentNullException>());
         }
 
+#if !NETCF
         [Test]
         public void LambdaThrowsExceptionWithMessage()
         {
@@ -136,6 +137,7 @@
                 Throws.InstanceOf<ArgumentNullException>()
                 .And.Message.Matches("null"));
         }
+#endif
 
         internal class MyClass
         {

=== modified file 'src/tests/Shared/Framework/Syntax/TypeConstraints.cs'
--- src/tests/Shared/Framework/Syntax/TypeConstraints.cs	2009-07-16 20:05:38 +0000
+++ src/tests/Shared/Framework/Syntax/TypeConstraints.cs	2009-09-17 23:53:44 +0000
@@ -116,7 +116,7 @@
         }
     }
 
-#if NET_2_0
+#if CLR_2_0
     [TestFixture]
     public class ExactTypeTest_Generic : SyntaxTest
     {

=== modified file 'src/tests/Shared/Framework/TestFixtureAttributeTests.cs'
--- src/tests/Shared/Framework/TestFixtureAttributeTests.cs	2009-09-06 16:12:27 +0000
+++ src/tests/Shared/Framework/TestFixtureAttributeTests.cs	2009-09-18 00:52:27 +0000
@@ -28,7 +28,7 @@
     public class TestFixtureAttributeTests
     {
         static object[] fixtureArgs = new object[] { 10, 20, "Charlie" };
-#if NET_2_0
+#if CLR_2_0
         static Type[] typeArgs = new Type[] { typeof(int), typeof(string) };
         static object[] combinedArgs = new object[] { typeof(int), typeof(string), 10, 20, "Charlie" };
 #endif
@@ -38,7 +38,7 @@
         {
             TestFixtureAttribute attr = new TestFixtureAttribute();
             Assert.That(attr.Arguments.Length == 0);
-#if NET_2_0
+#if CLR_2_0
             Assert.That(attr.TypeArgs.Length == 0);
 #endif
         }
@@ -48,12 +48,12 @@
         {
             TestFixtureAttribute attr = new TestFixtureAttribute(fixtureArgs);
             Assert.That(attr.Arguments, Is.EqualTo( fixtureArgs ) );
-#if NET_2_0
+#if CLR_2_0
             Assert.That(attr.TypeArgs.Length == 0 );
 #endif
         }
 
-#if NET_2_0
+#if CLR_2_0
         [Test]
         public void ConstructWithJustTypeArgs()
         {

=== modified file 'tools/src/CodeGeneration/CodeGenLib/CodeGenLib.csproj'
--- tools/src/CodeGeneration/CodeGenLib/CodeGenLib.csproj	2009-09-07 02:09:51 +0000
+++ tools/src/CodeGeneration/CodeGenLib/CodeGenLib.csproj	2009-09-19 22:02:35 +0000
@@ -43,9 +43,6 @@
     <Compile Include="Stanza.cs" />
     <Compile Include="SyntaxInfo.cs" />
   </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.

=== modified file 'tools/src/CodeGeneration/CodeGenLib/CodeGenSpec.cs'
--- tools/src/CodeGeneration/CodeGenLib/CodeGenSpec.cs	2009-08-30 19:03:20 +0000
+++ tools/src/CodeGeneration/CodeGenLib/CodeGenSpec.cs	2009-09-18 00:52:27 +0000
@@ -126,7 +126,7 @@
                     }
 
                     if (spec.IsGeneric)
-                        writer.WriteLineNoTabs("#if NET_2_0");
+                        writer.WriteLineNoTabs("#if CLR_2_0");
 
                     if (spec.ClassName == "Assert")
                         GenerateAssertOverloads(writer, isStatic, spec);

=== modified file 'tools/src/CodeGeneration/GenSyntax/Templates/Assert.template.cs'
--- tools/src/CodeGeneration/GenSyntax/Templates/Assert.template.cs	2009-09-18 19:25:33 +0000
+++ tools/src/CodeGeneration/GenSyntax/Templates/Assert.template.cs	2009-09-18 21:19:09 +0000
@@ -375,7 +375,7 @@
         #endregion
 
         #region ref Object
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Apply a constraint to a referenced value, succeeding if the constraint
         /// is satisfied and throwing an assertion exception on failure.
@@ -598,7 +598,7 @@
         #endregion
 
         #region Throws<T>
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Verifies that a delegate throws a particular exception when called.
         /// </summary>
@@ -706,7 +706,7 @@
         #endregion
 
         #region Catch<T>
-#if NET_2_0
+#if CLR_2_0
         /// <summary>
         /// Verifies that a delegate throws an exception of a certain Type
         /// or one derived from it when called and returns it.

=== modified file 'tools/src/CodeGeneration/tests/GenSyntax.Tests.csproj'
--- tools/src/CodeGeneration/tests/GenSyntax.Tests.csproj	2009-09-07 02:09:51 +0000
+++ tools/src/CodeGeneration/tests/GenSyntax.Tests.csproj	2009-09-19 22:02:35 +0000
@@ -53,9 +53,6 @@
       <Name>GenSyntax</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.


Follow ups