Use the new DotNetAssemblyProject class instead of DotNetProject, which is now abstract.

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

24 files changed, 87 insertions, 35 deletions

diff --git a/main/src/addins/MonoDeveloperExtensions/ChangeLog b/main/src/addins/MonoDeveloperExtensions/ChangeLog
index 3699196dbc..c42933e453 100644
--- a/main/src/addins/MonoDeveloperExtensions/ChangeLog
+++ b/main/src/addins/MonoDeveloperExtensions/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-28  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* MonoMakefileFormat.cs: Use the new DotNetAssemblyProject
+	  class instead of DotNetProject, which is now abstract.
+
 2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* MonoDeveloperExtensions.csproj: Updated dependencies. We now
diff --git a/main/src/addins/MonoDeveloperExtensions/MonoMakefileFormat.cs b/main/src/addins/MonoDeveloperExtensions/MonoMakefileFormat.cs
index e951f4f407..5f9582208d 100644
--- a/main/src/addins/MonoDeveloperExtensions/MonoMakefileFormat.cs
+++ b/main/src/addins/MonoDeveloperExtensions/MonoMakefileFormat.cs
@@ -108,7 +108,7 @@ namespace MonoDeveloper
 				if (aname != null) {
 					// It is a project
 					monitor.BeginTask ("Loading '" + fileName + "'", 0);
-					DotNetProject project = new DotNetProject ("C#");
+					DotNetAssemblyProject project = new DotNetAssemblyProject ("C#");
 					MonoSolutionItemHandler handler = new MonoSolutionItemHandler (project);
 					ProjectExtensionUtil.InstallHandler (handler, project);
 					project.Name = Path.GetFileName (basePath);
diff --git a/main/src/addins/prj2make-sharp-lib/ChangeLog b/main/src/addins/prj2make-sharp-lib/ChangeLog
index 74579fa1c0..65ebf6d9d4 100644
--- a/main/src/addins/prj2make-sharp-lib/ChangeLog
+++ b/main/src/addins/prj2make-sharp-lib/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-28  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* MsPrjHelper.cs: Use the new DotNetAssemblyProject class
+	  instead of DotNetProject, which is now abstract.
+
 2009-09-02  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* MsPrjHelper.cs: Create default configurations for the
diff --git a/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs b/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs
index f41f0b1b7a..ec1bba7cf6 100644
--- a/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs
+++ b/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs
@@ -181,7 +181,7 @@ namespace MonoDevelop.Prj2Make
 				
 				monitor.BeginTask (GettextCatalog.GetString ("Importing project: ") + csprojFileName, 4);
 				
-				DotNetProject prjxObj = new DotNetProject ("C#", null, null);
+				DotNetAssemblyProject prjxObj = new DotNetAssemblyProject ("C#", null, null);
 				
 				prjxFileName = String.Format ("{0}.mdp",
 					Path.Combine (Path.GetDirectoryName (csprojFileName),
diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog
index 5c4cb7dbcf..76eb28c515 100644
--- a/main/src/core/MonoDevelop.Ide/ChangeLog
+++ b/main/src/core/MonoDevelop.Ide/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-28  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs:
+	  Use the new DotNetAssemblyProject class instead of
+	  DotNetProject, which is now abstract.
+
 2009-09-25  Mike Krüger  <mkrueger@novell.com>
 
 	* MonoDevelop.Ide.Gui/IWorkbenchLayout.cs:
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs
index 4b6f2a950c..63937a8c23 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs
@@ -146,7 +146,7 @@ namespace MonoDevelop.Ide.CodeFormatting
 			IPrettyPrinter printer = TextFileService.GetPrettyPrinter (description.MimeType);
 			if (printer == null)
 				return;
-			DotNetProject parent = new DotNetProject ();
+			DotNetAssemblyProject parent = new DotNetAssemblyProject ();
 			parent.Policies.Set<T> (settings, description.MimeType);
 			texteditor1.Document.Text  = printer.FormatText (parent, description.MimeType, texteditor1.Document.Text);
 		}
diff --git a/main/src/core/MonoDevelop.Projects/ChangeLog b/main/src/core/MonoDevelop.Projects/ChangeLog
index 5897a98953..f36d9dd9d8 100644
--- a/main/src/core/MonoDevelop.Projects/ChangeLog
+++ b/main/src/core/MonoDevelop.Projects/ChangeLog
@@ -1,5 +1,17 @@
 2009-09-28  Lluis Sanchez Gual  <lluis@novell.com>
 
+	* Makefile.am:
+	* md1format.xml:
+	* MonoDevelop.Projects.csproj:
+	* MonoDevelop.Projects.addin.xml:
+	* MonoDevelop.Projects/DotNetProject.cs:
+	* MonoDevelop.Projects/DotNetProjectBinding.cs:
+	* MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs:
+	  Use the new DotNetAssemblyProject class instead of
+	  DotNetProject, which is now abstract.
+
+2009-09-28  Lluis Sanchez Gual  <lluis@novell.com>
+
 	* MonoDevelop.Projects.Dom.Serialization/ParserDatabase.cs:
 	  Don't share the name table, since it now holds temporary ids
 	  which are exclusive to specific database serialization
diff --git a/main/src/core/MonoDevelop.Projects/Makefile.am b/main/src/core/MonoDevelop.Projects/Makefile.am
index 6b3b4b3d00..099cab1a58 100644
--- a/main/src/core/MonoDevelop.Projects/Makefile.am
+++ b/main/src/core/MonoDevelop.Projects/Makefile.am
@@ -220,6 +220,7 @@ FILES =  \
 	MonoDevelop.Projects/CustomCommandExtension.cs \
 	MonoDevelop.Projects/CustomCommandType.cs \
 	MonoDevelop.Projects/CyclicDependencyException.cs \
+	MonoDevelop.Projects/DotNetAssemblyProject.cs \
 	MonoDevelop.Projects/DotNetProject.cs \
 	MonoDevelop.Projects/DotNetProjectBinding.cs \
 	MonoDevelop.Projects/DotNetProjectConfiguration.cs \
diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
index 2df3ffdba8..e3161e660b 100644
--- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
+++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
@@ -245,7 +245,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 				item = (SolutionItem) Activator.CreateInstance (itemClass);
 			
 			if (item == null && !string.IsNullOrEmpty (language))
-				item = new DotNetProject (language);
+				item = new DotNetAssemblyProject (language);
 			
 			if (item == null) {
 				if (string.IsNullOrEmpty (itemType))
diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
index b37a958ee3..7aae998c9e 100644
--- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
+++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
@@ -138,6 +138,7 @@
 		<DataType class = "MonoDevelop.Projects.Project" />
 		<DataType class = "MonoDevelop.Projects.Workspace" />
 		<DataType class = "MonoDevelop.Projects.DotNetProject" />
+		<DataType class = "MonoDevelop.Projects.DotNetAssemblyProject" />
 		<DataType class = "MonoDevelop.Projects.GenericProject" />
 		<DataType class = "MonoDevelop.Projects.GenericProjectConfiguration" />
 	</Extension>
diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.csproj b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.csproj
index 6de690c229..33b08c14c9 100644
--- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.csproj
+++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.csproj
@@ -331,6 +331,7 @@
     <Compile Include="MonoDevelop.Projects.Formats.MSBuild\IMSBuildImportProvider.cs" />
     <Compile Include="MonoDevelop.Projects.Dom\IBaseMember.cs" />
     <Compile Include="MonoDevelop.Projects.Dom\INode.cs" />
+    <Compile Include="MonoDevelop.Projects\DotNetAssemblyProject.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\InvalidProjectFileException.cs" />
diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
index 842284f6c9..562ced1698 100644
--- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
+++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
@@ -47,7 +47,7 @@ using MonoDevelop.Core.Assemblies;
 namespace MonoDevelop.Projects
 {
 	[DataInclude(typeof(DotNetProjectConfiguration))]
-	public class DotNetProject : Project
+	public abstract class DotNetProject : Project
 	{
 
 		bool usePartialTypes = true;
diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProjectBinding.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProjectBinding.cs
index 6be187f66c..e2e26591cb 100644
--- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProjectBinding.cs
+++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProjectBinding.cs
@@ -48,7 +48,7 @@ namespace MonoDevelop.Projects
 		
 		protected virtual DotNetProject CreateProject (string languageName, ProjectCreateInformation info, XmlElement projectOptions)
 		{
-			return new DotNetProject (languageName, info, projectOptions);
+			return new DotNetAssemblyProject (languageName, info, projectOptions);
 		}
 		
 		public Project CreateSingleFileProject (string file)
diff --git a/main/src/core/MonoDevelop.Projects/md1format.xml b/main/src/core/MonoDevelop.Projects/md1format.xml
index 4e19ca82a2..1efa9c57be 100644
--- a/main/src/core/MonoDevelop.Projects/md1format.xml
+++ b/main/src/core/MonoDevelop.Projects/md1format.xml
@@ -2,6 +2,7 @@
 	<DataItem class = "MonoDevelop.Projects.Solution" name="Combine">
 		<LiteralProperty name="fileversion" value="2.0" />
 		<ItemProperty member="description" defaultValue="" />
+		<ItemProperty member="version" defaultValue="0.1"/>
 		<ItemProperty member="outputdir" name="outputpath" serializationDataType="MonoDevelop.Projects.PathDataType" />
 		<ItemMember name="CombineConfigurations" type="MonoDevelop.Projects.Formats.MD1.CombineConfigurationSet"/>
 		<ItemProperty member="CombineConfigurations" name="Configurations" />
@@ -34,13 +35,15 @@
 		<ItemProperty member="Files" name="Contents" />
 		<ItemProperty member="Files" scope="*" name="File" />
 	</DataItem>
-	<DataItem class = "MonoDevelop.Projects.DotNetProject">
+	<DataItem class = "MonoDevelop.Projects.DotNetProject" name="AbstractDotNetProject">
 		<ItemProperty member="languageName" name="language"/>
 		<ItemProperty member="UsePartialTypes" defaultValue="true"/>
 		<ItemProperty member="defaultNamespace" name="DefaultNamespace" defaultValue="" />
 		<ItemProperty member="References" name="References" />
 		<ItemProperty member="LanguageParameters" skipEmpty="true" />
 	</DataItem>
+	<DataItem class = "MonoDevelop.Projects.DotNetAssemblyProject" name="DotNetProject">
+	</DataItem>
 	<DataItem class = "MonoDevelop.Projects.DotNetProjectConfiguration">
 		<ItemProperty member="assembly" name="Output/assembly"/>
 		<LiteralProperty name="Execution/runtime" value="MsNet" />
diff --git a/main/tests/UnitTests/ChangeLog b/main/tests/UnitTests/ChangeLog
index b4888a7f99..2e9624f472 100644
--- a/main/tests/UnitTests/ChangeLog
+++ b/main/tests/UnitTests/ChangeLog
@@ -1,3 +1,17 @@
+2009-09-28  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* MonoDevelop.Projects/MdsTests.cs:
+	* MonoDevelop.Projects/ProjectTests.cs:
+	* MonoDevelop.Projects/SolutionTests.cs:
+	* MonoDevelop.Projects/WorkspaceTests.cs:
+	* MonoDevelop.Projects/TestProjectsChecks.cs:
+	* MonoDevelop.Refactoring/ExtractMethodTests.cs:
+	* MonoDevelop.CSharpBinding/CodeCompletionBugTests.cs:
+	* MonoDevelop.CSharpBinding/FindMemberVisitorTests.cs:
+	* MonoDevelop.CSharpBinding/ParameterCompletionTests.cs: Use
+	  the new DotNetAssemblyProject class instead of
+	  DotNetProject, which is now abstract.
+
 2009-09-23  Mike Krüger  <mkrueger@novell.com>
 
 	* MonoDevelop.CSharpBinding/TopLevelTests.cs: Fixed unit test.
diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/CodeCompletionBugTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/CodeCompletionBugTests.cs
index 34266585cb..7aada8602f 100644
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/CodeCompletionBugTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/CodeCompletionBugTests.cs
@@ -69,7 +69,7 @@ namespace MonoDevelop.CSharpBinding.Tests
 			

 			TestWorkbenchWindow tww = new TestWorkbenchWindow ();

 			TestViewContent sev = new TestViewContent ();

-			DotNetProject project = new DotNetProject ("C#");

+			DotNetProject project = new DotNetAssemblyProject ("C#");

 			project.FileName = "/tmp/a" + pcount + ".csproj";

 			

 			string file = "/tmp/test-file-" + (pcount++) + ".cs";

diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/FindMemberVisitorTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/FindMemberVisitorTests.cs
index 2194c4e4b1..a70cad455f 100644
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/FindMemberVisitorTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/FindMemberVisitorTests.cs
@@ -73,7 +73,7 @@ namespace MonoDevelop.CSharpBinding.Tests
 					break;
 				}
 			}
-			DotNetProject project = new DotNetProject ("C#");

+			DotNetProject project = new DotNetAssemblyProject ("C#");

 			project.FileName = "/tmp/a.csproj";

 			

 			SimpleProjectDom dom = new SimpleProjectDom ();

diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding/ParameterCompletionTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding/ParameterCompletionTests.cs
index fe6d09ad85..719f49451d 100644
--- a/main/tests/UnitTests/MonoDevelop.CSharpBinding/ParameterCompletionTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding/ParameterCompletionTests.cs
@@ -58,7 +58,7 @@ namespace MonoDevelop.CSharpBinding.Tests
 			

 			TestWorkbenchWindow tww = new TestWorkbenchWindow ();

 			TestViewContent sev = new TestViewContent ();

-			DotNetProject project = new DotNetProject ("C#");

+			DotNetProject project = new DotNetAssemblyProject ("C#");

 			project.FileName = "/tmp/ap" + pcount + ".csproj";

 			

 			string file = "/tmp/test-pfile-" + (pcount++) + ".cs";

diff --git a/main/tests/UnitTests/MonoDevelop.Projects/MdsTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/MdsTests.cs
index ad3cf41e26..7787b6f555 100644
--- a/main/tests/UnitTests/MonoDevelop.Projects/MdsTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Projects/MdsTests.cs
@@ -173,7 +173,7 @@ namespace MonoDevelop.Projects
 			sol.FileName = Path.Combine (dir, "thesolution");
 			ws.Items.Add (sol);
 			
-			DotNetProject p = new DotNetProject ("C#");
+			DotNetAssemblyProject p = new DotNetAssemblyProject ("C#");
 			p.FileName = Path.Combine (dir, "theproject");
 			sol.RootFolder.Items.Add (p);
 			
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/ProjectTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/ProjectTests.cs
index 359d0e6da6..5cbc966c02 100644
--- a/main/tests/UnitTests/MonoDevelop.Projects/ProjectTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Projects/ProjectTests.cs
@@ -39,7 +39,7 @@ namespace MonoDevelop.Projects
 		[Test()]
 		public void ProjectFilePaths ()
 		{
-			DotNetProject project = new DotNetProject ("C#");
+			DotNetProject project = new DotNetAssemblyProject ("C#");
 			string dir = Environment.CurrentDirectory;
 			
 			ProjectFile file1 = project.AddFile (Util.Combine (dir, "test1.cs"), BuildAction.Compile);
@@ -169,7 +169,7 @@ namespace MonoDevelop.Projects
 			ProjectCreateInformation info = new ProjectCreateInformation ();
 			info.ProjectName = "Some.Test";
 			info.ProjectBasePath = "/tmp/test";
-			DotNetProject p = new DotNetProject ("C#", info, null);
+			DotNetProject p = new DotNetAssemblyProject ("C#", info, null);
 
 			Assert.AreEqual (2, p.Configurations.Count);
 			Assert.AreEqual ("Debug", p.Configurations [0].Name);
@@ -182,7 +182,7 @@ namespace MonoDevelop.Projects
 		[Test()]
 		public void NewConfigurationsHaveAnAssemblyName ()
 		{
-			DotNetProject p = new DotNetProject ("C#");
+			DotNetProject p = new DotNetAssemblyProject ("C#");
 			p.Name = "HiThere";
 			DotNetProjectConfiguration c = (DotNetProjectConfiguration) p.CreateConfiguration ("First");
 			Assert.AreEqual ("HiThere", c.OutputAssembly);
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs
index 4e5ae3310d..f9f920a720 100644
--- a/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs
@@ -86,14 +86,14 @@ namespace MonoDevelop.Projects
 			Assert.AreEqual (1, countSolutionItemAdded);
 			Assert.AreEqual (0, sol.Items.Count);
 			
-			DotNetProject project = new DotNetProject ("C#");
+			DotNetAssemblyProject project = new DotNetAssemblyProject ("C#");
 			project.Name = "project1";
 			sol.RootFolder.Items.Add (project);
 			
 			Assert.AreEqual (2, countSolutionItemAdded);
 			Assert.AreEqual (1, sol.Items.Count);
 			
-			DotNetProject project2 = new DotNetProject ("C#");
+			DotNetAssemblyProject project2 = new DotNetAssemblyProject ("C#");
 			project2.Name = "project2";
 			folder.Items.Add (project2);
 			
@@ -192,7 +192,7 @@ namespace MonoDevelop.Projects
 		{
 			int nameChanges = 0;
 			
-			DotNetProject prj = new DotNetProject ("C#");
+			DotNetAssemblyProject prj = new DotNetAssemblyProject ("C#");
 			prj.NameChanged += delegate {
 				nameChanges++;
 			};
@@ -512,7 +512,7 @@ namespace MonoDevelop.Projects
 			
 			// Add new project
 			
-			Project newp = new DotNetProject ("C#");
+			Project newp = new DotNetAssemblyProject ("C#");
 			Assert.AreEqual ("MSBuild05", newp.FileFormat.Id);
 			
 			sol.RootFolder.Items.Add (newp);
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs b/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs
index b82aaf1380..e8b58844fe 100644
--- a/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs
+++ b/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs
@@ -146,8 +146,9 @@ namespace MonoDevelop.Projects
 			Solution sol = new Solution ();
 			SolutionConfiguration scDebug = sol.AddConfiguration ("Debug", true);
 			
-			DotNetProject project = new DotNetProject ("C#");
+			DotNetAssemblyProject project = new DotNetAssemblyProject ("C#");
 			sol.RootFolder.Items.Add (project);
+			Assert.AreEqual (0, project.Configurations.Count);
 			
 			InitializeProject (dir, project, "TestProject");
 			project.References.Add (new ProjectReference (ReferenceType.Gac, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
@@ -161,6 +162,9 @@ namespace MonoDevelop.Projects
 			project.Files.Add (pf);
 			project.Files.Add (new ProjectFile (Path.Combine (dir, "Nothing.xml"), BuildAction.None));
 			
+			Assert.IsFalse (scDebug.GetEntryForItem (project).Build);
+			scDebug.GetEntryForItem (project).Build = true;
+			
 			SolutionConfiguration scRelease = sol.AddConfiguration ("Release", true);
 			
 			string file = Path.Combine (dir, "TestSolution.sln");
@@ -194,7 +198,7 @@ namespace MonoDevelop.Projects
 		
 		public static DotNetProject CreateProject (string dir, string lang, string name)
 		{
-			DotNetProject project = new DotNetProject (lang);
+			DotNetAssemblyProject project = new DotNetAssemblyProject (lang);
 			InitializeProject (dir, project, name);
 			return project;
 		}
@@ -352,7 +356,7 @@ namespace MonoDevelop.Projects
 			sol.FileName = Path.Combine (dir, "TestSolutionFolders");
 			sol.Name = "TheSolution";
 			
-			DotNetProject p1 = new DotNetProject ("C#");
+			DotNetAssemblyProject p1 = new DotNetAssemblyProject ("C#");
 			p1.FileName = Path.Combine (dir, "p1");
 			sol.RootFolder.Items.Add (p1);
 			string idp1 = p1.ItemId;
@@ -368,7 +372,7 @@ namespace MonoDevelop.Projects
 			Assert.IsFalse (ids.Contains (idf1));
 			ids.Add (idf1);
 			
-			DotNetProject p2 = new DotNetProject ("C#");
+			DotNetAssemblyProject p2 = new DotNetAssemblyProject ("C#");
 			p2.FileName = Path.Combine (dir, "p2");
 			f1.Items.Add (p2);
 			string idp2 = p2.ItemId;
@@ -384,7 +388,7 @@ namespace MonoDevelop.Projects
 			Assert.IsFalse (ids.Contains (idf2));
 			ids.Add (idf2);
 			
-			DotNetProject p3 = new DotNetProject ("C#");
+			DotNetAssemblyProject p3 = new DotNetAssemblyProject ("C#");
 			p3.FileName = Path.Combine (dir, "p3");
 			f2.Items.Add (p3);
 			string idp3 = p3.ItemId;
@@ -392,7 +396,7 @@ namespace MonoDevelop.Projects
 			Assert.IsFalse (ids.Contains (idp3));
 			ids.Add (idp3);
 			
-			DotNetProject p4 = new DotNetProject ("C#");
+			DotNetAssemblyProject p4 = new DotNetAssemblyProject ("C#");
 			p4.FileName = Path.Combine (dir, "p4");
 			f2.Items.Add (p4);
 			string idp4 = p4.ItemId;
@@ -405,7 +409,7 @@ namespace MonoDevelop.Projects
 			Solution sol2 = (Solution) Services.ProjectService.ReadWorkspaceItem (Util.GetMonitor (), sol.FileName);
 			Assert.AreEqual (4, sol2.Items.Count);
 			Assert.AreEqual (2, sol2.RootFolder.Items.Count);
-			Assert.AreEqual (typeof(DotNetProject), sol2.RootFolder.Items [0].GetType ());
+			Assert.AreEqual (typeof(DotNetAssemblyProject), sol2.RootFolder.Items [0].GetType ());
 			Assert.AreEqual (typeof(SolutionFolder), sol2.RootFolder.Items [1].GetType ());
 			Assert.AreEqual ("p1", sol2.RootFolder.Items [0].Name);
 			Assert.AreEqual ("f1", sol2.RootFolder.Items [1].Name);
@@ -414,7 +418,7 @@ namespace MonoDevelop.Projects
 			
 			f1 = (SolutionFolder) sol2.RootFolder.Items [1];
 			Assert.AreEqual (2, f1.Items.Count);
-			Assert.AreEqual (typeof(DotNetProject), f1.Items [0].GetType ());
+			Assert.AreEqual (typeof(DotNetAssemblyProject), f1.Items [0].GetType ());
 			Assert.AreEqual (typeof(SolutionFolder), f1.Items [1].GetType ());
 			Assert.AreEqual ("p2", f1.Items [0].Name);
 			Assert.AreEqual ("f2", f1.Items [1].Name);
@@ -423,8 +427,8 @@ namespace MonoDevelop.Projects
 			
 			f2 = (SolutionFolder) f1.Items [1];
 			Assert.AreEqual (2, f2.Items.Count);
-			Assert.AreEqual (typeof(DotNetProject), f2.Items [0].GetType ());
-			Assert.AreEqual (typeof(DotNetProject), f2.Items [1].GetType ());
+			Assert.AreEqual (typeof(DotNetAssemblyProject), f2.Items [0].GetType ());
+			Assert.AreEqual (typeof(DotNetAssemblyProject), f2.Items [1].GetType ());
 			Assert.AreEqual ("p3", f2.Items [0].Name);
 			Assert.AreEqual ("p4", f2.Items [1].Name);
 			Assert.AreEqual (idp3, f2.Items [0].ItemId, "idp4");
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/WorkspaceTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/WorkspaceTests.cs
index d969e0116d..fd43173ee1 100644
--- a/main/tests/UnitTests/MonoDevelop.Projects/WorkspaceTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Projects/WorkspaceTests.cs
@@ -204,14 +204,14 @@ namespace MonoDevelop.Projects
 			Solution sol1 = new Solution ();
 			cws.Items.Add (sol1);
 			sol1.RootFolder.Items.Add (it1 = new DummySolutionItem ());
-			sol1.RootFolder.Items.Add (it2 = new DotNetProject ("C#"));
+			sol1.RootFolder.Items.Add (it2 = new DotNetAssemblyProject ("C#"));
 			
 			Solution sol2 = new Solution ();
 			cws.Items.Add (sol2);
 			SolutionFolder f = new SolutionFolder ();
 			sol2.RootFolder.Items.Add (f);
-			f.Items.Add (it3 = new DotNetProject ("C#"));
-			f.Items.Add (it4 = new DotNetProject ("C#"));
+			f.Items.Add (it3 = new DotNetAssemblyProject ("C#"));
+			f.Items.Add (it4 = new DotNetAssemblyProject ("C#"));
 			
 			it3.Name = "it3";
 			it4.FileName = "/test/it4";
@@ -305,14 +305,14 @@ namespace MonoDevelop.Projects
 			Solution sol1 = new Solution ();
 			cws.Items.Add (sol1);
 			sol1.RootFolder.Items.Add (it1 = new DummySolutionItem ());
-			sol1.RootFolder.Items.Add (it2 = new DotNetProject ("C#"));
+			sol1.RootFolder.Items.Add (it2 = new DotNetAssemblyProject ("C#"));
 			
 			Solution sol2 = new Solution ();
 			cws.Items.Add (sol2);
 			SolutionFolder f = new SolutionFolder ();
 			sol2.RootFolder.Items.Add (f);
-			f.Items.Add (it3 = new DotNetProject ("C#"));
-			f.Items.Add (it4 = new DotNetProject ("C#"));
+			f.Items.Add (it3 = new DotNetAssemblyProject ("C#"));
+			f.Items.Add (it4 = new DotNetAssemblyProject ("C#"));
 			
 			ws.ExtendedProperties ["data"] = d[0];
 			cws.ExtendedProperties ["data"] = d[1];
diff --git a/main/tests/UnitTests/MonoDevelop.Refactoring/ExtractMethodTests.cs b/main/tests/UnitTests/MonoDevelop.Refactoring/ExtractMethodTests.cs
index f8e8ea2d75..cf2c0516d5 100644
--- a/main/tests/UnitTests/MonoDevelop.Refactoring/ExtractMethodTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Refactoring/ExtractMethodTests.cs
@@ -72,7 +72,7 @@ namespace MonoDevelop.Refactoring.Tests
 			TestViewContent sev = new TestViewContent ();
 	//		return new RefactoringOptions ();
 			
-			DotNetProject project = new DotNetProject ("C#");
+			DotNetProject project = new DotNetAssemblyProject ("C#");
 			Solution solution = new Solution ();
 			solution.RootFolder.Items.Add (project);
 			project.FileName = "/tmp/a" + pcount + ".csproj";