Added tool to put revision number into AssemblyInfo files.

Included revision number in splash screen.
Made ReflectionClass load custom attributes.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@223 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/BackendBindings/CPPNetBinding/Project/Src/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following

src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj

@@ -73,8 +73,6 @@
       <Name>ICSharpCode.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <Folder Include="Src\PrettyPrinter\Gui\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

src/AddIns/BackendBindings/CSharpBinding/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following
@@ -11,8 +11,8 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyDescription("C# language binding for #develop")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("www.icsharpcode.net")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("(c) 2004 Mike Krueger")]
+[assembly: AssemblyProduct("SharpDevelop")]
+[assembly: AssemblyCopyright("(c) 2004-2005 Mike Krüger, 2005 Daniel Grunwald")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

src/AddIns/BackendBindings/ILAsmBinding/Project/Src/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following

src/AddIns/BackendBindings/VBNetBinding/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following
@@ -11,8 +11,8 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyDescription("VB.NET language binding for #develop")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("www.icsharpcode.net")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("(c) 2005 Mike Krueger, Markus Palme")]
+[assembly: AssemblyProduct("SharpDevelop")]
+[assembly: AssemblyCopyright("(c) 2005 Mike Krüger, Markus Palme")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

src/AddIns/BackendBindings/WixBinding/Project/Src/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following

src/AddIns/DisplayBindings/AssemblyScout/Project/Src/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Georg Brandl" email="g.brandl@gmx.net"/>

src/AddIns/DisplayBindings/FormDesigner/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
@@ -16,9 +16,9 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTitle("SharpDevelopFormDesigner")]
 [assembly: AssemblyDescription("A Windows.Forms designer implementation")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("IC#Code")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("(c) 2002-2003 by Mike Krueger")]
+[assembly: AssemblyCompany("www.icsharpcode.net")]
+[assembly: AssemblyProduct("SharpDevelop")]
+[assembly: AssemblyCopyright("(c) 2002-2005 by Mike Krüger")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

src/AddIns/DisplayBindings/ResourceEditor/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following
@@ -11,7 +11,7 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyDescription("Resource editor display binding for #develop")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("www.icsharpcode.net")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyProduct("SharpDevelop")]
 [assembly: AssemblyCopyright("(c) Mike Krueger/Markus Palme")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

src/AddIns/Misc/AddinScout/Project/Src/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following
@@ -10,8 +10,8 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTitle("AddInScout")]
 [assembly: AssemblyDescription("Display AddIn Information")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyCompany("www.icsharpcode.net")]
+[assembly: AssemblyProduct("SharpDevelop")]
 [assembly: AssemblyCopyright("Satguru P Srivastava")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 //
@@ -6,11 +6,11 @@ using System.Runtime.CompilerServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 //
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("SharpDevelop Debugger")]
+[assembly: AssemblyDescription("Debugger for SharpDevelop")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyCompany("www.icsharpcode.net")]
+[assembly: AssemblyProduct("SharpDevelop")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]		
@@ -26,7 +26,7 @@ using System.Runtime.CompilerServices;
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("2.0.0.1")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

src/AddIns/Misc/Debugger/Debugger.Core/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 //
@@ -6,11 +6,11 @@ using System.Runtime.CompilerServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 //
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("Debugger Library")]
+[assembly: AssemblyDescription("Library for debugging .NET applications")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyCompany("www.icsharpcode.net")]
+[assembly: AssemblyProduct("SharpDevelop")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]		
@@ -26,7 +26,7 @@ using System.Runtime.CompilerServices;
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("2.0.0.1")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

src/AddIns/Misc/FiletypeRegisterer/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following
@@ -10,9 +10,9 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTitle("FiletypeRegisterer")]
 [assembly: AssemblyDescription("Registers file types for #develop")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Georg Brandl")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("(C) 2002")]
+[assembly: AssemblyCompany("www.icsharpcode.net")]
+[assembly: AssemblyProduct("SharpDevelop")]
+[assembly: AssemblyCopyright("(C) Georg Brandl, 2002")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

src/AddIns/Misc/HighlightingEditor/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following
@@ -10,9 +10,9 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTitle("HighlightingEditor")]
 [assembly: AssemblyDescription("Editor for editor highlighting styles in #develop")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Georg Brandl")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("(C) 2003")]
+[assembly: AssemblyCompany("www.icsharpcode.net")]
+[assembly: AssemblyProduct("SharpDevelop")]
+[assembly: AssemblyCopyright("(C) Georg Brandl, 2003")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

src/AddIns/Misc/NUnitPad/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following
@@ -7,11 +7,11 @@ using System.Runtime.CompilerServices;
 // change them to the information which is associated with the assembly
 // you compile.
 
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("NUnitPad Addin")]
+[assembly: AssemblyDescription("Addin to launch NUnit tests inside SharpDevelop")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyCompany("www.icsharpcode.net")]
+[assembly: AssemblyProduct("SharpDevelop")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

src/AddIns/Misc/ProjectImporterExporter/Project/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Security; 

src/AddIns/Misc/RegExpTk/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following
@@ -11,7 +11,7 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyDescription("Regular expression toolkit")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("www.icsharpcode.net")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyProduct("SharpDevelop")]
 [assembly: AssemblyCopyright("(c) 2004 Markus Palme")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

src/AddIns/Misc/StartPage/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following
@@ -10,9 +10,9 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTitle("StartPage")]
 [assembly: AssemblyDescription("VS style Start Page for #develop")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Georg Brandl")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("(C) 2002")]
+[assembly: AssemblyCompany("www.icsharpcode.net")]
+[assembly: AssemblyProduct("SharpDevelop")]
+[assembly: AssemblyCopyright("(C) Georg Brandl, 2002; Daniel Grunwald, 2005")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

src/AddIns/Misc/SubversionAddIn/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following
@@ -7,12 +7,12 @@ using System.Runtime.CompilerServices;
 // change them to the information which is associated with the assembly
 // you compile.
 
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("SubversionAddin")]
+[assembly: AssemblyDescription("Adds subversion support to SharpDevelop")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
+[assembly: AssemblyCompany("www.icsharpcode.net")]
+[assembly: AssemblyProduct("SharpDevelop")]
+[assembly: AssemblyCopyright("(c) Mike Krüger, 2005; Daniel Grunwald, 2005")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

src/AddIns/Wizards/MessageBoxBuilder/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Mike Krüger" email="mike@icsharpcode.net"/>

src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Mike Krüger" email="mike@icsharpcode.net"/>

src/Libraries/ICSharpCode.TextEditor/Test/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following

src/Libraries/NRefactory/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following
@@ -7,11 +7,11 @@ using System.Runtime.CompilerServices;
 // change them to the information which is associated with the assembly
 // you compile.
 
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("NRefactory")]
+[assembly: AssemblyDescription("Parser and refactoring library for C# and VB.NET")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyCompany("www.icsharpcode.net")]
+[assembly: AssemblyProduct("SharpDevelop")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

src/Libraries/NRefactory/Test/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following

src/Main/Base/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Mike Krger" email="mike@icsharpcode.net"/>
@@ -12,12 +12,12 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTitle("SharpDevelopBase")]
 [assembly: AssemblyDescription("The base add-in of SharpDevelop")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("www.icsharpcode.net")]
 [assembly: AssemblyProduct("SharpDevelop")]
-[assembly: AssemblyCopyright("Mike Krueger 2000-2005")]
+[assembly: AssemblyCopyright("Mike Krüger 2000-2005, Daniel Grunwald 2005")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 [assembly: AssemblyVersion("2.0.0.1")]
 
-[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyDelaySign(false)]

src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@@ -42,8 +42,8 @@
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.XML" />
-    <Reference Include="Microsoft.Build.Framework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <Reference Include="Microsoft.Build.Engine, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="Microsoft.Build.Engine" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Src\Internal\ExternalTool\ExternalTool.cs" />
@@ -697,4 +697,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
+</Project>

src/Main/Base/Project/Src/Dom/IAttribute.cs

@@ -6,7 +6,7 @@
 // </file>
 
 using System;
-using System.Collections;
+using System.Collections.Generic;
 
 namespace ICSharpCode.SharpDevelop.Dom
 {
@@ -20,11 +20,11 @@ namespace ICSharpCode.SharpDevelop.Dom
 			get;
 		}
 		
-		ArrayList PositionalArguments { // [expression]
+		List<AttributeArgument> PositionalArguments {
 			get;
 		}
 		
-		SortedList NamedArguments { // string/expression
+		SortedList<string, AttributeArgument> NamedArguments {
 			get;
 		}
 	}
@@ -42,4 +42,16 @@ namespace ICSharpCode.SharpDevelop.Dom
 		Return,
 		Type
 	}
+	
+	public struct AttributeArgument
+	{
+		public readonly IReturnType Type;
+		public readonly object Value;
+		
+		public AttributeArgument(IReturnType type, object value)
+		{
+			this.Type = type;
+			this.Value = value;
+		}
+	}
 }

src/Main/Base/Project/Src/Dom/Implementations/DefaultAttribute.cs

@@ -13,18 +13,21 @@ namespace ICSharpCode.SharpDevelop.Dom
 	public class DefaultAttribute : IAttribute
 	{
 		string name;
-		ArrayList positionalArguments;
-		SortedList namedArguments;
+		List<AttributeArgument> positionalArguments;
+		SortedList<string, AttributeArgument> namedArguments;
 		AttributeTarget attributeTarget;
 		
-		public DefaultAttribute(string name)
+		public DefaultAttribute(string name) : this(name, AttributeTarget.None) {}
+		
+		public DefaultAttribute(string name, AttributeTarget attributeTarget)
 		{
 			this.name = name;
-			this.positionalArguments = new ArrayList();
-			this.namedArguments = new SortedList();
+			this.attributeTarget = attributeTarget;
+			this.positionalArguments = new List<AttributeArgument>();
+			this.namedArguments = new SortedList<string, AttributeArgument>();
 		}
 		
-		public DefaultAttribute(string name, AttributeTarget attributeTarget, ArrayList positionalArguments, SortedList namedArguments)
+		public DefaultAttribute(string name, AttributeTarget attributeTarget, List<AttributeArgument> positionalArguments, SortedList<string, AttributeArgument> namedArguments)
 		{
 			this.name = name;
 			this.attributeTarget = attributeTarget;
@@ -50,13 +53,13 @@ namespace ICSharpCode.SharpDevelop.Dom
 			}
 		}
 		
-		public ArrayList PositionalArguments { // [expression]
+		public List<AttributeArgument> PositionalArguments {
 			get {
 				return positionalArguments;
 			}
 		}
 		
-		public SortedList NamedArguments { // string/expression
+		public SortedList<string, AttributeArgument> NamedArguments {
 			get {
 				return namedArguments;
 			}
@@ -70,12 +73,7 @@ namespace ICSharpCode.SharpDevelop.Dom
 				return cmp;
 			}
 			
-			cmp = DiffUtility.Compare(PositionalArguments, value.PositionalArguments);
-			if (cmp != 0) {
-				return cmp;
-			}
-			
-			return DiffUtility.Compare(NamedArguments, value.NamedArguments);
+			return DiffUtility.Compare(PositionalArguments, value.PositionalArguments);
 		}
 		
 		int IComparable.CompareTo(object value) {

src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryASTConvertVisitor.cs

@@ -208,11 +208,11 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
 				}
 				
 				foreach (AST.Attribute attribute in section.Attributes) {
-					IAttribute a = new DefaultAttribute(attribute.Name, target, new ArrayList(attribute.PositionalArguments), new SortedList());
-					foreach (AST.NamedArgumentExpression n in attribute.NamedArguments) {
-						a.NamedArguments[n.Name] = n.Expression;
-					}
-					result.Add(a);
+					//IAttribute a = new DefaultAttribute(attribute.Name, target, new ArrayList(attribute.PositionalArguments), new SortedList());
+					//foreach (AST.NamedArgumentExpression n in attribute.NamedArguments) {
+					//	a.NamedArguments[n.Name] = n.Expression;
+					//}
+					result.Add(new DefaultAttribute(attribute.Name, target));
 				}
 			}
 			return result;

src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs

@@ -197,7 +197,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
 		{
 			string attributeName = GetAttributeName(expr);
 			IClass c = GetAttribute(attributeName);
-			if (attributeName != null) {
+			if (c != null) {
 				return new TypeResolveResult(callingClass, callingMember, c);
 			} else if (expr is InvocationExpression) {
 				InvocationExpression ie = (InvocationExpression)expr;

src/Main/Base/Project/Src/Dom/ReflectionLayer/ReflectionClass.cs

@@ -7,9 +7,10 @@
 
 using System;
 using System.Collections;
-using System.Xml;
+//using System.Xml;
 using System.Reflection;
 using System.Collections.Generic;
+using ICSharpCode.Core;
 
 namespace ICSharpCode.SharpDevelop.Dom
 {
@@ -155,6 +156,22 @@ namespace ICSharpCode.SharpDevelop.Dom
 		}
 		#endregion
 		
+		static void AddAttributes(IProjectContent pc, List<IAttribute> list, IList<CustomAttributeData> attributes)
+		{
+			foreach (CustomAttributeData att in attributes) {
+				DefaultAttribute a = new DefaultAttribute(att.Constructor.DeclaringType.FullName);
+				foreach (CustomAttributeTypedArgument arg in att.ConstructorArguments) {
+					IReturnType type = ReflectionReturnType.Create(pc, arg.ArgumentType, false);
+					a.PositionalArguments.Add(new AttributeArgument(type, arg.Value));
+				}
+				foreach (CustomAttributeNamedArgument arg in att.NamedArguments) {
+					IReturnType type = ReflectionReturnType.Create(pc, arg.TypedValue.ArgumentType, false);
+					a.NamedArguments.Add(arg.MemberInfo.Name, new AttributeArgument(type, arg.TypedValue.Value));
+				}
+				list.Add(a);
+			}
+		}
+		
 		public ReflectionClass(ICompilationUnit compilationUnit, Type type, IClass declaringType) : base(compilationUnit, declaringType)
 		{
 			this.type = type;
@@ -165,6 +182,12 @@ namespace ICSharpCode.SharpDevelop.Dom
 				FullyQualifiedName = name;
 			}
 			
+			try {
+				AddAttributes(compilationUnit.ProjectContent, this.Attributes, CustomAttributeData.GetCustomAttributes(type));
+			} catch (Exception ex) {
+				ICSharpCode.Core.MessageService.ShowError(ex);
+			}
+			
 			// set classtype
 			if (type.IsInterface) {
 				this.ClassType = ClassType.Interface;
@@ -175,8 +198,13 @@ namespace ICSharpCode.SharpDevelop.Dom
 			} else if (IsDelegate(type)) {
 				this.ClassType = ClassType.Delegate;
 			} else {
-				// TODO: Check if class is a module.
 				this.ClassType = ClassType.Class;
+				foreach (IAttribute att in this.Attributes) {
+					if (att.Name == "Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute") {
+						this.ClassType = ClassType.Module;
+						break;
+					}
+				}
 			}
 			if (type.IsGenericTypeDefinition) {
 				foreach (Type g in type.GetGenericArguments()) {

src/Main/Base/Project/Src/Services/ParserService/DefaultProjectContent.cs

@@ -437,6 +437,10 @@ namespace ICSharpCode.Core
 				if (list.Capacity < newCapacity)
 					list.Capacity = newCapacity;
 				foreach (IClass c in ns.Classes) {
+					if (c.IsInternal && !lookInReferences) {
+						// internal class and we are looking at it from another project content
+						continue;
+					}
 					if (language.ShowInNamespaceCompletion(c))
 						list.Add(c);
 					if (language.ImportModules && c.ClassType == ClassType.Module) {

src/Main/Base/Project/Src/Services/ParserService/ProjectContentRegistry.cs

@@ -135,11 +135,12 @@ namespace ICSharpCode.Core
 		{
 			// GAC Assemblies take some time because first the non-GAC try
 			// has to fail.
-			// Therefore, the most assemblies already used by SharpDevelop
-			// are used directly.
+			// Therefore, assemblies already in use by SharpDevelop are used directly.
 			switch (shortName) {
 				case "System": // System != mscorlib !!!
 					return typeof(Uri).Assembly;
+				case "System.Data":
+					return typeof(System.Data.DataException).Assembly;
 				case "System.Design":
 					return typeof(System.ComponentModel.Design.DesignSurface).Assembly;
 				case "System.DirectoryServices":
@@ -150,8 +151,13 @@ namespace ICSharpCode.Core
 					return typeof(System.Web.Services.WebService).Assembly;
 				case "System.Windows.Forms":
 					return typeof(System.Windows.Forms.Control).Assembly;
+				case "System.Xml":
 				case "System.XML":
 					return typeof(XmlReader).Assembly;
+				case "Microsoft.Build.Engine":
+					return typeof(Microsoft.Build.BuildEngine.BuildSettings).Assembly;
+				case "Microsoft.Build.Framework":
+					return typeof(Microsoft.Build.Framework.LoggerVerbosity).Assembly;
 				default:
 					return null;
 			}

src/Main/Base/Test/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following

src/Main/Core/Project/Configuration/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Mike Krger" email="mike@icsharpcode.net"/>
@@ -13,12 +13,12 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTitle("ICSharpCode.Core")]
 [assembly: AssemblyDescription("The ICSharpCode Core containing the AddInTree and service Subsystem")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("www.icsharpcode.net")]
 [assembly: AssemblyProduct("ICSharpCode.Core")]
-[assembly: AssemblyCopyright("Mike Krueger 2000-2005")]
+[assembly: AssemblyCopyright("Mike Krüger 2000-2005")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("3.0.0.1")]
+[assembly: AssemblyVersion("2.0.0.1")]
 
 [assembly: AssemblyDelaySign(false)]

src/Main/Core/Test/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following

src/Main/StartUp/Project/Configuration/AssemblyInfo.cs

@@ -1,24 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Krueger" email="mike@icsharpcode.net"/>
-//     <version value="$version"/>
-// </file>
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly:CLSCompliant(true)]
-
-[assembly: AssemblyTitle("SharpDevelop")]
-[assembly: AssemblyDescription("free .NET IDE")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SharpDevelop")]
-[assembly: AssemblyCopyright("Mike Krueger 2000-2005")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: AssemblyVersion("2.0.0.1")]
-
-[assembly: AssemblyDelaySign(false)]

src/Main/StartUp/Project/Configuration/AssemblyInfo.template

@@ -0,0 +1,33 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
+//     <version value="$version"/>
+// </file>
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: CLSCompliant(true)]
+
+// DO NOT EDIT AssemblyInfo.cs, it is recreated using AssemblyInfo.template whenever
+// StartUp is compiled.
+
+[assembly: AssemblyTitle("SharpDevelop")]
+[assembly: AssemblyDescription("free .NET IDE")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("www.icsharpcode.net")]
+[assembly: AssemblyProduct("SharpDevelop")]
+[assembly: AssemblyCopyright("Mike Krüger 2000-2005")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: AssemblyVersion(RevisionClass.Version + "." + RevisionClass.Revision)]
+
+[assembly: AssemblyDelaySign(false)]
+
+class RevisionClass {
+	public const string Version = "2.0.0";
+	public const string Revision = "-INSERTREVISION-";
+}

src/Main/StartUp/Project/Dialogs/SplashScreen.cs

@@ -9,7 +9,7 @@ namespace ICSharpCode.SharpDevelop
 {
 	public class SplashScreenForm : Form
 	{
-		public const string VersionText = "Corsavy alpha";
+		public const string VersionText = "Corsavy alpha rev. " + RevisionClass.Revision;
 		
 		static SplashScreenForm splashScreen = new SplashScreenForm();
 		static ArrayList requestedFileList = new ArrayList();

src/Main/StartUp/Project/StartUp.csproj

@@ -9,11 +9,11 @@
     <WarningLevel>4</WarningLevel>
     <NoStdLib>False</NoStdLib>
     <NoConfig>False</NoConfig>
-    <RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Resources\StartUp.snk</AssemblyOriginatorKeyFile>
     <OutputType>Exe</OutputType>
     <ApplicationIcon>.\Resources\SharpDevelop.ico</ApplicationIcon>
+    <PreBuildEvent>..\src\Tools\UpdateAssemblyInfo\bin\Debug\UpdateAssemblyInfo.exe StartupOnly</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -53,6 +53,7 @@
     <EmbeddedResource Include="Resources\SplashScreen.jpg" />
     <EmbeddedResource Include="Resources\StringResources.resources" />
     <Compile Include="Configuration\AssemblyInfo.cs" />
+    <None Include="Configuration\AssemblyInfo.template" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Base\Project\ICSharpCode.SharpDevelop.csproj">

src/SharpDevelop.sln

@@ -1,5 +1,35 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # SharpDevelop 2.0.0.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
@@ -48,36 +78,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\St
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -159,6 +159,17 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{4980B743-B32F-4aba-AABD-45E2CAD3568D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
 		{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
 		{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
 		{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
@@ -177,16 +188,5 @@ Global
 		{B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
 		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
 		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
-		{98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{4980B743-B32F-4aba-AABD-45E2CAD3568D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 	EndGlobalSection
 EndGlobal

src/Tools/UpdateAssemblyInfo/Main.cs

@@ -0,0 +1,219 @@
+/*
+ * Created by SharpDevelop.
+ * User: Daniel Grunwald
+ * Date: 21.07.2005
+ * Time: 12:00
+ */
+using System;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections.Specialized;
+
+namespace UpdateAssemblyInfo
+{
+	// Updates the version numbers in the assembly information.
+	class MainClass
+	{
+		static Regex AssemblyVersion = new Regex(@"AssemblyVersion\(.*\)]");
+		const string mainConfig = "Main/StartUp/Project/Configuration/";
+		
+		public static int Main(string[] args)
+		{
+			try {
+				if (args.Length != 1) {
+					PrintHelp();
+					return 1;
+				}
+				
+				if (!File.Exists("SharpDevelop.sln")) {
+					if (File.Exists("..\\src\\SharpDevelop.sln")) {
+						Directory.SetCurrentDirectory("..\\src");
+					}
+				}
+				if (!File.Exists("SharpDevelop.sln")) {
+					Console.WriteLine("Working directory must be SharpDevelop\\src or SharpDevelop\\bin!");
+					return 2;
+				}
+				string arg = args[0];
+				if (arg == "StartupOnly") {
+					RetrieveRevisionNumber();
+					UpdateStartup();
+				} else if (arg == "Libraries") {
+					RetrieveRevisionNumber();
+					UpdateLibraries(GetMajorVersion() + "." + revisionNumber);
+				} else if (arg == "ResetLibraries") {
+					UpdateLibraries("2.0.0.1");
+				} else {
+					PrintHelp();
+					return 1;
+				}
+				return 0;
+			} catch (Exception ex) {
+				Console.WriteLine(ex);
+				return 3;
+			}
+		}
+		
+		static void PrintHelp()
+		{
+			Console.WriteLine("Application must be started with 1 argument:");
+			Console.WriteLine("UpdateAssemblyInfo StartupOnly    // updates version info in Startup project");
+			Console.WriteLine("UpdateAssemblyInfo Libraries      // updates all versions in the libraries, but not in Startup");
+			Console.WriteLine("UpdateAssemblyInfo ResetLibraries // resets versions in the libraries to 2.0.0.1 (use this before committing)");
+		}
+		
+		static void UpdateStartup()
+		{
+			string content;
+			using (StreamReader r = new StreamReader(mainConfig + "AssemblyInfo.template")) {
+				content = r.ReadToEnd();
+			}
+			using (StreamWriter w = new StreamWriter(mainConfig + "AssemblyInfo.cs", false, Encoding.UTF8)) {
+				w.Write(content.Replace("-INSERTREVISION-", revisionNumber));
+			}
+		}
+		
+		static string GetMajorVersion()
+		{
+			string version = "?";
+			// Get main version from startup
+			using (StreamReader r = new StreamReader(mainConfig + "AssemblyInfo.template")) {
+				string line;
+				while ((line = r.ReadLine()) != null) {
+					const string search = "string Version = \"";
+					int pos = line.IndexOf(search);
+					if (pos >= 0) {
+						int e = line.IndexOf('"', pos + search.Length + 1);
+						version = line.Substring(pos + search.Length, e - pos - search.Length);
+						break;
+					}
+				}
+			}
+			return version;
+		}
+		
+		static void UpdateLibraries(string versionNumber)
+		{
+			StringCollection col = SearchDirectory("AddIns", "AssemblyInfo.cs");
+			SearchDirectory("Main", "AssemblyInfo.cs", col);
+			SearchDirectory("Libraries", "AssemblyInfo.cs", col);
+			string[] dontTouchList = new string[] {
+				"Main/StartUp/Project/", // Startup is special case
+				"Libraries/log4net/",
+				"Libraries/DockPanel_Src/",
+				"AddIns/Misc/Debugger/TreeListView/Project/",
+			};
+			foreach (string fileName in col) {
+				bool doSetVersion = true;
+				foreach (string dontTouch in dontTouchList) {
+					if (fileName.StartsWith(dontTouch.Replace("/", Path.DirectorySeparatorChar.ToString()))) {
+						doSetVersion = false;
+						break;
+					}
+				}
+				if (doSetVersion) {
+					Console.WriteLine("Set revision to file: " + fileName + " to " + versionNumber);
+					SetVersionInfo(fileName, versionNumber);
+				}
+			}
+		}
+		
+		#region SearchDirectory
+		static StringCollection SearchDirectory(string directory, string filemask)
+		{
+			StringCollection collection = new StringCollection();
+			SearchDirectory(directory, filemask, collection);
+			return collection;
+		}
+		
+		static void SearchDirectory(string directory, string filemask, StringCollection collection)
+		{
+			try {
+				string[] file = Directory.GetFiles(directory, filemask);
+				foreach (string f in file) {
+					collection.Add(f);
+				}
+				
+				string[] dir = Directory.GetDirectories(directory);
+				foreach (string d in dir) {
+					if (d.EndsWith("\\.svn")) continue;
+					SearchDirectory(d, filemask, collection);
+				}
+			} catch (Exception ex) {
+				Console.WriteLine(ex);
+			}
+		}
+		#endregion
+		
+		static void SetVersionInfo(string fileName, string version)
+		{
+			StreamReader inFile = null;
+			string       content;
+			
+			try {
+				inFile  = new StreamReader(fileName);
+				content = inFile.ReadToEnd();
+			} catch (Exception e) {
+				Console.WriteLine(e);
+				return;
+			} finally {
+				if (inFile != null) {
+					inFile.Close();
+				}
+			}
+			
+			if (content != null) {
+				string newContent = AssemblyVersion.Replace(content, "AssemblyVersion(\"" + version + "\")]");
+				if (newContent == content)
+					return;
+				using (StreamWriter outFile = new StreamWriter(fileName, false, Encoding.UTF8)) {
+					outFile.Write(newContent);
+				}
+			}
+		}
+		
+		#region Retrieve Revision Number
+		static string revisionNumber = "0";
+		static string ReadRevisionFromFile()
+		{
+			try {
+				using (StreamReader reader = new StreamReader(@"..\REVISION")) {
+					return reader.ReadLine();
+				}
+			}
+			catch (Exception e) {
+				Console.WriteLine(e.Message);
+				throw new Exception("Cannot read revision number from file: " + e.Message);
+			}
+		}
+		static void RetrieveRevisionNumber()
+		{
+			System.Diagnostics.ProcessStartInfo psi = new System.Diagnostics.ProcessStartInfo("svn", "info");
+			psi.UseShellExecute = false;
+			psi.RedirectStandardOutput = true;
+			
+			try {
+				System.Diagnostics.Process process = System.Diagnostics.Process.Start(psi);
+				process.WaitForExit();
+				string output = process.StandardOutput.ReadToEnd();
+				
+				Regex r = new Regex(@"Revision:\s+(\d+)");
+				Match m = r.Match(output);
+				if (m != null && m.Success && m.Groups[1] != null) {
+					revisionNumber = m.Groups[1].Value;
+				}
+				if (revisionNumber == null || revisionNumber.Equals("") || revisionNumber.Equals("0")) {
+					throw new Exception("Could not find revision number in svn output");
+				}
+			} catch (Exception e) {
+				Console.WriteLine(e.Message);
+				revisionNumber = ReadRevisionFromFile();
+			}
+			if (revisionNumber == null || revisionNumber.Length == 0 || revisionNumber == "0") {
+				throw new ApplicationException("Error reading revision number");
+			}
+		}
+		#endregion
+	}
+}

src/Tools/UpdateAssemblyInfo/UpdateAssemblyInfo.csproj

@@ -0,0 +1,29 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>UpdateAssemblyInfo</RootNamespace>
+    <AssemblyName>UpdateAssemblyInfo</AssemblyName>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{605C8CDB-F0AD-4A21-9F4A-959B8DECB0F3}</ProjectGuid>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <Optimize>false</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <Optimize>true</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+</Project>

src/releasebuild.bat

@@ -1,2 +1,4 @@
+Tools\UpdateAssemblyInfo\bin\Debug\UpdateAssemblyInfo.exe Libraries
+@IF %ERRORLEVEL% NEQ 0 PAUSE & EXIT
 %windir%\microsoft.net\framework\v2.0.50215\msbuild /property:Configuration=Release
 @IF %ERRORLEVEL% NEQ 0 PAUSE

src/resetAssemblyInfo.bat

@@ -0,0 +1,4 @@
+@rem Resets version information in libraries with "2.0.0.1"
+@rem Execute this file to prevent committing changes to the assembly information.
+Tools\UpdateAssemblyInfo\bin\Debug\UpdateAssemblyInfo.exe ResetLibraries
+@IF %ERRORLEVEL% NEQ 0 PAUSE