* MonoDevelop.Projects/DotNetProjectConfiguration.cs: If the outputmonodevelop-0.13

  assembly name already has an extension, don't add a new one.
* MonoDevelop.Projects.Parser/AssemblyCodeCompletionDatabase.cs: When
  an assembly is being parsed, ignore file modification checks. Fixes
  bug #80704.

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

3 files changed, 22 insertions, 1 deletions

diff --git a/Core/src/MonoDevelop.Projects/ChangeLog b/Core/src/MonoDevelop.Projects/ChangeLog
index 4fa063f428..c022ac3d79 100644
--- a/Core/src/MonoDevelop.Projects/ChangeLog
+++ b/Core/src/MonoDevelop.Projects/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-21  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.Projects/DotNetProjectConfiguration.cs: If the output
+	  assembly name already has an extension, don't add a new one.
+	* MonoDevelop.Projects.Parser/AssemblyCodeCompletionDatabase.cs: When
+	  an assembly is being parsed, ignore file modification checks. Fixes
+	  bug #80704.
+
 2007-02-19  Ankit Jain  <jankit@novell.com>
 
 	* MdsFileFormat.cs (WriteFile): Write to a temp file first, and only overwrite the
diff --git a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/AssemblyCodeCompletionDatabase.cs b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/AssemblyCodeCompletionDatabase.cs
index 23545a4cfd..3b75170d46 100644
--- a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/AssemblyCodeCompletionDatabase.cs
+++ b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Parser/AssemblyCodeCompletionDatabase.cs
@@ -47,6 +47,7 @@ namespace MonoDevelop.Projects.Parser
 		string assemblyName;
 		bool loadError;
 		bool isPackageAssembly;
+		bool parsing;
 		
 		// This is the package version of the assembly. It is serialized.
 		string packageVersion;
@@ -105,6 +106,9 @@ namespace MonoDevelop.Projects.Parser
 		
 		protected override bool IsFileModified (FileEntry file)
 		{
+			if (parsing)
+				return false;
+				
 			if (!isPackageAssembly)
 				return base.IsFileModified (file);
 
@@ -158,6 +162,7 @@ namespace MonoDevelop.Projects.Parser
 				packageVersion = pkg.Name + " " + pkg.Version;
 				
 			try {
+				parsing = true;
 				monitor.BeginTask ("Parsing assembly: " + Path.GetFileName (fileName), 1);
 				if (useExternalProcess)
 				{
@@ -194,6 +199,7 @@ namespace MonoDevelop.Projects.Parser
 				monitor.ReportError ("Error parsing assembly: " + fileName, ex);
 				throw;
 			} finally {
+				parsing = false;
 				monitor.EndTask ();
 				if (parentMonitor == null) monitor.Dispose ();
 			}
diff --git a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProjectConfiguration.cs b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProjectConfiguration.cs
index 6b4a9b212f..61c9590559 100644
--- a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProjectConfiguration.cs
+++ b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProjectConfiguration.cs
@@ -91,7 +91,14 @@ namespace MonoDevelop.Projects
 		}
 		
 		public string CompiledOutputName {
-			get { return Path.Combine (OutputDirectory, OutputAssembly) + (CompileTarget == CompileTarget.Library ? ".dll" : ".exe"); }
+			get {
+				string ext;
+				if (OutputAssembly.EndsWith (".dll") || OutputAssembly.EndsWith (".exe"))
+					ext = "";
+				else
+					ext = CompileTarget == CompileTarget.Library ? ".dll" : ".exe";
+				return Path.Combine (OutputDirectory, OutputAssembly) + ext;
+			}
 		}
 		
 		public string SourceDirectory {