* tests/UnitTests/Makefile.am:

* tests/UnitTests/UnitTests.mdp:
* tests/test-projects/completion-db-test/Library2/MyClass.cs:
* tests/test-projects/completion-db-test/Library1/MyClass.cs:
* tests/test-projects/completion-db-test/CompletionDbTest.sln:
* tests/test-projects/completion-db-test/Library1/Library1.csproj:
* tests/test-projects/completion-db-test/Library2/Library2.csproj:
* tests/test-projects/completion-db-test/Library2/AssemblyInfo.cs:
* tests/test-projects/completion-db-test/Library1/AssemblyInfo.cs:
* tests/test-projects/completion-db-test/CompletionDbTest/Main.cs:
* tests/UnitTests/MonoDevelop.Projects/CompletionDatabaseTests.cs:
* tests/test-projects/completion-db-test/Library1/SharedNamespace.cs:
* tests/test-projects/completion-db-test/Library2/SharedNamespace.cs:
* tests/test-projects/completion-db-test/Library2/GenericSubclassing.cs:
* tests/test-projects/completion-db-test/Library1/GenericSubclassing.cs:
* tests/test-projects/completion-db-test/CompletionDbTest/AssemblyInfo.cs:
* tests/test-projects/completion-db-test/CompletionDbTest/SharedNamespace.cs:
* tests/test-projects/completion-db-test/CompletionDbTest/CompletionDbTest.csproj:
  Added new tests for the code completion database.

* tests/test-projects/generated-console-project/TestProject.mdp:
* tests/test-projects/generated-console-project/TestProject.csproj:
* tests/test-projects/nested-solutions-mdp/console-project/console-project.mdp:
* tests/test-projects/nested-solutions-mdp/nested-solution1/library1/library1.mdp:
* tests/test-projects/nested-solutions-mdp/nested-solution1/library2/library2.mdp:
* tests/test-projects/csharp-console-mdp/csharp-console-mdp/csharp-console-mdp.mdp:
* tests/test-projects/nested-solutions-mdp/nested-solution2/console-project2/console-project2.mdp:
* tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/library4.mdp:
* tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/library3.mdp:
* tests/test-projects/test-configuration-merging/TestConfigurationMerging/TestConfigurationMerging.csproj:
* tests/test-projects/test-configuration-merging/TestConfigurationMerging/TestConfigurationMergingSaved.csproj:
  Track changes done in the serialization format.

svn path=/trunk/monodevelop/; revision=121653

27 files changed, 921 insertions, 22 deletions

diff --git a/main/tests/test-projects/ChangeLog b/main/tests/test-projects/ChangeLog
index 61ddd2c50b..366a8f26e3 100644
--- a/main/tests/test-projects/ChangeLog
+++ b/main/tests/test-projects/ChangeLog
@@ -1,3 +1,35 @@
+2008-12-16  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* generated-console-project/TestProject.mdp:
+	* generated-console-project/TestProject.csproj:
+	* nested-solutions-mdp/console-project/console-project.mdp:
+	* nested-solutions-mdp/nested-solution1/library1/library1.mdp:
+	* nested-solutions-mdp/nested-solution1/library2/library2.mdp:
+	* csharp-console-mdp/csharp-console-mdp/csharp-console-mdp.mdp:
+	* nested-solutions-mdp/nested-solution2/console-project2/console-project2.mdp:
+	* nested-solutions-mdp/nested-solution2/nested-solution3/library4/library4.mdp:
+	* nested-solutions-mdp/nested-solution2/nested-solution3/library3/library3.mdp:
+	* test-configuration-merging/TestConfigurationMerging/TestConfigurationMerging.csproj:
+	* test-configuration-merging/TestConfigurationMerging/TestConfigurationMergingSaved.csproj:
+	Track changes done in the serialization format.
+
+	* completion-db-test/Library1/MyClass.cs:
+	* completion-db-test/Library2/MyClass.cs:
+	* completion-db-test/CompletionDbTest.sln:
+	* completion-db-test/Library1/Library1.csproj:
+	* completion-db-test/Library2/AssemblyInfo.cs:
+	* completion-db-test/Library1/AssemblyInfo.cs:
+	* completion-db-test/CompletionDbTest/Main.cs:
+	* completion-db-test/Library2/Library2.csproj:
+	* completion-db-test/Library2/SharedNamespace.cs:
+	* completion-db-test/Library1/SharedNamespace.cs:
+	* completion-db-test/Library2/GenericSubclassing.cs:
+	* completion-db-test/Library1/GenericSubclassing.cs:
+	* completion-db-test/CompletionDbTest/AssemblyInfo.cs:
+	* completion-db-test/CompletionDbTest/SharedNamespace.cs:
+	* completion-db-test/CompletionDbTest/CompletionDbTest.csproj: Added new
+	tests for the code completion database.
+
 2008-10-31  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* resources-tester/ResourcesTester/Subfolder/FormFile2.Designer.cs: Fix
diff --git a/main/tests/test-projects/completion-db-test/CompletionDbTest.sln b/main/tests/test-projects/completion-db-test/CompletionDbTest.sln
new file mode 100644
index 0000000000..2f2a37d900
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/CompletionDbTest.sln
@@ -0,0 +1,34 @@
+

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual Studio 2008

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompletionDbTest", "CompletionDbTest\CompletionDbTest.csproj", "{F0E1243E-3125-4180-AC7B-21028ED68516}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Library1", "Library1\Library1.csproj", "{728501FB-8FE6-4838-B475-FC377AECA606}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Library2", "Library2\Library2.csproj", "{AC9D0338-CE0D-4ADF-8E0D-679B3653F3D5}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Any CPU = Debug|Any CPU

+		Release|Any CPU = Release|Any CPU

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{728501FB-8FE6-4838-B475-FC377AECA606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{728501FB-8FE6-4838-B475-FC377AECA606}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{728501FB-8FE6-4838-B475-FC377AECA606}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{728501FB-8FE6-4838-B475-FC377AECA606}.Release|Any CPU.Build.0 = Release|Any CPU

+		{AC9D0338-CE0D-4ADF-8E0D-679B3653F3D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{AC9D0338-CE0D-4ADF-8E0D-679B3653F3D5}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{AC9D0338-CE0D-4ADF-8E0D-679B3653F3D5}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{AC9D0338-CE0D-4ADF-8E0D-679B3653F3D5}.Release|Any CPU.Build.0 = Release|Any CPU

+		{F0E1243E-3125-4180-AC7B-21028ED68516}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{F0E1243E-3125-4180-AC7B-21028ED68516}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{F0E1243E-3125-4180-AC7B-21028ED68516}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{F0E1243E-3125-4180-AC7B-21028ED68516}.Release|Any CPU.Build.0 = Release|Any CPU

+	EndGlobalSection

+	GlobalSection(MonoDevelopProperties) = preSolution

+		name = CompletionDbTest

+		version = 0.1

+		StartupItem = CompletionDbTest\CompletionDbTest.csproj

+	EndGlobalSection

+EndGlobal

diff --git a/main/tests/test-projects/completion-db-test/CompletionDbTest/AssemblyInfo.cs b/main/tests/test-projects/completion-db-test/CompletionDbTest/AssemblyInfo.cs
new file mode 100644
index 0000000000..1ec22ec525
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/CompletionDbTest/AssemblyInfo.cs
@@ -0,0 +1,52 @@
+// AssemblyInfo.cs
+//
+// Author:
+//   Lluis Sanchez Gual <lluis@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("CompletionDbTest")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
diff --git a/main/tests/test-projects/completion-db-test/CompletionDbTest/CompletionDbTest.csproj b/main/tests/test-projects/completion-db-test/CompletionDbTest/CompletionDbTest.csproj
new file mode 100644
index 0000000000..3bb140d2aa
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/CompletionDbTest/CompletionDbTest.csproj
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F0E1243E-3125-4180-AC7B-21028ED68516}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>CompletionDbTest</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs" />
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="SharedNamespace.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\Library1\Library1.csproj">
+      <Project>{728501FB-8FE6-4838-B475-FC377AECA606}</Project>
+      <Name>Library1</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/main/tests/test-projects/completion-db-test/CompletionDbTest/Main.cs b/main/tests/test-projects/completion-db-test/CompletionDbTest/Main.cs
new file mode 100644
index 0000000000..668be23c19
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/CompletionDbTest/Main.cs
@@ -0,0 +1,56 @@
+// Main.cs
+//
+// Author:
+//   Lluis Sanchez Gual <lluis@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+using System;
+using Library1;
+
+namespace CompletionDbTest
+{
+	class MainClass
+	{
+		public static void Main(string[] args)
+		{
+			Console.WriteLine("Hello World!");
+		}
+	}
+
+	public class SomeGeneric<T>
+	{
+		public T Run (T val)
+		{
+			return val;
+		}
+	}
+
+	public class CustomWidget1: CBin, ISimple
+	{
+	}
+
+	public class CustomWidget2: SomeContainer.CInnerWidget, Library2.IObject
+	{
+	}
+}
+
diff --git a/main/tests/test-projects/completion-db-test/CompletionDbTest/SharedNamespace.cs b/main/tests/test-projects/completion-db-test/CompletionDbTest/SharedNamespace.cs
new file mode 100644
index 0000000000..64a3f10891
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/CompletionDbTest/SharedNamespace.cs
@@ -0,0 +1,37 @@
+// SharedNamespace.cs
+//
+// Author:
+//   Lluis Sanchez Gual <lluis@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+
+namespace SharedNamespace1
+{
+	public class A
+	{
+	}
+
+	public class B
+	{
+	}
+}
diff --git a/main/tests/test-projects/completion-db-test/Library1/AssemblyInfo.cs b/main/tests/test-projects/completion-db-test/Library1/AssemblyInfo.cs
new file mode 100644
index 0000000000..fb070d8344
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/Library1/AssemblyInfo.cs
@@ -0,0 +1,52 @@
+// AssemblyInfo.cs
+//
+// Author:
+//   Lluis Sanchez Gual <lluis@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("Library1")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
diff --git a/main/tests/test-projects/completion-db-test/Library1/GenericSubclassing.cs b/main/tests/test-projects/completion-db-test/Library1/GenericSubclassing.cs
new file mode 100644
index 0000000000..f6b63ae10e
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/Library1/GenericSubclassing.cs
@@ -0,0 +1,119 @@
+// GenericSubclassing.cs
+//
+// Author:
+//   Lluis Sanchez Gual <lluis@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+
+using System;
+using Library2;
+
+namespace Library1
+{
+	public class SubGenericWidget: GenericWidget
+	{
+	}
+
+	public class SubGenericWidget<T>: GenericWidget<T>
+	{
+	}
+
+	public class SubGenericWidget<T1,T2>: GenericWidget<T1,T2>
+	{
+	}
+
+	public class SubGenericBin: GenericBin
+	{
+	}
+
+	public class SubGenericBin<T>: GenericBin<T>
+	{
+	}
+
+	public class SubGenericBin<T1,T2>: GenericBin<T1,T2>
+	{
+	}
+
+	public class SubGenericBinInt1: GenericWidget<int>
+	{
+	}
+
+	public class SubGenericBinInt2: GenericBinInt
+	{
+	}
+
+	public class SubGenericBinInt<T>: GenericBinInt<T>
+	{
+	}
+
+	public class SubGenericBinStringInt1: GenericBinStringInt
+	{
+	}
+
+	public class SubGenericBinStringInt2: GenericWidget<string,int>
+	{
+	}
+
+	public class SubGenericBinStringIntGen1<T>: GenericBinStringInt<T>
+	{
+	}
+
+	public class SubGenericBinStringIntGen1: GenericBinStringInt<int>
+	{
+	}
+	
+	public class SubInnerClass<T>: Container.InnerClass1<T>
+	{
+	}
+
+	public class SubGenericWidgetStringNull<T>: GenericWidget<string,T>
+	{
+	}
+
+	public class SubGenericWidgetNullInt<T>: GenericWidget<T,int>
+	{
+	}
+
+	public class SubGenericWidgetSwapped<T1,T2>: GenericWidget<T2,T1>
+	{
+	}
+
+	public class SubContainer
+	{
+		public class InnerClass1<T>: GenericWidget<T>
+		{
+		}
+
+		public class InnerClass2: GenericWidget<int>
+		{
+		}
+
+		public class InnerClass3: InnerClass1<int>
+		{
+		}
+
+		public class InnerClass4: InnerClass2
+		{
+		}
+	}
+}
diff --git a/main/tests/test-projects/completion-db-test/Library1/Library1.csproj b/main/tests/test-projects/completion-db-test/Library1/Library1.csproj
new file mode 100644
index 0000000000..3ceb528191
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/Library1/Library1.csproj
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{728501FB-8FE6-4838-B475-FC377AECA606}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Library1</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Library2\Library2.csproj">
+      <Project>{AC9D0338-CE0D-4ADF-8E0D-679B3653F3D5}</Project>
+      <Name>Library2</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MyClass.cs" />
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="SharedNamespace.cs" />
+    <Compile Include="GenericSubclassing.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/main/tests/test-projects/completion-db-test/Library1/MyClass.cs b/main/tests/test-projects/completion-db-test/Library1/MyClass.cs
new file mode 100644
index 0000000000..f5b4f47b74
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/Library1/MyClass.cs
@@ -0,0 +1,81 @@
+// MyClass.cs
+//
+// Author:
+//   Lluis Sanchez Gual <lluis@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+
+using System;
+using Library2;
+
+namespace Library1
+{
+	public class CBin: CWidget
+	{
+	}
+
+	public class CList: CWidget
+	{
+	}
+
+	public class SomeContainer
+	{
+		public class CInnerWidget: CWidget
+		{
+		}
+
+		public class SomeInnerContainer
+		{
+			public class CSubInnerWidget: CWidget
+			{
+			}
+		}
+	}
+
+	public class CExtraBin: CBin
+	{
+	}
+
+	public class CExtraContainerSub: CExtraContainer
+	{
+	}
+
+	public class CExtraContainerInnerSub: Library2.SomeContainer.CExtraInnerWidget
+	{
+		public class CInnerWidget1: CExtraContainer, IObject
+		{
+		}
+
+		public class CInnerWidget2: Library1.SomeContainer.CInnerWidget, IObject
+		{
+		}
+
+		public class CInnerWidget3: Library2.SomeContainer.CInnerWidget
+		{
+		}
+	}
+
+	public interface ISimple: IObject
+	{
+	}
+}
diff --git a/main/tests/test-projects/completion-db-test/Library1/SharedNamespace.cs b/main/tests/test-projects/completion-db-test/Library1/SharedNamespace.cs
new file mode 100644
index 0000000000..fff3b76957
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/Library1/SharedNamespace.cs
@@ -0,0 +1,37 @@
+// SharedNamespace.cs
+//
+// Author:
+//   Lluis Sanchez Gual <lluis@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+
+namespace SharedNamespace2
+{
+	public class C
+	{
+	}
+
+	public class D
+	{
+	}
+}
diff --git a/main/tests/test-projects/completion-db-test/Library2/AssemblyInfo.cs b/main/tests/test-projects/completion-db-test/Library2/AssemblyInfo.cs
new file mode 100644
index 0000000000..17a0cf696b
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/Library2/AssemblyInfo.cs
@@ -0,0 +1,52 @@
+// AssemblyInfo.cs
+//
+// Author:
+//   Lluis Sanchez Gual <lluis@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("Library2")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
diff --git a/main/tests/test-projects/completion-db-test/Library2/GenericSubclassing.cs b/main/tests/test-projects/completion-db-test/Library2/GenericSubclassing.cs
new file mode 100644
index 0000000000..d51489a6dc
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/Library2/GenericSubclassing.cs
@@ -0,0 +1,106 @@
+// GenericSubclassing.cs
+//
+// Author:
+//   Lluis Sanchez Gual <lluis@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+
+using System;
+
+namespace Library2
+{
+	public class GenericWidget
+	{
+	}
+
+	public class GenericWidget<T>
+	{
+	}
+
+	public class GenericWidget<T1,T2>
+	{
+	}
+
+	public class GenericBin: GenericWidget
+	{
+	}
+
+	public class GenericBin<T>: GenericWidget<T>
+	{
+	}
+
+	public class GenericBin<T1,T2>: GenericWidget<T1,T2>
+	{
+	}
+
+	public class SpecialGenericBin<T>: GenericWidget<string,T>
+	{
+	}
+
+	public class GenericBinInt: GenericWidget<int>
+	{
+	}
+
+	public class GenericBinString: GenericWidget<string>
+	{
+	}
+
+	public class GenericBinInt<T>: GenericWidget<int>
+	{
+	}
+
+	public class GenericBinStringInt: GenericWidget<string,int>
+	{
+	}
+
+	public class GenericBinIntString: GenericWidget<int,string>
+	{
+	}
+
+	public class GenericBinStringInt<T>: GenericWidget<string,int>
+	{
+	}
+
+	public class GenericBinStringIntInst: GenericBinStringInt<int>
+	{
+	}
+
+	public class Container
+	{
+		public class InnerClass1<T>: GenericWidget<T>
+		{
+		}
+
+		public class InnerClass2: GenericWidget<int>
+		{
+		}
+
+		public class InnerClass3: InnerClass1<int>
+		{
+		}
+
+		public class InnerClass4: InnerClass2
+		{
+		}
+	}
+}
diff --git a/main/tests/test-projects/completion-db-test/Library2/Library2.csproj b/main/tests/test-projects/completion-db-test/Library2/Library2.csproj
new file mode 100644
index 0000000000..e2c2c9e51c
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/Library2/Library2.csproj
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{AC9D0338-CE0D-4ADF-8E0D-679B3653F3D5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Library2</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MyClass.cs" />
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="SharedNamespace.cs" />
+    <Compile Include="GenericSubclassing.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/main/tests/test-projects/completion-db-test/Library2/MyClass.cs b/main/tests/test-projects/completion-db-test/Library2/MyClass.cs
new file mode 100644
index 0000000000..a014d63866
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/Library2/MyClass.cs
@@ -0,0 +1,58 @@
+// MyClass.cs
+//
+// Author:
+//   Lluis Sanchez Gual <lluis@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+
+using System;
+
+namespace Library2
+{
+	public class CWidget
+	{
+	}
+
+	public class CContainer: CWidget
+	{
+	}
+
+	public class SomeContainer
+	{
+		public class CInnerWidget: CWidget
+		{
+		}
+		
+		public class CExtraInnerWidget: CExtraContainer
+		{
+		}
+	}
+
+	public class CExtraContainer: CContainer, IObject
+	{
+	}
+
+	public interface IObject
+	{
+	}
+}
diff --git a/main/tests/test-projects/completion-db-test/Library2/SharedNamespace.cs b/main/tests/test-projects/completion-db-test/Library2/SharedNamespace.cs
new file mode 100644
index 0000000000..dce4bc0d3f
--- /dev/null
+++ b/main/tests/test-projects/completion-db-test/Library2/SharedNamespace.cs
@@ -0,0 +1,48 @@
+// SharedNamespace.cs
+//
+// Author:
+//   Lluis Sanchez Gual <lluis@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+
+namespace SharedNamespace1
+{
+	public class E
+	{
+	}
+
+	public class F
+	{
+	}
+}
+
+namespace SharedNamespace2
+{
+	public class G
+	{
+	}
+
+	public class H
+	{
+	}
+}
diff --git a/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp/csharp-console-mdp.mdp b/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp/csharp-console-mdp.mdp
index 97565ce7c8..7733a12d9d 100644
--- a/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp/csharp-console-mdp.mdp
+++ b/main/tests/test-projects/csharp-console-mdp/csharp-console-mdp/csharp-console-mdp.mdp
@@ -1,4 +1,4 @@
-<Project name="csharp-console-mdp" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
+<Project name="csharp-console-mdp" fileversion="2.0" language="C#" targetFramework="2.0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Debug" assembly="csharp-console-mdp" />
diff --git a/main/tests/test-projects/generated-console-project/TestProject.csproj b/main/tests/test-projects/generated-console-project/TestProject.csproj
index 01277ee0c6..d1b79e0c67 100644
--- a/main/tests/test-projects/generated-console-project/TestProject.csproj
+++ b/main/tests/test-projects/generated-console-project/TestProject.csproj
@@ -3,6 +3,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>

     <ProjectGuid>{DC577202-654B-4FDB-95C7-8CC5DDF6D32D}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>TestProject</RootNamespace>
diff --git a/main/tests/test-projects/generated-console-project/TestProject.mdp b/main/tests/test-projects/generated-console-project/TestProject.mdp
index d21ebe3f72..63235a2140 100644
--- a/main/tests/test-projects/generated-console-project/TestProject.mdp
+++ b/main/tests/test-projects/generated-console-project/TestProject.mdp
@@ -1,15 +1,15 @@
-<Project name="TestProject" fileversion="2.0" language="C#" clr-version="Net_2_0" DefaultNamespace="TestProject" ctype="DotNetProject">
+<Project name="TestProject" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="TestProject" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Debug" assembly="TestProject" />
       <Build debugmode="True" target="Exe" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Release" assembly="TestProject" />
       <Build debugmode="False" target="Exe" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
diff --git a/main/tests/test-projects/nested-solutions-mdp/console-project/console-project.mdp b/main/tests/test-projects/nested-solutions-mdp/console-project/console-project.mdp
index 8b7f805ddb..ed9a21ae55 100644
--- a/main/tests/test-projects/nested-solutions-mdp/console-project/console-project.mdp
+++ b/main/tests/test-projects/nested-solutions-mdp/console-project/console-project.mdp
@@ -1,15 +1,15 @@
-<Project name="console-project" fileversion="2.0" language="C#" clr-version="Net_2_0" DefaultNamespace="console-project" ctype="DotNetProject">
+<Project name="console-project" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="console-project" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Debug" assembly="console-project" />
       <Build debugmode="True" target="Exe" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Release" assembly="console-project" />
       <Build debugmode="False" target="Exe" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library1/library1.mdp b/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library1/library1.mdp
index a6983d48a0..9af537df77 100644
--- a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library1/library1.mdp
+++ b/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library1/library1.mdp
@@ -1,15 +1,15 @@
-<Project name="library1" fileversion="2.0" language="C#" clr-version="Net_2_0" DefaultNamespace="library1" ctype="DotNetProject">
+<Project name="library1" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="library1" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Debug" assembly="library1" />
       <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Release" assembly="library1" />
       <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library2/library2.mdp b/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library2/library2.mdp
index e45ab86669..56da9dc365 100644
--- a/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library2/library2.mdp
+++ b/main/tests/test-projects/nested-solutions-mdp/nested-solution1/library2/library2.mdp
@@ -1,15 +1,15 @@
-<Project name="library2" fileversion="2.0" language="C#" clr-version="Net_2_0" DefaultNamespace="library2" ctype="DotNetProject">
+<Project name="library2" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="library2" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Debug" assembly="library2" />
       <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Release" assembly="library2" />
       <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/console-project2/console-project2.mdp b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/console-project2/console-project2.mdp
index 79153b0b1f..90b7793ecb 100644
--- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/console-project2/console-project2.mdp
+++ b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/console-project2/console-project2.mdp
@@ -1,15 +1,15 @@
-<Project name="console-project2" fileversion="2.0" language="C#" clr-version="Net_2_0" DefaultNamespace="console-project2" ctype="DotNetProject">
+<Project name="console-project2" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="console-project2" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Debug" assembly="console-project2" />
       <Build debugmode="True" target="Exe" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Release" assembly="console-project2" />
       <Build debugmode="False" target="Exe" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/library3.mdp b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/library3.mdp
index 1b17a9d866..d8d0edf6aa 100644
--- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/library3.mdp
+++ b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library3/library3.mdp
@@ -1,15 +1,15 @@
-<Project name="library3" fileversion="2.0" language="C#" clr-version="Net_2_0" DefaultNamespace="library3" ctype="DotNetProject">
+<Project name="library3" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="library3" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Debug" assembly="library3" />
       <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Release" assembly="library3" />
       <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
diff --git a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/library4.mdp b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/library4.mdp
index 0b0e555fd9..983ff1e143 100644
--- a/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/library4.mdp
+++ b/main/tests/test-projects/nested-solutions-mdp/nested-solution2/nested-solution3/library4/library4.mdp
@@ -1,15 +1,15 @@
-<Project name="library4" fileversion="2.0" language="C#" clr-version="Net_2_0" DefaultNamespace="library4" ctype="DotNetProject">
+<Project name="library4" fileversion="2.0" language="C#" targetFramework="2.0" DefaultNamespace="library4" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Debug" assembly="library4" />
       <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG;TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Release" assembly="library4" />
       <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="TRACE" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
diff --git a/main/tests/test-projects/test-configuration-merging/TestConfigurationMerging/TestConfigurationMerging.csproj b/main/tests/test-projects/test-configuration-merging/TestConfigurationMerging/TestConfigurationMerging.csproj
index 4b4a7a9768..edf3630e36 100644
--- a/main/tests/test-projects/test-configuration-merging/TestConfigurationMerging/TestConfigurationMerging.csproj
+++ b/main/tests/test-projects/test-configuration-merging/TestConfigurationMerging/TestConfigurationMerging.csproj
@@ -3,6 +3,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8E25B644-45CA-457C-A08B-0F1C9AA51E71}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AssemblyName>TestConfigurationMerging</AssemblyName>
diff --git a/main/tests/test-projects/test-configuration-merging/TestConfigurationMerging/TestConfigurationMergingSaved.csproj b/main/tests/test-projects/test-configuration-merging/TestConfigurationMerging/TestConfigurationMergingSaved.csproj
index 2b3ae404d7..caed62788e 100644
--- a/main/tests/test-projects/test-configuration-merging/TestConfigurationMerging/TestConfigurationMergingSaved.csproj
+++ b/main/tests/test-projects/test-configuration-merging/TestConfigurationMerging/TestConfigurationMergingSaved.csproj
@@ -4,6 +4,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8E25B644-45CA-457C-A08B-0F1C9AA51E71}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AssemblyName>TestConfigurationMerging</AssemblyName>