NUnit Framework

Merge lp:~charlie.poole/nunit-3.0/net-3.5-support into lp:~nunit-core/nunit-3.0/trunk-before-upgrade

  1. net-3.5-support
  2. Merge into trunk-before-upgrade
Proposed by Charlie Poole
Status: Merged
Approved by: Charlie Poole
Approved revision: 28
Merged at revision: not available
Proposed branch: lp:~charlie.poole/nunit-3.0/net-3.5-support
Merge into: lp:~nunit-core/nunit-3.0/trunk-before-upgrade
Diff against target: None lines
To merge this branch: bzr merge lp:~charlie.poole/nunit-3.0/net-3.5-support
Reviewer Review Type Date Requested Status
Andreas Schlapsi Approve
Simone Busoli Approve
Olof Bjarnason Approve
Review via email: mp+12127@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Charlie Poole (charlie.poole) wrote :

This merge includes support or .NET 3.5, Mono 3.5 and .NET CF 3.5 as build targets.

Revision history for this message
Olof Bjarnason (objarni) wrote :

> This merge includes support or .NET 3.5, Mono 3.5 and .NET CF 3.5 as build
> targets.

I like the define name change from NET_2 to CLR_2, it separates the concept of the .NET Framework form the Common Language Runtime more clearly.

review: Approve
Revision history for this message
Simone Busoli (simone.busoli) :
review: Approve
Revision history for this message
Andreas Schlapsi (a-schlapsi) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nunit.build'
2--- nunit.build 2009-09-15 17:41:09 +0000
3+++ nunit.build 2009-09-19 21:42:56 +0000
4@@ -60,7 +60,7 @@
5 The first .NET and Mono frameworks found are the
6 respective net and mono defaults. -->
7 <property name="supported.frameworks"
8- value="net-2.0,net-1.1,net-1.0,mono-2.0,mono-1.0,netcf-1.0,netcf-2.0"/>
9+ 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"/>
10
11 <!-- Packages we normally create -->
12 <!--<property name="standard.packages" value="std,mono" />-->
13@@ -100,12 +100,18 @@
14 <target name="net-2.0" depends="set-net-2.0-runtime-config"
15 description="Set runtime to .NET 2.0 for commands that follow"/>
16
17+ <target name="net-3.5" depends="set-net-3.5-runtime-config"
18+ description="Set runtime to .NET 3.5 for commands that follow"/>
19+
20 <target name="netcf-1.0" depends="set-netcf-1.0-runtime-config"
21 description="Set runtime to CF 1.0 for commands that follow"/>
22
23 <target name="netcf-2.0" depends="set-netcf-2.0-runtime-config"
24 description="Set runtime to CF 2.0 for commands that follow"/>
25
26+ <target name="netcf-3.5" depends="set-netcf-3.5-runtime-config"
27+ description="Set runtime to CF 3.5 for commands that follow"/>
28+
29 <target name="mono" depends="set-default-mono-runtime-config"
30 description="Set runtime to default Mono version"/>
31
32@@ -115,6 +121,9 @@
33 <target name="mono-2.0" depends="set-mono-2.0-runtime-config"
34 description="Set runtime to Mono 2.0 for commands that follow"/>
35
36+ <target name="mono-3.5" depends="set-mono-3.5-runtime-config"
37+ description="Set runtime to Mono 3.5 for commands that follow"/>
38+
39 <!-- ***************************************************************** -->
40 <!-- *** Targets that clean directories *** -->
41 <!-- ***************************************************************** -->
42@@ -233,11 +242,11 @@
43
44 <property name="nunit.console.dir"
45 value="${nunit.dir}/bin/net-2.0"
46- if="${runtime.version=='2.0'}"/>
47+ if="${runtime.version>='2.0'}"/>
48
49 <property name="nunit.console.dir"
50 value="${nunit.dir}/bin/net-1.1"
51- unless="${runtime.version=='2.0'}"/>
52+ unless="${runtime.version>='2.0'}"/>
53
54 <property name="result.file"
55 value="TestResult-${nant.settings.currentframework}"/>
56@@ -316,11 +325,20 @@
57
58 </target>
59
60- <target name="gui-test" depends="build,init-test"
61- description="Run tests for a build using gui runner">
62+ <target name="gui-test" depends="build,run-gui-test"
63+ description="Run tests for a build using gui runner"/>
64+
65+ <target name="run-gui-test">
66+
67+ <call target="nunit-gui-test" unless="${runtime.platform=='netcf'}"/>
68+ <call target="nunitlite-gui-test"/>
69+
70+ </target>
71+
72+ <target name="nunit-gui-test" depends="init-test">
73
74 <echo message="*"/>
75- <echo message="* Starting ${runtime.config} ${build.config} gui test run"/>
76+ <echo message="* Testing the nunit.framework ${runtime.config} ${build.config} build"/>
77 <echo message="*"/>
78
79 <exec basedir="${nunit.dir}/bin/net-2.0"
80@@ -330,6 +348,19 @@
81
82 </target>
83
84+ <target name="nunitlite-gui-test" depends="init-test">
85+
86+ <echo message="*"/>
87+ <echo message="* Testing the NUnitite ${runtime.config} ${build.config} build"/>
88+ <echo message="*"/>
89+
90+ <exec basedir="${nunit.dir}/bin/net-2.0"
91+ workingdir="${current.build.dir}"
92+ program="nunit.exe"
93+ commandline="nunitlite.tests.exe -run"/>
94+
95+ </target>
96+
97 <!-- ***************************************************************** -->
98 <!-- * Build the NUnit samples - not part of normal build *** -->
99 <!-- ***************************************************************** -->
100
101=== modified file 'nunit.common.include'
102--- nunit.common.include 2009-09-15 17:41:09 +0000
103+++ nunit.common.include 2009-09-19 21:42:56 +0000
104@@ -188,8 +188,7 @@
105 <property name="runtime.platform" value="net"/>
106 <property name="runtime.version" value="1.0"/>
107 <property name="runtime.config" value="net-1.0"/>
108- <property name="runtime.defines" value="MSNET,NET_1_0"/>
109- <property name="runtime.testproj" value="NUnitTests.v1.nunit"/>
110+ <property name="runtime.defines" value="MSNET,NET_1_0,CLR_1_0"/>
111 <property name="nant.settings.currentframework" value="net-1.0"/>
112 </target>
113
114@@ -200,7 +199,7 @@
115 <property name="runtime.platform" value="net"/>
116 <property name="runtime.version" value="1.1"/>
117 <property name="runtime.config" value="net-1.1"/>
118- <property name="runtime.defines" value="MSNET,NET_1_1"/>
119+ <property name="runtime.defines" value="MSNET,NET_1_1,CLR_1_1"/>
120 <property name="nant.settings.currentframework" value="net-1.1"/>
121 </target>
122
123@@ -211,11 +210,10 @@
124 <property name="runtime.platform" value="net"/>
125 <property name="runtime.version" value="2.0"/>
126 <property name="runtime.config" value="net-2.0"/>
127- <property name="runtime.defines" value="MSNET,NET_2_0"/>
128+ <property name="runtime.defines" value="MSNET,NET_2_0,CLR_2_0"/>
129 <property name="nant.settings.currentframework" value="net-2.0"/>
130 </target>
131
132-<!--
133 <target name="set-net-3.0-runtime-config">
134 <fail unless="${framework::exists('net-3.0') and framework::sdk-exists('net-3.0')}"
135 message="The .NET 3.0 SDK is not configured or not installed"/>
136@@ -223,7 +221,7 @@
137 <property name="runtime.platform" value="net"/>
138 <property name="runtime.version" value="3.0"/>
139 <property name="runtime.config" value="net-3.0"/>
140- <property name="runtime.defines" value="MSNET,NET_3_0"/>
141+ <property name="runtime.defines" value="MSNET,NET_3_0,CLR_2_0"/>
142 <property name="nant.settings.currentframework" value="net-3.0"/>
143 </target>
144
145@@ -234,10 +232,9 @@
146 <property name="runtime.platform" value="net"/>
147 <property name="runtime.version" value="3.5"/>
148 <property name="runtime.config" value="net-3.5"/>
149- <property name="runtime.defines" value="MSNET,NET_3_5"/>
150+ <property name="runtime.defines" value="MSNET,NET_3_5,CLR_2_0"/>
151 <property name="nant.settings.currentframework" value="net-3.5"/>
152 </target>
153- -->
154
155 <target name="set-netcf-1.0-runtime-config">
156 <fail unless="${framework::exists('netcf-1.0') and framework::sdk-exists('netcf-1.0')}"
157@@ -257,10 +254,21 @@
158 <property name="runtime.platform" value="netcf"/>
159 <property name="runtime.version" value="2.0"/>
160 <property name="runtime.config" value="netcf-2.0"/>
161- <property name="runtime.defines" value="NETCF,NETCF_2_0"/>
162+ <property name="runtime.defines" value="NETCF,NETCF_2_0,CLR_2_0"/>
163 <property name="nant.settings.currentframework" value="netcf-2.0"/>
164 </target>
165
166+ <target name="set-netcf-3.5-runtime-config">
167+ <fail unless="${framework::exists('netcf-3.5') and framework::sdk-exists('netcf-3.5')}"
168+ message="The NETCF 3.5 SDK is not configured or not installed"/>
169+
170+ <property name="runtime.platform" value="netcf"/>
171+ <property name="runtime.version" value="3.5"/>
172+ <property name="runtime.config" value="netcf-3.5"/>
173+ <property name="runtime.defines" value="NETCF,NETCF_3_5,CLR_2_0"/>
174+ <property name="nant.settings.currentframework" value="netcf-3.5"/>
175+ </target>
176+
177 <target name="set-mono-1.0-runtime-config">
178 <fail unless="${framework::exists('mono-1.0') and framework::sdk-exists('mono-1.0')}"
179 message="The Mono 1.0 SDK is not configured or not installed"/>
180@@ -268,7 +276,7 @@
181 <property name="runtime.platform" value="mono"/>
182 <property name="runtime.version" value="1.0"/>
183 <property name="runtime.config" value="mono-1.0"/>
184- <property name="runtime.defines" value="MONO,NET_1_1"/>
185+ <property name="runtime.defines" value="MONO,MONO_1_0,CLR_1_1"/>
186 <property name="runtime.testproj" value="NUnitTests.v1.nunit"/>
187 <property name="nant.settings.currentframework" value="mono-1.0"/>
188 </target>
189@@ -280,11 +288,21 @@
190 <property name="runtime.platform" value="mono"/>
191 <property name="runtime.version" value="2.0"/>
192 <property name="runtime.config" value="mono-2.0"/>
193- <property name="runtime.defines" value="MONO,NET_2_0"/>
194- <property name="runtime.testproj" value="NUnitTests.v2.nunit"/>
195+ <property name="runtime.defines" value="MONO,MONO_2_0,CLR_2_0"/>
196 <property name="nant.settings.currentframework" value="mono-2.0"/>
197 </target>
198
199+ <target name="set-mono-3.5-runtime-config">
200+ <fail unless="${framework::exists('mono-3.5') and framework::sdk-exists('mono-3.5')}"
201+ message="The Mono 3.5 SDK is not configured or not installed"/>
202+
203+ <property name="runtime.platform" value="mono"/>
204+ <property name="runtime.version" value="3.5"/>
205+ <property name="runtime.config" value="mono-3.5"/>
206+ <property name="runtime.defines" value="MONO,MONO_3_5,CLR_2_0"/>
207+ <property name="nant.settings.currentframework" value="mono-3.5"/>
208+ </target>
209+
210 <!-- ***************************************************************** -->
211 <!-- *** Targets for setting the package configuration *** -->
212 <!-- ***************************************************************** -->
213
214=== modified file 'solutions/vs2005/framework/nunit.framework.csproj'
215--- solutions/vs2005/framework/nunit.framework.csproj 2009-09-11 21:12:38 +0000
216+++ solutions/vs2005/framework/nunit.framework.csproj 2009-09-18 00:52:27 +0000
217@@ -19,7 +19,7 @@
218 <DebugType>full</DebugType>
219 <Optimize>false</Optimize>
220 <OutputPath>..\bin\Debug\</OutputPath>
221- <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
222+ <DefineConstants>TRACE;DEBUG;NET_2_0;CLR_2_0</DefineConstants>
223 <ErrorReport>prompt</ErrorReport>
224 <WarningLevel>4</WarningLevel>
225 <DocumentationFile>..\bin\Debug\nunit.framework.XML</DocumentationFile>
226@@ -29,7 +29,7 @@
227 <DebugType>pdbonly</DebugType>
228 <Optimize>true</Optimize>
229 <OutputPath>..\bin\Release\</OutputPath>
230- <DefineConstants>TRACE</DefineConstants>
231+ <DefineConstants>TRACE;NET_2_0;CLR_2_0</DefineConstants>
232 <ErrorReport>prompt</ErrorReport>
233 <WarningLevel>4</WarningLevel>
234 </PropertyGroup>
235
236=== modified file 'solutions/vs2005/tests/nunit.framework.tests.csproj'
237--- solutions/vs2005/tests/nunit.framework.tests.csproj 2009-09-11 21:12:38 +0000
238+++ solutions/vs2005/tests/nunit.framework.tests.csproj 2009-09-18 00:52:27 +0000
239@@ -17,7 +17,7 @@
240 <DebugType>full</DebugType>
241 <Optimize>false</Optimize>
242 <OutputPath>..\bin\Debug\</OutputPath>
243- <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
244+ <DefineConstants>TRACE;DEBUG;NET_2_0;CLR_2_0</DefineConstants>
245 <ErrorReport>prompt</ErrorReport>
246 <WarningLevel>4</WarningLevel>
247 </PropertyGroup>
248@@ -25,7 +25,7 @@
249 <DebugType>pdbonly</DebugType>
250 <Optimize>true</Optimize>
251 <OutputPath>..\bin\Release\</OutputPath>
252- <DefineConstants>TRACE</DefineConstants>
253+ <DefineConstants>TRACE;NET_2_0;CLR_2_0</DefineConstants>
254 <ErrorReport>prompt</ErrorReport>
255 <WarningLevel>4</WarningLevel>
256 </PropertyGroup>
257
258=== modified file 'solutions/vs2005_CF/nunitlite.tests/nunitlite.tests.csproj'
259--- solutions/vs2005_CF/nunitlite.tests/nunitlite.tests.csproj 2009-09-19 02:55:26 +0000
260+++ solutions/vs2005_CF/nunitlite.tests/nunitlite.tests.csproj 2009-09-19 18:18:45 +0000
261@@ -22,7 +22,7 @@
262 <DebugType>full</DebugType>
263 <Optimize>false</Optimize>
264 <OutputPath>..\bin\Debug\</OutputPath>
265- <DefineConstants>TRACE;DEBUG;WindowsCE;NETCF;NUNITLITE</DefineConstants>
266+ <DefineConstants>TRACE;DEBUG;WindowsCE;NETCF;NETCF_2_0;CLR_2_0;NUNITLITE</DefineConstants>
267 <NoStdLib>true</NoStdLib>
268 <NoConfig>true</NoConfig>
269 <ErrorReport>prompt</ErrorReport>
270@@ -34,7 +34,7 @@
271 <DebugType>pdbonly</DebugType>
272 <Optimize>true</Optimize>
273 <OutputPath>..\bin\Release\</OutputPath>
274- <DefineConstants>TRACE;$(PlatformFamilyName)</DefineConstants>
275+ <DefineConstants>TRACE;WindowsCE;NETCF;NETCF_2_0;CLR_2_0;NUNITLITE</DefineConstants>
276 <NoStdLib>true</NoStdLib>
277 <NoConfig>true</NoConfig>
278 <ErrorReport>prompt</ErrorReport>
279
280=== modified file 'solutions/vs2005_CF/nunitlite/nunitlite.csproj'
281--- solutions/vs2005_CF/nunitlite/nunitlite.csproj 2009-09-19 02:55:26 +0000
282+++ solutions/vs2005_CF/nunitlite/nunitlite.csproj 2009-09-19 18:18:45 +0000
283@@ -22,7 +22,7 @@
284 <DebugType>full</DebugType>
285 <Optimize>false</Optimize>
286 <OutputPath>..\bin\Debug\</OutputPath>
287- <DefineConstants>TRACE;DEBUG;PocketPC;NETCF;NUNITLITE</DefineConstants>
288+ <DefineConstants>TRACE;DEBUG;WindowsCE;NETCF;NETCF_2_0;CLR_2_0;NUNITLITE</DefineConstants>
289 <NoStdLib>true</NoStdLib>
290 <NoConfig>true</NoConfig>
291 <ErrorReport>prompt</ErrorReport>
292@@ -35,7 +35,7 @@
293 <DebugType>pdbonly</DebugType>
294 <Optimize>true</Optimize>
295 <OutputPath>..\bin\Release\</OutputPath>
296- <DefineConstants>TRACE;PocketPC;NETCF;NUNITLITE</DefineConstants>
297+ <DefineConstants>TRACE;WindowsCE;NETCF;NETCF_2_0;CLR_2_0;NUNITLITE</DefineConstants>
298 <NoStdLib>true</NoStdLib>
299 <NoConfig>true</NoConfig>
300 <ErrorReport>prompt</ErrorReport>
301
302=== modified file 'solutions/vs2008/framework/nunit.framework.csproj'
303--- solutions/vs2008/framework/nunit.framework.csproj 2009-09-08 05:53:41 +0000
304+++ solutions/vs2008/framework/nunit.framework.csproj 2009-09-18 00:52:27 +0000
305@@ -10,7 +10,7 @@
306 <AppDesignerFolder>Properties</AppDesignerFolder>
307 <RootNamespace>NUnit</RootNamespace>
308 <AssemblyName>nunit.framework</AssemblyName>
309- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
310+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
311 <FileAlignment>512</FileAlignment>
312 <StartupObject>
313 </StartupObject>
314@@ -24,7 +24,7 @@
315 <DebugType>full</DebugType>
316 <Optimize>false</Optimize>
317 <OutputPath>..\bin\Debug\</OutputPath>
318- <DefineConstants>TRACE;DEBUG;NET_2_0;CSHARP_3_0</DefineConstants>
319+ <DefineConstants>NET_3_5;CLR_2_0</DefineConstants>
320 <ErrorReport>prompt</ErrorReport>
321 <WarningLevel>4</WarningLevel>
322 <DocumentationFile>..\bin\Debug\nunit.framework.XML</DocumentationFile>
323@@ -34,7 +34,7 @@
324 <DebugType>pdbonly</DebugType>
325 <Optimize>true</Optimize>
326 <OutputPath>..\bin\Release\</OutputPath>
327- <DefineConstants>TRACE;NET_2_0;CSHARP_3_0</DefineConstants>
328+ <DefineConstants>TRACE;NET_3_5;CLR_2_0</DefineConstants>
329 <ErrorReport>prompt</ErrorReport>
330 <WarningLevel>4</WarningLevel>
331 <DocumentationFile>..\bin\Release\nunit.framework.XML</DocumentationFile>
332@@ -342,6 +342,9 @@
333 </ItemGroup>
334 <ItemGroup>
335 <Reference Include="System" />
336+ <Reference Include="System.Core">
337+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
338+ </Reference>
339 <Reference Include="System.XML" />
340 </ItemGroup>
341 <ItemGroup>
342
343=== modified file 'solutions/vs2008/nunitlite.tests/nunitlite.tests.csproj'
344--- solutions/vs2008/nunitlite.tests/nunitlite.tests.csproj 2009-09-11 21:12:38 +0000
345+++ solutions/vs2008/nunitlite.tests/nunitlite.tests.csproj 2009-09-19 18:18:45 +0000
346@@ -22,7 +22,7 @@
347 <DebugType>full</DebugType>
348 <Optimize>false</Optimize>
349 <OutputPath>..\bin\Debug\</OutputPath>
350- <DefineConstants>TRACE;DEBUG;NET_2_0;CSHARP_3_0;NUNITLITE</DefineConstants>
351+ <DefineConstants>TRACE;DEBUG;NET_3_5;CLR_2_0;NUNITLITE</DefineConstants>
352 <ErrorReport>prompt</ErrorReport>
353 <WarningLevel>4</WarningLevel>
354 <DocumentationFile>
355@@ -32,7 +32,7 @@
356 <DebugType>pdbonly</DebugType>
357 <Optimize>true</Optimize>
358 <OutputPath>..\bin\Release\</OutputPath>
359- <DefineConstants>TRACE;NET_2_0;CSHARP_3_0;NUNITLITE</DefineConstants>
360+ <DefineConstants>TRACE;NET_3_5;CLR_2_0;NUNITLITE</DefineConstants>
361 <ErrorReport>prompt</ErrorReport>
362 <WarningLevel>4</WarningLevel>
363 <DocumentationFile>..\bin\Release\nunitlite.tests.XML</DocumentationFile>
364
365=== modified file 'solutions/vs2008/nunitlite/nunitlite.csproj'
366--- solutions/vs2008/nunitlite/nunitlite.csproj 2009-09-18 19:06:58 +0000
367+++ solutions/vs2008/nunitlite/nunitlite.csproj 2009-09-19 18:18:45 +0000
368@@ -20,7 +20,7 @@
369 <DebugType>full</DebugType>
370 <Optimize>false</Optimize>
371 <OutputPath>..\bin\Debug\</OutputPath>
372- <DefineConstants>TRACE;DEBUG;NET_2_0;CSHARP_3_0;NUNITLITE</DefineConstants>
373+ <DefineConstants>TRACE;DEBUG;NET_3_5;CLR_2_0;NUNITLITE</DefineConstants>
374 <ErrorReport>prompt</ErrorReport>
375 <WarningLevel>4</WarningLevel>
376 <DocumentationFile>..\bin\Debug\nunitlite.XML</DocumentationFile>
377@@ -29,7 +29,7 @@
378 <DebugType>pdbonly</DebugType>
379 <Optimize>true</Optimize>
380 <OutputPath>..\bin\Release\</OutputPath>
381- <DefineConstants>TRACE;NET_2_0;CSHARP_3_0;NUNITLITE</DefineConstants>
382+ <DefineConstants>TRACE;NET_3_5;CLR_2_0;NUNITLITE</DefineConstants>
383 <ErrorReport>prompt</ErrorReport>
384 <WarningLevel>4</WarningLevel>
385 <DocumentationFile>..\bin\Release\nunitlite.XML</DocumentationFile>
386
387=== modified file 'solutions/vs2008/tests/nunit.framework.tests.csproj'
388--- solutions/vs2008/tests/nunit.framework.tests.csproj 2009-09-11 21:12:38 +0000
389+++ solutions/vs2008/tests/nunit.framework.tests.csproj 2009-09-18 00:52:27 +0000
390@@ -10,7 +10,7 @@
391 <AppDesignerFolder>Properties</AppDesignerFolder>
392 <RootNamespace>NUnit.Framework.Tests</RootNamespace>
393 <AssemblyName>nunit.framework.tests</AssemblyName>
394- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
395+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
396 <FileAlignment>512</FileAlignment>
397 <StartupObject>
398 </StartupObject>
399@@ -22,7 +22,7 @@
400 <DebugType>full</DebugType>
401 <Optimize>false</Optimize>
402 <OutputPath>..\bin\Debug\</OutputPath>
403- <DefineConstants>TRACE;DEBUG;NET_2_0;CSHARP_3_0</DefineConstants>
404+ <DefineConstants>TRACE;DEBUG;NET_3_5;CLR_2_0</DefineConstants>
405 <ErrorReport>prompt</ErrorReport>
406 <WarningLevel>4</WarningLevel>
407 <DocumentationFile>
408@@ -32,7 +32,7 @@
409 <DebugType>pdbonly</DebugType>
410 <Optimize>true</Optimize>
411 <OutputPath>..\bin\Release\</OutputPath>
412- <DefineConstants>TRACE;NET_2_0;CSHARP_3_0</DefineConstants>
413+ <DefineConstants>TRACE;NET_3_5;CLR_2_0</DefineConstants>
414 <ErrorReport>prompt</ErrorReport>
415 <WarningLevel>4</WarningLevel>
416 <DocumentationFile>
417@@ -269,6 +269,9 @@
418 </ItemGroup>
419 <ItemGroup>
420 <Reference Include="System" />
421+ <Reference Include="System.Core">
422+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
423+ </Reference>
424 <Reference Include="System.Data" />
425 <Reference Include="System.Drawing" />
426 <Reference Include="System.XML" />
427
428=== modified file 'solutions/vs2008_CF/nunitlite.tests/nunitlite.tests.csproj'
429--- solutions/vs2008_CF/nunitlite.tests/nunitlite.tests.csproj 2009-09-19 02:55:26 +0000
430+++ solutions/vs2008_CF/nunitlite.tests/nunitlite.tests.csproj 2009-09-19 19:13:24 +0000
431@@ -14,7 +14,7 @@
432 <PlatformID>3C41C503-53EF-4c2a-8DD4-A8217CAD115E</PlatformID>
433 <OSVersion>4.20</OSVersion>
434 <DeployDirSuffix>nunitlite</DeployDirSuffix>
435- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
436+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
437 <NativePlatformName>Pocket PC 2003</NativePlatformName>
438 <FormFactorID>
439 </FormFactorID>
440@@ -24,7 +24,7 @@
441 <DebugType>full</DebugType>
442 <Optimize>false</Optimize>
443 <OutputPath>..\bin\Debug\</OutputPath>
444- <DefineConstants>TRACE;DEBUG;PocketPC;NETCF;NUNITLITE</DefineConstants>
445+ <DefineConstants>TRACE;DEBUG;PocketPC;NETCF;NETCF_3_5;CLR_2_0;NUNITLITE</DefineConstants>
446 <NoStdLib>true</NoStdLib>
447 <NoConfig>true</NoConfig>
448 <ErrorReport>prompt</ErrorReport>
449@@ -36,7 +36,7 @@
450 <DebugType>pdbonly</DebugType>
451 <Optimize>true</Optimize>
452 <OutputPath>..\bin\Release\</OutputPath>
453- <DefineConstants>TRACE;PocketPC;NETCF;NUNITLITE</DefineConstants>
454+ <DefineConstants>TRACE;PocketPC;NETCF;NETCF_3_5;CLR_2_0;NUNITLITE</DefineConstants>
455 <NoStdLib>true</NoStdLib>
456 <NoConfig>true</NoConfig>
457 <ErrorReport>prompt</ErrorReport>
458
459=== modified file 'solutions/vs2008_CF/nunitlite/nunitlite.csproj'
460--- solutions/vs2008_CF/nunitlite/nunitlite.csproj 2009-09-19 02:55:26 +0000
461+++ solutions/vs2008_CF/nunitlite/nunitlite.csproj 2009-09-19 19:13:24 +0000
462@@ -14,7 +14,7 @@
463 <PlatformID>3C41C503-53EF-4c2a-8DD4-A8217CAD115E</PlatformID>
464 <OSVersion>4.20</OSVersion>
465 <DeployDirSuffix>nuntlite</DeployDirSuffix>
466- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
467+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
468 <NativePlatformName>Pocket PC 2003</NativePlatformName>
469 <FormFactorID>
470 </FormFactorID>
471@@ -24,7 +24,7 @@
472 <DebugType>full</DebugType>
473 <Optimize>false</Optimize>
474 <OutputPath>..\bin\Debug\</OutputPath>
475- <DefineConstants>TRACE;DEBUG;PocketPC;NETCF;NUNITLITE</DefineConstants>
476+ <DefineConstants>TRACE;DEBUG;PocketPC;NETCF;NETCF_3_5;CLR_2_0;NUNITLITE</DefineConstants>
477 <NoStdLib>true</NoStdLib>
478 <NoConfig>true</NoConfig>
479 <ErrorReport>prompt</ErrorReport>
480@@ -37,7 +37,7 @@
481 <DebugType>pdbonly</DebugType>
482 <Optimize>true</Optimize>
483 <OutputPath>..\bin\Release\</OutputPath>
484- <DefineConstants>TRACE;$(PlatformFamilyName)</DefineConstants>
485+ <DefineConstants>TRACE;PocketPC;NETCF;NETCF_3_5;CLR_2_0;NUNITLITE</DefineConstants>
486 <NoStdLib>true</NoStdLib>
487 <NoConfig>true</NoConfig>
488 <ErrorReport>prompt</ErrorReport>
489
490=== modified file 'src/framework/NUnit/Framework/Assume.cs'
491--- src/framework/NUnit/Framework/Assume.cs 2009-09-06 20:54:07 +0000
492+++ src/framework/NUnit/Framework/Assume.cs 2009-09-18 00:52:27 +0000
493@@ -157,7 +157,7 @@
494 #endregion
495
496 #region ref Object
497-#if NET_2_0
498+#if CLR_2_0
499 /// <summary>
500 /// Apply a constraint to a referenced value, succeeding if the constraint
501 /// is satisfied and throwing an InconclusiveException on failure.
502
503=== modified file 'src/framework/NUnit/Framework/Constraints/DelayedConstraint.cs'
504--- src/framework/NUnit/Framework/Constraints/DelayedConstraint.cs 2009-09-06 20:54:07 +0000
505+++ src/framework/NUnit/Framework/Constraints/DelayedConstraint.cs 2009-09-18 00:52:27 +0000
506@@ -96,7 +96,7 @@
507 return baseConstraint.Matches(actual);
508 }
509
510-#if NET_2_0
511+#if CLR_2_0
512 /// <summary>
513 /// Test whether the constraint is satisfied by a given reference.
514 /// Overridden to wait for the specified delay period before
515
516=== modified file 'src/framework/NUnit/Framework/Constraints/PredicateConstraint.cs'
517--- src/framework/NUnit/Framework/Constraints/PredicateConstraint.cs 2009-09-06 20:54:07 +0000
518+++ src/framework/NUnit/Framework/Constraints/PredicateConstraint.cs 2009-09-18 00:52:27 +0000
519@@ -21,7 +21,7 @@
520 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
521 // ***********************************************************************
522
523-#if NET_2_0
524+#if CLR_2_0
525 using System;
526 using System.Collections.Generic;
527
528
529=== modified file 'src/framework/NUnitLite/Runner/MethodHelper.cs'
530--- src/framework/NUnitLite/Runner/MethodHelper.cs 2009-09-18 21:12:39 +0000
531+++ src/framework/NUnitLite/Runner/MethodHelper.cs 2009-09-19 18:18:45 +0000
532@@ -35,7 +35,7 @@
533 {
534 StringBuilder sb = new StringBuilder(method.Name);
535
536-#if NET_2_0
537+#if CLR_2_0
538 if (method.IsGenericMethod)
539 {
540 sb.Append("<");
541
542=== modified file 'src/framework/Shared/Framework/Assert.cs'
543--- src/framework/Shared/Framework/Assert.cs 2009-09-18 19:25:33 +0000
544+++ src/framework/Shared/Framework/Assert.cs 2009-09-18 21:19:09 +0000
545@@ -375,7 +375,7 @@
546 #endregion
547
548 #region ref Object
549-#if NET_2_0
550+#if CLR_2_0
551 /// <summary>
552 /// Apply a constraint to a referenced value, succeeding if the constraint
553 /// is satisfied and throwing an assertion exception on failure.
554@@ -598,7 +598,7 @@
555 #endregion
556
557 #region Throws<T>
558-#if NET_2_0
559+#if CLR_2_0
560 /// <summary>
561 /// Verifies that a delegate throws a particular exception when called.
562 /// </summary>
563@@ -706,7 +706,7 @@
564 #endregion
565
566 #region Catch<T>
567-#if NET_2_0
568+#if CLR_2_0
569 /// <summary>
570 /// Verifies that a delegate throws an exception of a certain Type
571 /// or one derived from it when called and returns it.
572@@ -1100,7 +1100,7 @@
573 Assert.That(aDouble, Is.NaN ,null, null);
574 }
575
576-#if NET_2_0
577+#if CLR_2_0
578 /// <summary>
579 /// Verifies that the double that is passed in is an <code>NaN</code> value.
580 /// If the object is not <code>NaN</code> then an <see cref="AssertionException"/>
581@@ -1383,7 +1383,7 @@
582 #region IsAssignableFrom<T>
583
584 #if !NUNITLITE
585-#if NET_2_0
586+#if CLR_2_0
587 /// <summary>
588 /// Asserts that an object may be assigned a value of a given Type.
589 /// </summary>
590@@ -1459,7 +1459,7 @@
591 #region IsNotAssignableFrom<T>
592
593 #if !NUNITLITE
594-#if NET_2_0
595+#if CLR_2_0
596 /// <summary>
597 /// Asserts that an object may not be assigned a value of a given Type.
598 /// </summary>
599@@ -1569,7 +1569,7 @@
600 #region IsInstanceOf<T>
601
602 #if !NUNITLITE
603-#if NET_2_0
604+#if CLR_2_0
605 /// <summary>
606 /// Asserts that an object is an instance of a given type.
607 /// </summary>
608@@ -1679,7 +1679,7 @@
609 #region IsNotInstanceOf<T>
610
611 #if !NUNITLITE
612-#if NET_2_0
613+#if CLR_2_0
614 /// <summary>
615 /// Asserts that an object is not an instance of a given type.
616 /// </summary>
617@@ -1943,7 +1943,7 @@
618 AssertDoublesAreEqual(expected, actual, delta ,null, null);
619 }
620
621-#if NET_2_0
622+#if CLR_2_0
623 /// <summary>
624 /// Verifies that two doubles are equal considering a delta. If the
625 /// expected value is infinity then the delta value is ignored. If
626
627=== modified file 'src/framework/Shared/Framework/AssertionHelper.cs'
628--- src/framework/Shared/Framework/AssertionHelper.cs 2009-09-06 20:54:07 +0000
629+++ src/framework/Shared/Framework/AssertionHelper.cs 2009-09-18 00:52:27 +0000
630@@ -127,7 +127,7 @@
631 #endregion
632
633 #region ref Object
634-#if NET_2_0
635+#if CLR_2_0
636 /// <summary>
637 /// Apply a constraint to a referenced value, succeeding if the constraint
638 /// is satisfied and throwing an assertion exception on failure.
639
640=== modified file 'src/framework/Shared/Framework/Constraints/CollectionConstraints.cs'
641--- src/framework/Shared/Framework/Constraints/CollectionConstraints.cs 2009-09-06 20:54:07 +0000
642+++ src/framework/Shared/Framework/Constraints/CollectionConstraints.cs 2009-09-18 00:52:27 +0000
643@@ -25,7 +25,7 @@
644 using System.Collections;
645 using System.Reflection;
646 using System.Text;
647-#if NET_2_0
648+#if CLR_2_0
649 using System.Collections.Generic;
650 #endif
651
652@@ -135,7 +135,7 @@
653 return this;
654 }
655
656-#if NET_2_0
657+#if CLR_2_0
658 /// <summary>
659 /// Flag the constraint to use the supplied IComparer object.
660 /// </summary>
661@@ -510,7 +510,7 @@
662 return this;
663 }
664
665-#if NET_2_0
666+#if CLR_2_0
667 /// <summary>
668 /// Modifies the constraint to use an IComparer&lt;T&gt; and returns self.
669 /// </summary>
670
671=== modified file 'src/framework/Shared/Framework/Constraints/ComparisonAdapter.cs'
672--- src/framework/Shared/Framework/Constraints/ComparisonAdapter.cs 2009-09-06 20:54:07 +0000
673+++ src/framework/Shared/Framework/Constraints/ComparisonAdapter.cs 2009-09-18 00:52:27 +0000
674@@ -24,7 +24,7 @@
675 using System;
676 using System.Collections;
677 using System.Reflection;
678-#if NET_2_0
679+#if CLR_2_0
680 using System.Collections.Generic;
681 #endif
682
683@@ -54,7 +54,7 @@
684 return new ComparerAdapter(comparer);
685 }
686
687-#if NET_2_0
688+#if CLR_2_0
689 /// <summary>
690 /// Returns a ComparisonAdapter that wraps an IComparer&lt;T&gt;
691 /// </summary>
692@@ -109,7 +109,7 @@
693 }
694 }
695
696-#if NET_2_0
697+#if CLR_2_0
698 /// <summary>
699 /// ComparisonAdapter&lt;T&gt; extends ComparisonAdapter and
700 /// allows use of an IComparer&lt;T&gt; or Comparison&lt;T&gt;
701
702=== modified file 'src/framework/Shared/Framework/Constraints/ComparisonConstraints.cs'
703--- src/framework/Shared/Framework/Constraints/ComparisonConstraints.cs 2009-09-06 20:54:07 +0000
704+++ src/framework/Shared/Framework/Constraints/ComparisonConstraints.cs 2009-09-18 00:52:27 +0000
705@@ -23,7 +23,7 @@
706
707 using System;
708 using System.Collections;
709-#if NET_2_0
710+#if CLR_2_0
711 using System.Collections.Generic;
712 #endif
713
714@@ -119,7 +119,7 @@
715 return this;
716 }
717
718-#if NET_2_0
719+#if CLR_2_0
720 /// <summary>
721 /// Modifies the constraint to use an IComparer&lt;T&gt; and returns self
722 /// </summary>
723
724=== modified file 'src/framework/Shared/Framework/Constraints/Constraint.cs'
725--- src/framework/Shared/Framework/Constraints/Constraint.cs 2009-09-06 20:54:07 +0000
726+++ src/framework/Shared/Framework/Constraints/Constraint.cs 2009-09-18 00:52:27 +0000
727@@ -186,7 +186,7 @@
728 return Matches(del());
729 }
730
731-#if NET_2_0
732+#if CLR_2_0
733 /// <summary>
734 /// Test whether the constraint is satisfied by a given reference.
735 /// The default implementation simply dereferences the value but
736
737=== modified file 'src/framework/Shared/Framework/Constraints/ConstraintBuilder.cs'
738--- src/framework/Shared/Framework/Constraints/ConstraintBuilder.cs 2009-09-06 20:54:07 +0000
739+++ src/framework/Shared/Framework/Constraints/ConstraintBuilder.cs 2009-09-18 00:52:27 +0000
740@@ -23,7 +23,7 @@
741
742 using System;
743 using System.Collections;
744-#if NET_2_0
745+#if CLR_2_0
746 using System.Collections.Generic;
747 #endif
748
749@@ -45,7 +45,7 @@
750 /// </summary>
751 public class OperatorStack
752 {
753-#if NET_2_0
754+#if CLR_2_0
755 private Stack<ConstraintOperator> stack = new Stack<ConstraintOperator>();
756 #else
757 private Stack stack = new Stack();
758@@ -102,7 +102,7 @@
759 /// </summary>
760 public class ConstraintStack
761 {
762-#if NET_2_0
763+#if CLR_2_0
764 private Stack<Constraint> stack = new Stack<Constraint>();
765 #else
766 private Stack stack = new Stack();
767
768=== modified file 'src/framework/Shared/Framework/Constraints/ConstraintExpression.cs'
769--- src/framework/Shared/Framework/Constraints/ConstraintExpression.cs 2009-09-17 20:45:00 +0000
770+++ src/framework/Shared/Framework/Constraints/ConstraintExpression.cs 2009-09-18 00:52:27 +0000
771@@ -200,7 +200,7 @@
772 return this.Append(new AttributeOperator(expectedType));
773 }
774
775-#if NET_2_0
776+#if CLR_2_0
777 /// <summary>
778 /// Returns a new AttributeConstraint checking for the
779 /// presence of a particular attribute on an object.
780@@ -237,7 +237,7 @@
781 return this.Append(constraint);
782 }
783
784-#if NET_2_0
785+#if CLR_2_0
786 /// <summary>
787 /// Returns the constraint provided as an argument - used to allow custom
788 /// custom constraints to easily participate in the syntax.
789@@ -457,7 +457,7 @@
790 return (ExactTypeConstraint)this.Append(new ExactTypeConstraint(expectedType));
791 }
792
793-#if NET_2_0
794+#if CLR_2_0
795 /// <summary>
796 /// Returns a constraint that tests whether the actual
797 /// value is of the exact type supplied as an argument.
798@@ -481,7 +481,7 @@
799 return (InstanceOfTypeConstraint)this.Append(new InstanceOfTypeConstraint(expectedType));
800 }
801
802-#if NET_2_0
803+#if CLR_2_0
804 /// <summary>
805 /// Returns a constraint that tests whether the actual value
806 /// is of the type supplied as an argument or a derived type.
807@@ -502,7 +502,7 @@
808 return (InstanceOfTypeConstraint)this.Append(new InstanceOfTypeConstraint(expectedType));
809 }
810
811-#if NET_2_0
812+#if CLR_2_0
813 /// <summary>
814 /// Returns a constraint that tests whether the actual value
815 /// is of the type supplied as an argument or a derived type.
816@@ -527,7 +527,7 @@
817 return (AssignableFromConstraint)this.Append(new AssignableFromConstraint(expectedType));
818 }
819
820-#if NET_2_0
821+#if CLR_2_0
822 /// <summary>
823 /// Returns a constraint that tests whether the actual value
824 /// is assignable from the type supplied as an argument.
825@@ -551,7 +551,7 @@
826 return (AssignableToConstraint)this.Append(new AssignableToConstraint(expectedType));
827 }
828
829-#if NET_2_0
830+#if CLR_2_0
831 /// <summary>
832 /// Returns a constraint that tests whether the actual value
833 /// is assignable from the type supplied as an argument.
834
835=== modified file 'src/framework/Shared/Framework/Constraints/ConstraintFactory.cs'
836--- src/framework/Shared/Framework/Constraints/ConstraintFactory.cs 2009-09-17 20:45:00 +0000
837+++ src/framework/Shared/Framework/Constraints/ConstraintFactory.cs 2009-09-18 00:52:27 +0000
838@@ -183,7 +183,7 @@
839 return Has.Attribute(expectedType);
840 }
841
842-#if NET_2_0
843+#if CLR_2_0
844 /// <summary>
845 /// Returns a new AttributeConstraint checking for the
846 /// presence of a particular attribute on an object.
847@@ -402,7 +402,7 @@
848 return new ExactTypeConstraint(expectedType);
849 }
850
851-#if NET_2_0
852+#if CLR_2_0
853 /// <summary>
854 /// Returns a constraint that tests whether the actual
855 /// value is of the exact type supplied as an argument.
856@@ -426,7 +426,7 @@
857 return new InstanceOfTypeConstraint(expectedType);
858 }
859
860-#if NET_2_0
861+#if CLR_2_0
862 /// <summary>
863 /// Returns a constraint that tests whether the actual value
864 /// is of the type supplied as an argument or a derived type.
865@@ -447,7 +447,7 @@
866 return new InstanceOfTypeConstraint(expectedType);
867 }
868
869-#if NET_2_0
870+#if CLR_2_0
871 /// <summary>
872 /// Returns a constraint that tests whether the actual value
873 /// is of the type supplied as an argument or a derived type.
874@@ -472,7 +472,7 @@
875 return new AssignableFromConstraint(expectedType);
876 }
877
878-#if NET_2_0
879+#if CLR_2_0
880 /// <summary>
881 /// Returns a constraint that tests whether the actual value
882 /// is assignable from the type supplied as an argument.
883@@ -496,7 +496,7 @@
884 return new AssignableToConstraint(expectedType);
885 }
886
887-#if NET_2_0
888+#if CLR_2_0
889 /// <summary>
890 /// Returns a constraint that tests whether the actual value
891 /// is assignable from the type supplied as an argument.
892
893=== modified file 'src/framework/Shared/Framework/Constraints/ConstraintOperators.cs'
894--- src/framework/Shared/Framework/Constraints/ConstraintOperators.cs 2009-09-06 20:54:07 +0000
895+++ src/framework/Shared/Framework/Constraints/ConstraintOperators.cs 2009-09-18 00:52:27 +0000
896@@ -23,7 +23,7 @@
897
898 using System;
899 using System.Collections;
900-#if NET_2_0
901+#if CLR_2_0
902 using System.Collections.Generic;
903 #endif
904
905
906=== modified file 'src/framework/Shared/Framework/Constraints/EqualConstraint.cs'
907--- src/framework/Shared/Framework/Constraints/EqualConstraint.cs 2009-09-06 20:54:07 +0000
908+++ src/framework/Shared/Framework/Constraints/EqualConstraint.cs 2009-09-18 00:52:27 +0000
909@@ -24,7 +24,7 @@
910 using System;
911 using System.IO;
912 using System.Collections;
913-#if NET_2_0
914+#if CLR_2_0
915 using System.Collections.Generic;
916 #endif
917
918@@ -275,7 +275,7 @@
919 return this;
920 }
921
922-#if NET_2_0
923+#if CLR_2_0
924 /// <summary>
925 /// Flag the constraint to use the supplied IComparer object.
926 /// </summary>
927
928=== modified file 'src/framework/Shared/Framework/Constraints/EqualityAdapter.cs'
929--- src/framework/Shared/Framework/Constraints/EqualityAdapter.cs 2009-09-06 20:54:07 +0000
930+++ src/framework/Shared/Framework/Constraints/EqualityAdapter.cs 2009-09-18 00:52:27 +0000
931@@ -23,7 +23,7 @@
932
933 using System;
934 using System.Collections;
935-#if NET_2_0
936+#if CLR_2_0
937 using System.Collections.Generic;
938 #endif
939
940@@ -49,7 +49,7 @@
941 return new ComparisonAdapterAdapter(ComparisonAdapter.For(comparer));
942 }
943
944-#if NET_2_0
945+#if CLR_2_0
946 /// <summary>
947 /// Returns an EqualityAdapter that wraps an IEqualityComparer.
948 /// </summary>
949
950=== modified file 'src/framework/Shared/Framework/Constraints/NUnitComparer.cs'
951--- src/framework/Shared/Framework/Constraints/NUnitComparer.cs 2009-09-06 20:54:07 +0000
952+++ src/framework/Shared/Framework/Constraints/NUnitComparer.cs 2009-09-18 00:52:27 +0000
953@@ -25,7 +25,7 @@
954 using System.IO;
955 using System.Reflection;
956 using System.Collections;
957-#if NET_2_0
958+#if CLR_2_0
959 using System.Collections.Generic;
960 #endif
961
962
963=== modified file 'src/framework/Shared/Framework/Constraints/NUnitEqualityComparer.cs'
964--- src/framework/Shared/Framework/Constraints/NUnitEqualityComparer.cs 2009-09-06 20:54:07 +0000
965+++ src/framework/Shared/Framework/Constraints/NUnitEqualityComparer.cs 2009-09-18 00:52:27 +0000
966@@ -24,7 +24,7 @@
967 using System;
968 using System.IO;
969 using System.Collections;
970-#if NET_2_0
971+#if CLR_2_0
972 using System.Collections.Generic;
973 #endif
974
975
976=== modified file 'src/framework/Shared/Framework/Constraints/RangeConstraint.cs'
977--- src/framework/Shared/Framework/Constraints/RangeConstraint.cs 2009-09-06 20:54:07 +0000
978+++ src/framework/Shared/Framework/Constraints/RangeConstraint.cs 2009-09-18 00:52:27 +0000
979@@ -23,7 +23,7 @@
980
981 using System;
982 using System.Collections;
983-#if NET_2_0
984+#if CLR_2_0
985 using System.Collections.Generic;
986 #endif
987
988@@ -86,7 +86,7 @@
989 return this;
990 }
991
992-#if NET_2_0
993+#if CLR_2_0
994 /// <summary>
995 /// Modifies the constraint to use an IComparer&lt;T&gt; and returns self.
996 /// </summary>
997
998=== modified file 'src/framework/Shared/Framework/Constraints/ThrowsConstraint.cs'
999--- src/framework/Shared/Framework/Constraints/ThrowsConstraint.cs 2009-09-06 20:54:07 +0000
1000+++ src/framework/Shared/Framework/Constraints/ThrowsConstraint.cs 2009-09-18 00:52:27 +0000
1001@@ -82,7 +82,7 @@
1002 return baseConstraint == null || baseConstraint.Matches(caughtException);
1003 }
1004
1005-#if NET_2_0
1006+#if CLR_2_0
1007 /// <summary>
1008 /// Converts an ActualValueDelegate to a TestDelegate
1009 /// before calling the primary overload.
1010
1011=== modified file 'src/framework/Shared/Framework/Has.cs'
1012--- src/framework/Shared/Framework/Has.cs 2009-09-06 20:54:07 +0000
1013+++ src/framework/Shared/Framework/Has.cs 2009-09-18 00:52:27 +0000
1014@@ -175,7 +175,7 @@
1015 return new ConstraintExpression().Attribute(expectedType);
1016 }
1017
1018-#if NET_2_0
1019+#if CLR_2_0
1020 /// <summary>
1021 /// Returns a new AttributeConstraint checking for the
1022 /// presence of a particular attribute on an object.
1023
1024=== modified file 'src/framework/Shared/Framework/Is.cs'
1025--- src/framework/Shared/Framework/Is.cs 2009-09-17 20:45:00 +0000
1026+++ src/framework/Shared/Framework/Is.cs 2009-09-18 00:52:27 +0000
1027@@ -274,7 +274,7 @@
1028 return new ExactTypeConstraint(expectedType);
1029 }
1030
1031-#if NET_2_0
1032+#if CLR_2_0
1033 /// <summary>
1034 /// Returns a constraint that tests whether the actual
1035 /// value is of the exact type supplied as an argument.
1036@@ -298,7 +298,7 @@
1037 return new InstanceOfTypeConstraint(expectedType);
1038 }
1039
1040-#if NET_2_0
1041+#if CLR_2_0
1042 /// <summary>
1043 /// Returns a constraint that tests whether the actual value
1044 /// is of the type supplied as an argument or a derived type.
1045@@ -319,7 +319,7 @@
1046 return new InstanceOfTypeConstraint(expectedType);
1047 }
1048
1049-#if NET_2_0
1050+#if CLR_2_0
1051 /// <summary>
1052 /// Returns a constraint that tests whether the actual value
1053 /// is of the type supplied as an argument or a derived type.
1054@@ -344,7 +344,7 @@
1055 return new AssignableFromConstraint(expectedType);
1056 }
1057
1058-#if NET_2_0
1059+#if CLR_2_0
1060 /// <summary>
1061 /// Returns a constraint that tests whether the actual value
1062 /// is assignable from the type supplied as an argument.
1063@@ -368,7 +368,7 @@
1064 return new AssignableToConstraint(expectedType);
1065 }
1066
1067-#if NET_2_0
1068+#if CLR_2_0
1069 /// <summary>
1070 /// Returns a constraint that tests whether the actual value
1071 /// is assignable from the type supplied as an argument.
1072
1073=== modified file 'src/framework/Shared/Framework/TestFixtureAttribute.cs'
1074--- src/framework/Shared/Framework/TestFixtureAttribute.cs 2009-09-06 20:54:07 +0000
1075+++ src/framework/Shared/Framework/TestFixtureAttribute.cs 2009-09-18 00:52:27 +0000
1076@@ -39,7 +39,7 @@
1077 private bool isIgnored;
1078 private string ignoreReason;
1079
1080-#if NET_2_0
1081+#if CLR_2_0
1082 private Type[] typeArgs;
1083 private bool argsSeparated;
1084 #endif
1085@@ -78,7 +78,7 @@
1086 {
1087 get
1088 {
1089-#if NET_2_0
1090+#if CLR_2_0
1091 if (!argsSeparated)
1092 SeparateArgs();
1093 #endif
1094@@ -110,7 +110,7 @@
1095 }
1096 }
1097
1098-#if NET_2_0
1099+#if CLR_2_0
1100 /// <summary>
1101 /// Get or set the type arguments. If not set
1102 /// explicitly, any leading arguments that are
1103
1104=== modified file 'src/framework/Shared/Framework/Throws.cs'
1105--- src/framework/Shared/Framework/Throws.cs 2009-09-06 20:54:07 +0000
1106+++ src/framework/Shared/Framework/Throws.cs 2009-09-18 00:52:27 +0000
1107@@ -131,7 +131,7 @@
1108 return Exception.TypeOf(expectedType);
1109 }
1110
1111-#if NET_2_0
1112+#if CLR_2_0
1113 /// <summary>
1114 /// Creates a constraint specifying the exact type of exception expected
1115 /// </summary>
1116@@ -153,7 +153,7 @@
1117 return Exception.InstanceOf(expectedType);
1118 }
1119
1120-#if NET_2_0
1121+#if CLR_2_0
1122 /// <summary>
1123 /// Creates a constraint specifying the type of exception expected
1124 /// </summary>
1125
1126=== modified file 'src/tests/NUnit/Framework/AssertThrowsTests.cs'
1127--- src/tests/NUnit/Framework/AssertThrowsTests.cs 2009-09-07 17:36:10 +0000
1128+++ src/tests/NUnit/Framework/AssertThrowsTests.cs 2009-09-18 00:52:27 +0000
1129@@ -31,7 +31,7 @@
1130 [Test]
1131 public void CorrectExceptionThrown()
1132 {
1133-#if NET_2_0
1134+#if CLR_2_0
1135 Assert.Throws(typeof(ArgumentException), TestDelegates.ThrowsArgumentException);
1136 Assert.Throws(typeof(ArgumentException),
1137 delegate { throw new ArgumentException(); });
1138@@ -61,7 +61,7 @@
1139 Assert.That(ex.Message, Is.StringStarting("myMessage"));
1140 Assert.That(ex.ParamName, Is.EqualTo("myParam"));
1141
1142-#if NET_2_0
1143+#if CLR_2_0
1144 ex = Assert.Throws<ArgumentException>(
1145 delegate { throw new ArgumentException("myMessage", "myParam"); }) as ArgumentException;
1146
1147@@ -90,7 +90,7 @@
1148 expectedMessage =
1149 " Expected: <System.ArgumentException>" + Environment.NewLine +
1150 " But was: null" + Environment.NewLine;
1151-#if NET_2_0
1152+#if CLR_2_0
1153 Assert.Throws<ArgumentException>(TestDelegates.ThrowsNothing);
1154 #else
1155 Assert.Throws( typeof(ArgumentException),
1156@@ -104,7 +104,7 @@
1157 expectedMessage =
1158 " Expected: <System.ArgumentException>" + Environment.NewLine +
1159 " But was: <System.ApplicationException>" + Environment.NewLine;
1160-#if NET_2_0
1161+#if CLR_2_0
1162 Assert.Throws<ArgumentException>(TestDelegates.ThrowsApplicationException);
1163 #else
1164 Assert.Throws( typeof(ArgumentException),
1165@@ -118,7 +118,7 @@
1166 expectedMessage =
1167 " Expected: <System.ArgumentException>" + Environment.NewLine +
1168 " But was: <System.Exception>" + Environment.NewLine;
1169-#if NET_2_0
1170+#if CLR_2_0
1171 Assert.Throws<ArgumentException>(TestDelegates.ThrowsSystemException);
1172 #else
1173 Assert.Throws( typeof(ArgumentException),
1174@@ -132,7 +132,7 @@
1175 expectedMessage =
1176 " Expected: <System.Exception>" + Environment.NewLine +
1177 " But was: <System.ArgumentException>" + Environment.NewLine;
1178-#if NET_2_0
1179+#if CLR_2_0
1180 Assert.Throws<Exception>(TestDelegates.ThrowsArgumentException);
1181 #else
1182 Assert.Throws( typeof(Exception),
1183@@ -143,7 +143,7 @@
1184 [Test]
1185 public void DoesNotThrowSuceeds()
1186 {
1187-#if NET_2_0
1188+#if CLR_2_0
1189 Assert.DoesNotThrow(TestDelegates.ThrowsNothing);
1190 #else
1191 Assert.DoesNotThrow( new TestDelegate( TestDelegates.ThrowsNothing ) );
1192@@ -155,7 +155,7 @@
1193 [Test, ExpectedException(typeof(AssertionException))]
1194 public void DoesNotThrowFails()
1195 {
1196-#if NET_2_0
1197+#if CLR_2_0
1198 Assert.DoesNotThrow(TestDelegates.ThrowsArgumentException);
1199 #else
1200 Assert.DoesNotThrow( new TestDelegate( TestDelegates.ThrowsArgumentException ) );
1201
1202=== modified file 'src/tests/NUnit/Framework/CollectionAssertTest.cs'
1203--- src/tests/NUnit/Framework/CollectionAssertTest.cs 2009-09-07 17:36:10 +0000
1204+++ src/tests/NUnit/Framework/CollectionAssertTest.cs 2009-09-18 00:52:27 +0000
1205@@ -212,7 +212,7 @@
1206 CollectionAssert.AreEqual(array1, array2, new AlwaysEqualComparer());
1207 }
1208
1209-#if NET_2_0
1210+#if CLR_2_0
1211 [Test]
1212 public void AreEqual_UsingIterator()
1213 {
1214
1215=== modified file 'src/tests/NUnit/Framework/EqualsFixture.cs'
1216--- src/tests/NUnit/Framework/EqualsFixture.cs 2009-09-07 17:36:10 +0000
1217+++ src/tests/NUnit/Framework/EqualsFixture.cs 2009-09-18 00:52:27 +0000
1218@@ -304,7 +304,7 @@
1219 Assert.AreEqual( 35, i21 );
1220 Assert.AreEqual( 35, i22 );
1221
1222-#if NET_2_0
1223+#if CLR_2_0
1224 byte? b23 = 35;
1225 sbyte? sb24 = 35;
1226 decimal? d25 = 35;
1227
1228=== modified file 'src/tests/NUnit/Framework/NullableTypesTests.cs'
1229--- src/tests/NUnit/Framework/NullableTypesTests.cs 2009-09-07 17:36:10 +0000
1230+++ src/tests/NUnit/Framework/NullableTypesTests.cs 2009-09-18 00:52:27 +0000
1231@@ -25,7 +25,7 @@
1232
1233 namespace NUnit.Framework.Tests
1234 {
1235-#if NET_2_0 && !MONO
1236+#if CLR_2_0 && !MONO
1237 [TestFixture, Category("Generics")]
1238 public class NullableTypesTests
1239 {
1240
1241=== modified file 'src/tests/NUnit/Framework/Syntax/AfterTests.cs'
1242--- src/tests/NUnit/Framework/Syntax/AfterTests.cs 2009-09-07 17:36:10 +0000
1243+++ src/tests/NUnit/Framework/Syntax/AfterTests.cs 2009-09-18 00:52:27 +0000
1244@@ -63,7 +63,7 @@
1245 }
1246 }
1247
1248-#if NET_2_0
1249+#if CLR_2_0
1250 public abstract class AfterSyntaxTests
1251 {
1252 protected bool flag;
1253
1254=== modified file 'src/tests/NUnit/Framework/Syntax/ArbitraryConstraintMatching.cs'
1255--- src/tests/NUnit/Framework/Syntax/ArbitraryConstraintMatching.cs 2009-09-07 17:36:10 +0000
1256+++ src/tests/NUnit/Framework/Syntax/ArbitraryConstraintMatching.cs 2009-09-18 00:52:27 +0000
1257@@ -53,7 +53,7 @@
1258 Assert.That(constraint.Resolve().ToString(), Is.EqualTo("<all <and <custom> <another>>>"));
1259 }
1260
1261-#if NET_2_0
1262+#if CLR_2_0
1263 [Test]
1264 public void CanMatchPredicate()
1265 {
1266@@ -67,7 +67,7 @@
1267 return (num & 1) == 0;
1268 }
1269
1270-#if CSHARP_3_0
1271+#if NET_3_5 || MONO_3_5
1272 [Test]
1273 public void CanMatchLambda()
1274 {
1275
1276=== modified file 'src/tests/NUnit/Framework/Syntax/InvalidCodeTests.cs'
1277--- src/tests/NUnit/Framework/Syntax/InvalidCodeTests.cs 2009-09-07 17:36:10 +0000
1278+++ src/tests/NUnit/Framework/Syntax/InvalidCodeTests.cs 2009-09-18 00:52:27 +0000
1279@@ -25,7 +25,7 @@
1280 using System.Collections;
1281 using System.CodeDom.Compiler;
1282 using NUnit.Framework.Constraints;
1283-#if NET_2_0
1284+#if CLR_2_0
1285 using System.Collections.Generic;
1286 #endif
1287
1288
1289=== modified file 'src/tests/NUnit/Framework/Syntax/TestCompiler.cs'
1290--- src/tests/NUnit/Framework/Syntax/TestCompiler.cs 2009-09-07 17:36:10 +0000
1291+++ src/tests/NUnit/Framework/Syntax/TestCompiler.cs 2009-09-18 00:52:27 +0000
1292@@ -29,7 +29,7 @@
1293 class TestCompiler
1294 {
1295 Microsoft.CSharp.CSharpCodeProvider provider;
1296-#if !NET_2_0
1297+#if !CLR_2_0
1298 ICodeCompiler compiler;
1299 #endif
1300 CompilerParameters options;
1301@@ -41,7 +41,7 @@
1302 public TestCompiler( string[] assemblyNames, string outputName )
1303 {
1304 this.provider = new Microsoft.CSharp.CSharpCodeProvider();
1305-#if !NET_2_0
1306+#if !CLR_2_0
1307 this.compiler = provider.CreateCompiler();
1308 #endif
1309 this.options = new CompilerParameters();
1310@@ -63,7 +63,7 @@
1311
1312 public CompilerResults CompileCode( string code )
1313 {
1314-#if NET_2_0
1315+#if CLR_2_0
1316 return provider.CompileAssemblyFromSource( options, code );
1317 #else
1318 return compiler.CompileAssemblyFromSource(options, code);
1319
1320=== modified file 'src/tests/NUnit/Framework/TypeAssertTest.cs'
1321--- src/tests/NUnit/Framework/TypeAssertTest.cs 2009-09-07 17:36:10 +0000
1322+++ src/tests/NUnit/Framework/TypeAssertTest.cs 2009-09-18 00:52:27 +0000
1323@@ -51,7 +51,7 @@
1324
1325 Assert.IsInstanceOf(typeof(System.Exception), ex );
1326 Assert.That( ex, Is.InstanceOf(typeof(Exception)));
1327-#if NET_2_0
1328+#if CLR_2_0
1329 Assert.IsInstanceOf<Exception>( ex );
1330 #endif
1331 }
1332@@ -70,7 +70,7 @@
1333 {
1334 Assert.IsNotInstanceOf(typeof(System.Int32), "abc123" );
1335 Assert.That( "abc123", Is.Not.InstanceOf(typeof(System.Int32)) );
1336-#if NET_2_0
1337+#if CLR_2_0
1338 Assert.IsNotInstanceOf<System.Int32>("abc123");
1339 #endif
1340 }
1341@@ -91,7 +91,7 @@
1342
1343 Assert.IsAssignableFrom(typeof(int[]), array10);
1344 Assert.That(array10, Is.AssignableFrom(typeof(int[])));
1345-#if NET_2_0
1346+#if CLR_2_0
1347 Assert.IsAssignableFrom<int[]>(array10);
1348 #endif
1349 }
1350@@ -115,7 +115,7 @@
1351
1352 Assert.IsNotAssignableFrom( typeof(int[,] ),array10);
1353 Assert.That( array10, Is.Not.AssignableFrom( typeof(int[,] ) ) );
1354-#if NET_2_0
1355+#if CLR_2_0
1356 Assert.IsNotAssignableFrom<int[,]>(array10);
1357 #endif
1358 }
1359
1360=== modified file 'src/tests/Shared/Framework/Constraints/CollectionConstraintTests.cs'
1361--- src/tests/Shared/Framework/Constraints/CollectionConstraintTests.cs 2009-09-11 21:12:38 +0000
1362+++ src/tests/Shared/Framework/Constraints/CollectionConstraintTests.cs 2009-09-19 19:13:56 +0000
1363@@ -23,7 +23,7 @@
1364
1365 using System;
1366 using System.Collections;
1367-#if NET_2_0
1368+#if CLR_2_0
1369 using System.Collections.Generic;
1370 #endif
1371 using NUnit.Framework.Tests;
1372@@ -65,7 +65,7 @@
1373 Assert.That(c, new AllItemsConstraint(new RangeConstraint(10, 100).Using(Comparer.Default)));
1374 }
1375
1376-#if NET_2_0
1377+#if CLR_2_0
1378 [Test]
1379 public void AllItemsAreInRange_UsingIComparerOfT()
1380 {
1381@@ -157,7 +157,7 @@
1382 Assert.That(new string[] { "Hello", "World" },
1383 new CollectionContainsConstraint("WORLD").IgnoreCase);
1384 }
1385-#if CSHARP_3_0
1386+#if NET_3_5 || MONO_3_5 || NETCF_3_5
1387 [Test]
1388 public void UsingIsHonored()
1389 {
1390@@ -243,7 +243,7 @@
1391 Assert.That(new CollectionEquivalentConstraint(set1).IgnoreCase.Matches(set2));
1392 }
1393
1394-#if CSHARP_3_0
1395+#if NET_3_5 || MONO_3_5 || NETCF_3_5
1396 [Test]
1397 public void EquivalentHonorsUsing()
1398 {
1399@@ -389,7 +389,7 @@
1400 Assert.That(comparer.Called, "TestComparer was not called");
1401 }
1402
1403-#if NET_2_0
1404+#if CLR_2_0
1405 [Test]
1406 public void UsesProvidedComparerOfT()
1407 {
1408@@ -436,7 +436,7 @@
1409 }
1410 }
1411
1412-#if CSHARP_3_0
1413+#if NET_3_5 || MONO_3_5 || NETCF_3_5
1414 [Test]
1415 public void UsesProvidedLambda()
1416 {
1417
1418=== modified file 'src/tests/Shared/Framework/Constraints/ComparerTests.cs'
1419--- src/tests/Shared/Framework/Constraints/ComparerTests.cs 2009-09-06 16:12:27 +0000
1420+++ src/tests/Shared/Framework/Constraints/ComparerTests.cs 2009-09-18 00:52:27 +0000
1421@@ -38,7 +38,7 @@
1422 [TestCase(4.0f, 4)]
1423 [TestCase(4.0f, 4.0d)]
1424 [TestCase(SpecialValue.Null, SpecialValue.Null)]
1425-#if NET_2_0
1426+#if CLR_2_0
1427 [TestCase(null, null)]
1428 #endif
1429 public void EqualItems(object x, object y)
1430@@ -59,7 +59,7 @@
1431 #if !NUNITLITE
1432 [TestCase(4, SpecialValue.Null)]
1433 #endif
1434-#if NET_2_0
1435+#if CLR_2_0
1436 [TestCase(4, null)]
1437 #endif
1438 public void UnequalItems(object greater, object lesser)
1439
1440=== modified file 'src/tests/Shared/Framework/Constraints/ComparisonConstraintTests.cs'
1441--- src/tests/Shared/Framework/Constraints/ComparisonConstraintTests.cs 2009-09-06 16:12:27 +0000
1442+++ src/tests/Shared/Framework/Constraints/ComparisonConstraintTests.cs 2009-09-19 19:13:56 +0000
1443@@ -23,7 +23,7 @@
1444
1445 using System;
1446 using System.Collections;
1447-#if NET_2_0
1448+#if CLR_2_0
1449 using System.Collections.Generic;
1450 #endif
1451
1452@@ -53,7 +53,7 @@
1453 }
1454 }
1455
1456-#if NET_2_0
1457+#if CLR_2_0
1458 [Test]
1459 public void UsesProvidedComparerOfT()
1460 {
1461@@ -92,7 +92,7 @@
1462 }
1463 }
1464
1465-#if CSHARP_3_0
1466+#if NET_3_5 || MONO_3_5 || NETCF_3_5
1467 [Test]
1468 public void UsesProvidedLambda()
1469 {
1470@@ -130,7 +130,7 @@
1471 Assert.That(actual, Is.GreaterThan(expected));
1472 }
1473
1474-#if NET_2_0
1475+#if CLR_2_0
1476 [Test]
1477 public void CanCompareIComparablesOfT()
1478 {
1479@@ -168,7 +168,7 @@
1480 Assert.That(actual, Is.GreaterThanOrEqualTo(expected));
1481 }
1482
1483-#if NET_2_0
1484+#if CLR_2_0
1485 [Test]
1486 public void CanCompareIComparablesOfT()
1487 {
1488@@ -206,7 +206,7 @@
1489 Assert.That(actual, Is.LessThan(expected));
1490 }
1491
1492-#if NET_2_0
1493+#if CLR_2_0
1494 [Test]
1495 public void CanCompareIComparablesOfT()
1496 {
1497@@ -244,7 +244,7 @@
1498 Assert.That(actual, Is.LessThanOrEqualTo(expected));
1499 }
1500
1501-#if NET_2_0
1502+#if CLR_2_0
1503 [Test]
1504 public void CanCompareIComparablesOfT()
1505 {
1506@@ -295,7 +295,7 @@
1507 }
1508 }
1509
1510-#if NET_2_0
1511+#if CLR_2_0
1512 [Test]
1513 public void UsesProvidedComparerOfT()
1514 {
1515@@ -334,7 +334,7 @@
1516 }
1517 }
1518
1519-#if CSHARP_3_0
1520+#if NET_3_5 || MONO_3_5 || NETCF_3_5
1521 [Test]
1522 public void UsesProvidedLambda()
1523 {
1524@@ -366,7 +366,7 @@
1525 }
1526 }
1527
1528-#if NET_2_0
1529+#if CLR_2_0
1530 class ClassWithIComparableOfT : IComparable<ClassWithIComparableOfT>
1531 {
1532 private int val;
1533
1534=== modified file 'src/tests/Shared/Framework/Constraints/EmptyConstraintTest.cs'
1535--- src/tests/Shared/Framework/Constraints/EmptyConstraintTest.cs 2009-09-06 16:12:27 +0000
1536+++ src/tests/Shared/Framework/Constraints/EmptyConstraintTest.cs 2009-09-18 00:52:27 +0000
1537@@ -42,7 +42,7 @@
1538 string.Empty,
1539 new object[0],
1540 new ArrayList(),
1541-#if NET_2_0
1542+#if CLR_2_0
1543 new System.Collections.Generic.List<int>()
1544 #endif
1545 };
1546
1547=== modified file 'src/tests/Shared/Framework/Constraints/EqualTest.cs'
1548--- src/tests/Shared/Framework/Constraints/EqualTest.cs 2009-09-11 21:12:38 +0000
1549+++ src/tests/Shared/Framework/Constraints/EqualTest.cs 2009-09-19 19:13:56 +0000
1550@@ -25,7 +25,7 @@
1551 using System.IO;
1552 using System.Drawing;
1553 using System.Collections;
1554-#if NET_2_0
1555+#if CLR_2_0
1556 using System.Collections.Generic;
1557 #endif
1558
1559@@ -295,7 +295,7 @@
1560 }
1561 }
1562
1563-#if NET_2_0
1564+#if CLR_2_0
1565 [Test]
1566 public void UsesProvidedEqualityComparer()
1567 {
1568@@ -382,7 +382,7 @@
1569 }
1570 }
1571
1572-#if CSHARP_3_0
1573+#if NET_3_5 || MONO_3_5 || NETCF_3_5
1574 [Test]
1575 public void UsesProvidedLambda_IntArgs()
1576 {
1577@@ -497,7 +497,7 @@
1578 }
1579 }
1580
1581-#if NET_2_0
1582+#if CLR_2_0
1583 [Test]
1584 public void TestPropertyWithPrivateSetter()
1585 {
1586
1587=== modified file 'src/tests/Shared/Framework/Constraints/MsgUtilTests.cs'
1588--- src/tests/Shared/Framework/Constraints/MsgUtilTests.cs 2009-09-18 20:31:35 +0000
1589+++ src/tests/Shared/Framework/Constraints/MsgUtilTests.cs 2009-09-18 21:19:09 +0000
1590@@ -41,7 +41,7 @@
1591 [TestCase("\n\r", "\\n\\r")]
1592 [TestCase("This is a\rtest message", "This is a\\rtest message")]
1593 [TestCase("", "")]
1594-#if NET_2_0
1595+#if CLR_2_0
1596 [TestCase(null, null)]
1597 #endif
1598 [TestCase("\t", "\\t")]
1599
1600=== modified file 'src/tests/Shared/Framework/Constraints/XmlSerializableTest.cs'
1601--- src/tests/Shared/Framework/Constraints/XmlSerializableTest.cs 2009-09-11 21:12:38 +0000
1602+++ src/tests/Shared/Framework/Constraints/XmlSerializableTest.cs 2009-09-19 18:18:45 +0000
1603@@ -25,7 +25,7 @@
1604
1605 using System;
1606 using System.Collections;
1607-#if NET_2_0
1608+#if CLR_2_0
1609 using System.Collections.Generic;
1610 #endif
1611
1612@@ -44,7 +44,7 @@
1613
1614 object[] SuccessData = new object[] { 1, "a", new ArrayList() };
1615
1616-#if NET_2_0
1617+#if CLR_2_0
1618 object[] FailureData = new object[] {
1619 new TestCaseData( new Dictionary<string, string>(), "<Dictionary`2>" ),
1620 new TestCaseData( new InternalClass(), "<InternalClass>" ),
1621
1622=== modified file 'src/tests/Shared/Framework/Syntax/CollectionTests.cs'
1623--- src/tests/Shared/Framework/Syntax/CollectionTests.cs 2009-07-16 20:05:38 +0000
1624+++ src/tests/Shared/Framework/Syntax/CollectionTests.cs 2009-09-17 23:53:44 +0000
1625@@ -23,7 +23,7 @@
1626
1627 using System;
1628 using System.Collections;
1629-#if NET_2_0
1630+#if CLR_2_0
1631 using System.Collections.Generic;
1632 #endif
1633
1634
1635=== modified file 'src/tests/Shared/Framework/Syntax/EqualityTests.cs'
1636--- src/tests/Shared/Framework/Syntax/EqualityTests.cs 2009-07-16 20:05:38 +0000
1637+++ src/tests/Shared/Framework/Syntax/EqualityTests.cs 2009-09-17 23:53:44 +0000
1638@@ -22,7 +22,7 @@
1639 // ***********************************************************************
1640
1641 using System;
1642-#if NET_2_0
1643+#if CLR_2_0
1644 using System.Collections.Generic;
1645 #endif
1646
1647@@ -79,7 +79,7 @@
1648 Assert.That(i3, Is.EqualTo(d3));
1649 Assert.That(2 + 2, Is.Not.EqualTo(5));
1650 Assert.That(i3, Is.Not.EqualTo(iunequal));
1651-#if NET_2_0
1652+#if CLR_2_0
1653 List<string> list = new List<string>();
1654 list.Add("foo");
1655 list.Add("bar");
1656
1657=== modified file 'src/tests/Shared/Framework/Syntax/ThrowsTests.cs'
1658--- src/tests/Shared/Framework/Syntax/ThrowsTests.cs 2009-07-16 20:05:38 +0000
1659+++ src/tests/Shared/Framework/Syntax/ThrowsTests.cs 2009-09-19 19:13:56 +0000
1660@@ -110,8 +110,8 @@
1661 expr.Resolve().ToString());
1662 }
1663
1664-#if NET_2_0
1665-#if CSHARP_3_0
1666+#if CLR_2_0
1667+#if NET_3_5 || MONO_3_5 || NETCF_3_5
1668 [Test]
1669 public void DelegateThrowsException()
1670 {
1671@@ -128,6 +128,7 @@
1672 Throws.InstanceOf<ArgumentNullException>());
1673 }
1674
1675+#if !NETCF
1676 [Test]
1677 public void LambdaThrowsExceptionWithMessage()
1678 {
1679@@ -136,6 +137,7 @@
1680 Throws.InstanceOf<ArgumentNullException>()
1681 .And.Message.Matches("null"));
1682 }
1683+#endif
1684
1685 internal class MyClass
1686 {
1687
1688=== modified file 'src/tests/Shared/Framework/Syntax/TypeConstraints.cs'
1689--- src/tests/Shared/Framework/Syntax/TypeConstraints.cs 2009-07-16 20:05:38 +0000
1690+++ src/tests/Shared/Framework/Syntax/TypeConstraints.cs 2009-09-17 23:53:44 +0000
1691@@ -116,7 +116,7 @@
1692 }
1693 }
1694
1695-#if NET_2_0
1696+#if CLR_2_0
1697 [TestFixture]
1698 public class ExactTypeTest_Generic : SyntaxTest
1699 {
1700
1701=== modified file 'src/tests/Shared/Framework/TestFixtureAttributeTests.cs'
1702--- src/tests/Shared/Framework/TestFixtureAttributeTests.cs 2009-09-06 16:12:27 +0000
1703+++ src/tests/Shared/Framework/TestFixtureAttributeTests.cs 2009-09-18 00:52:27 +0000
1704@@ -28,7 +28,7 @@
1705 public class TestFixtureAttributeTests
1706 {
1707 static object[] fixtureArgs = new object[] { 10, 20, "Charlie" };
1708-#if NET_2_0
1709+#if CLR_2_0
1710 static Type[] typeArgs = new Type[] { typeof(int), typeof(string) };
1711 static object[] combinedArgs = new object[] { typeof(int), typeof(string), 10, 20, "Charlie" };
1712 #endif
1713@@ -38,7 +38,7 @@
1714 {
1715 TestFixtureAttribute attr = new TestFixtureAttribute();
1716 Assert.That(attr.Arguments.Length == 0);
1717-#if NET_2_0
1718+#if CLR_2_0
1719 Assert.That(attr.TypeArgs.Length == 0);
1720 #endif
1721 }
1722@@ -48,12 +48,12 @@
1723 {
1724 TestFixtureAttribute attr = new TestFixtureAttribute(fixtureArgs);
1725 Assert.That(attr.Arguments, Is.EqualTo( fixtureArgs ) );
1726-#if NET_2_0
1727+#if CLR_2_0
1728 Assert.That(attr.TypeArgs.Length == 0 );
1729 #endif
1730 }
1731
1732-#if NET_2_0
1733+#if CLR_2_0
1734 [Test]
1735 public void ConstructWithJustTypeArgs()
1736 {
1737
1738=== modified file 'tools/src/CodeGeneration/CodeGenLib/CodeGenLib.csproj'
1739--- tools/src/CodeGeneration/CodeGenLib/CodeGenLib.csproj 2009-09-07 02:09:51 +0000
1740+++ tools/src/CodeGeneration/CodeGenLib/CodeGenLib.csproj 2009-09-19 22:02:35 +0000
1741@@ -43,9 +43,6 @@
1742 <Compile Include="Stanza.cs" />
1743 <Compile Include="SyntaxInfo.cs" />
1744 </ItemGroup>
1745- <ItemGroup>
1746- <Folder Include="Properties\" />
1747- </ItemGroup>
1748 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
1749 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
1750 Other similar extension points exist, see Microsoft.Common.targets.
1751
1752=== modified file 'tools/src/CodeGeneration/CodeGenLib/CodeGenSpec.cs'
1753--- tools/src/CodeGeneration/CodeGenLib/CodeGenSpec.cs 2009-08-30 19:03:20 +0000
1754+++ tools/src/CodeGeneration/CodeGenLib/CodeGenSpec.cs 2009-09-18 00:52:27 +0000
1755@@ -126,7 +126,7 @@
1756 }
1757
1758 if (spec.IsGeneric)
1759- writer.WriteLineNoTabs("#if NET_2_0");
1760+ writer.WriteLineNoTabs("#if CLR_2_0");
1761
1762 if (spec.ClassName == "Assert")
1763 GenerateAssertOverloads(writer, isStatic, spec);
1764
1765=== modified file 'tools/src/CodeGeneration/GenSyntax/Templates/Assert.template.cs'
1766--- tools/src/CodeGeneration/GenSyntax/Templates/Assert.template.cs 2009-09-18 19:25:33 +0000
1767+++ tools/src/CodeGeneration/GenSyntax/Templates/Assert.template.cs 2009-09-18 21:19:09 +0000
1768@@ -375,7 +375,7 @@
1769 #endregion
1770
1771 #region ref Object
1772-#if NET_2_0
1773+#if CLR_2_0
1774 /// <summary>
1775 /// Apply a constraint to a referenced value, succeeding if the constraint
1776 /// is satisfied and throwing an assertion exception on failure.
1777@@ -598,7 +598,7 @@
1778 #endregion
1779
1780 #region Throws<T>
1781-#if NET_2_0
1782+#if CLR_2_0
1783 /// <summary>
1784 /// Verifies that a delegate throws a particular exception when called.
1785 /// </summary>
1786@@ -706,7 +706,7 @@
1787 #endregion
1788
1789 #region Catch<T>
1790-#if NET_2_0
1791+#if CLR_2_0
1792 /// <summary>
1793 /// Verifies that a delegate throws an exception of a certain Type
1794 /// or one derived from it when called and returns it.
1795
1796=== modified file 'tools/src/CodeGeneration/tests/GenSyntax.Tests.csproj'
1797--- tools/src/CodeGeneration/tests/GenSyntax.Tests.csproj 2009-09-07 02:09:51 +0000
1798+++ tools/src/CodeGeneration/tests/GenSyntax.Tests.csproj 2009-09-19 22:02:35 +0000
1799@@ -53,9 +53,6 @@
1800 <Name>GenSyntax</Name>
1801 </ProjectReference>
1802 </ItemGroup>
1803- <ItemGroup>
1804- <Folder Include="Properties\" />
1805- </ItemGroup>
1806 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
1807 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
1808 Other similar extension points exist, see Microsoft.Common.targets.

Subscribers

People subscribed via source and target branches