Upgraded to .net 4.0. Upgraded tools\NUnit

remogloor · Oct 6, 2010 · 5479368 · 5479368
1 parent baa081f
commit 5479368
Show file tree

Hide file tree

Showing 80 changed files with 10,870 additions and 6,302 deletions.
diff --git a/src/StatLight.Core.Tests/StatLight.Core.Tests.csproj b/src/StatLight.Core.Tests/StatLight.Core.Tests.csproj
@@ -10,14 +10,15 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>StatLight.Core.Tests</RootNamespace>
     <AssemblyName>StatLight.Core.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\StatLight.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/src/StatLight.Core/Properties/Resources.Designer.cs b/src/StatLight.Core/Properties/Resources.Designer.cs
diff --git a/src/StatLight.Core/StatLight.Core.csproj b/src/StatLight.Core/StatLight.Core.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>StatLight.Core</RootNamespace>
     <AssemblyName>StatLight.Core</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\StatLight.snk</AssemblyOriginatorKeyFile>
@@ -33,6 +33,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/src/StatLight.IntegrationTests/StatLight.IntegrationTests.csproj b/src/StatLight.IntegrationTests/StatLight.IntegrationTests.csproj
@@ -10,14 +10,15 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>StatLight.IntegrationTests</RootNamespace>
     <AssemblyName>StatLight.IntegrationTests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\StatLight.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/src/Statlight.Console/Statlight.Console.csproj b/src/Statlight.Console/Statlight.Console.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>StatLight.Console</RootNamespace>
     <AssemblyName>StatLight</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\StatLight.snk</AssemblyOriginatorKeyFile>
@@ -30,6 +30,7 @@
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -145,6 +146,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Microsoft.Silverlight.Testing.License.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/src/Statlight.Console/app.config b/src/Statlight.Console/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/tools/NUnit/NUnitTests.nunit b/tools/NUnit/NUnitTests.nunit
@@ -1,14 +1,14 @@
 <NUnitProject>
-  <Settings appbase="." />
-  <Config name="Default" binpathtype="Auto">
-    <assembly path="nunit.framework.tests.dll" />
-    <assembly path="nunit.core.tests.dll" />
-    <assembly path="nunit.util.tests.dll" />
-    <assembly path="nunit.mocks.tests.dll" />
-    <assembly path="nunit.extensions.tests.dll" />
-    <assembly path="nunit-console.tests.dll" />
-    <assembly path="nunit.uikit.tests.dll" />
-    <assembly path="nunit-gui.tests.dll" />
-    <assembly path="nunit.fixtures.tests.dll" />
+  <Settings appbase="."/>
+  <Config name="Default" binpath="lib;tests;framework" runtimeFramework="v2.0">
+    <assembly path="tests/nunit.framework.tests.dll" />
+    <assembly path="tests/nunit.core.tests.dll" />
+    <assembly path="tests/nunit.util.tests.dll" />
+    <assembly path="tests/nunit.mocks.tests.dll" />
+    <assembly path="tests/nunit-console.tests.dll" />
+    <assembly path="tests/nunit.uiexception.tests.dll" />
+    <assembly path="tests/nunit.uikit.tests.dll" />
+    <assembly path="tests/nunit-gui.tests.dll" />
+    <assembly path="tests/nunit.fixtures.tests.dll" />
   </Config>
 </NUnitProject>
diff --git a/tools/NUnit/agent.conf b/tools/NUnit/agent.conf
@@ -0,0 +1,4 @@
+<AgentConfig>
+  <Port>8080</Port>
+  <PathToAssemblies>.</PathToAssemblies>
+</AgentConfig>
diff --git a/tools/NUnit/agent.log.conf b/tools/NUnit/agent.log.conf
@@ -0,0 +1,18 @@
+<log4net>
+	<!-- A1 is set to be a ConsoleAppender -->
+	<appender name="A1" type="log4net.Appender.ConsoleAppender">
+
+		<!-- A1 uses PatternLayout -->
+		<layout type="log4net.Layout.PatternLayout">
+			<!-- Print the date in ISO 8601 format -->
+			<conversionPattern value="%-5level %logger - %message%newline" />
+		</layout>
+	</appender>
+
+	<!-- Set root logger level to DEBUG and its only appender to A1 -->
+	<root>
+		<level value="DEBUG" />
+		<appender-ref ref="A1" />
+	</root>
+
+</log4net>
diff --git a/tools/NUnit/clr.bat b/tools/NUnit/clr.bat
diff --git a/tools/NUnit/failure.jpg b/tools/NUnit/failure.jpg
diff --git a/tools/NUnit/framework/nunit.framework.dll b/tools/NUnit/framework/nunit.framework.dll