Merged SD 2.1/2.2 revision 2532:2560 to trunk.

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

data/schemas/wixloc.xsd

@@ -5,14 +5,6 @@
     <xs:annotation>
         <xs:documentation>
             Copyright (c) Microsoft Corporation.  All rights reserved.
-            
-            The use and distribution terms for this software are covered by the
-            Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
-            which can be found in the file CPL.TXT at the root of this distribution.
-            By using this software in any fashion, you are agreeing to be bound by
-            the terms of this license.
-            
-            You must not remove this notice, or any other, from this software.
 
             Schema for describing Windows Installer Xml Localization files (.wxl).
         </xs:documentation>

data/templates/project/CSharp/ConsoleProject.xpt

@@ -37,7 +37,7 @@ namespace ${StandardNamespace}
 			// TODO: Implement Functionality Here
 			
 			Console.Write("Press any key to continue . . . ");
-			Console.ReadKey();
+			Console.ReadKey(true);
 		}
 	}
 }]]></File>

data/templates/project/VBNet/ConsoleProject.xpt

@@ -47,7 +47,7 @@ Module Program
 		' TODO: Implement Functionality Here
 		
 		Console.Write("Press any key to continue . . . ")
-		Console.ReadKey()
+		Console.ReadKey(True)
 	End Sub
 End Module
 ]]></File>

samples/CSharpCodeCompletion/CodeCompletionKeyHandler.cs

@@ -12,7 +12,7 @@
 //   of conditions and the following disclaimer in the documentation and/or other materials 
 //   provided with the distribution.
 // 
-// - Neither the name of the ICSharpCode nor the names of its contributors may be used to 
+// - Neither the name of the ICSharpCode team nor the names of its contributors may be used to 
 //   endorse or promote products derived from this software without specific prior written 
 //   permission.
 // 

samples/CSharpCodeCompletion/CodeCompletionProvider.cs

@@ -12,7 +12,7 @@
 //   of conditions and the following disclaimer in the documentation and/or other materials
 //   provided with the distribution.
 // 
-// - Neither the name of the ICSharpCode nor the names of its contributors may be used to
+// - Neither the name of the ICSharpCode team nor the names of its contributors may be used to
 //   endorse or promote products derived from this software without specific prior written
 //   permission.
 // 

samples/CSharpCodeCompletion/HostCallbackImplementation.cs

@@ -12,7 +12,7 @@
 //   of conditions and the following disclaimer in the documentation and/or other materials
 //   provided with the distribution.
 // 
-// - Neither the name of the ICSharpCode nor the names of its contributors may be used to
+// - Neither the name of the ICSharpCode team nor the names of its contributors may be used to
 //   endorse or promote products derived from this software without specific prior written
 //   permission.
 // 

samples/CSharpCodeCompletion/MainForm.Designer.cs

@@ -1,10 +1,4 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
-//     <version>$Revision$</version>
-// </file>
-namespace CSharpEditor
+namespace CSharpEditor
 {
 	partial class MainForm : System.Windows.Forms.Form
 	{

samples/CSharpCodeCompletion/MainForm.cs

@@ -12,7 +12,7 @@
 //   of conditions and the following disclaimer in the documentation and/or other materials
 //   provided with the distribution.
 // 
-// - Neither the name of the ICSharpCode nor the names of its contributors may be used to
+// - Neither the name of the ICSharpCode team nor the names of its contributors may be used to
 //   endorse or promote products derived from this software without specific prior written
 //   permission.
 // 

samples/CodonCreation/ReadTestCodonCommand.cs

@@ -1,5 +1,33 @@
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using ICSharpCode.Core;
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
@@ -10,7 +38,7 @@ namespace CodonCreation
 	{
 		public override void Run()
 		{
-			TestCodon[] testCodons = (TestCodon[])(AddInTree.GetTreeNode("/Samples/CodonCreation").BuildChildItems(this)).ToArray(typeof(TestCodon));
+			List<TestCodon> testCodons = AddInTree.BuildItems<TestCodon>("/Samples/CodonCreation", this);
 			
 			StringBuilder message = new StringBuilder();
 			foreach (TestCodon codon in testCodons) {

samples/CodonCreation/TestCodon.cs

@@ -1,3 +1,30 @@
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using System;
 
 namespace CodonCreation
@@ -11,17 +38,17 @@ namespace CodonCreation
 	/// </remarks>
 	public class TestCodon
 	{
-        string text  = String.Empty;
-        
-        public TestCodon(string text)
-        {
-        	this.text = text;
-        }
-        
-        public string Text {
-        	get {
-        		return text;
-        	}
-        }
+		string text  = String.Empty;
+		
+		public TestCodon(string text)
+		{
+			this.text = text;
+		}
+		
+		public string Text {
+			get {
+				return text;
+			}
+		}
 	}
 }

samples/CodonCreation/TestDoozer.cs

@@ -1,3 +1,30 @@
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using ICSharpCode.Core;
 using System;
 using System.Collections;
@@ -5,7 +32,7 @@ using System.Collections;
 namespace CodonCreation
 {
 	/// <summary>
-	/// Class that can build an object out of a Codon in the .addin file. 
+	/// Class that can build an object out of a Codon in the .addin file.
 	/// </summary>
 	/// <remarks>http://en.wikipedia.org/wiki/Fraggle_Rock#Doozers</remarks>
 	public class TestDoozer : IDoozer
@@ -16,7 +43,7 @@ namespace CodonCreation
 		
 		/// <summary>
 		/// Gets if the doozer handles codon conditions on its own.
-		/// If this property return false, the item is excluded when the 
+		/// If this property return false, the item is excluded when the
 		/// condition is not met.
 		/// </summary>
 		public bool HandleConditions {

samples/CustomPad/MyCustomPad.cs

@@ -1,3 +1,29 @@
+// SharpDevelop samples
+// Copyright (c) 2007, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;

samples/CustomView/MyCustomView.cs

@@ -1,3 +1,29 @@
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using ICSharpCode.SharpDevelop.Gui;
 using System;

samples/CustomView/ShowCustomViewCommand.cs

@@ -1,3 +1,29 @@
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;

samples/DisplayBindings/AlternateEditor/AlternateEditorDisplayBinding.cs

@@ -1,3 +1,29 @@
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;

samples/DisplayBindings/AlternateEditor/Editor.cs

@@ -1,3 +1,29 @@
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using ICSharpCode.SharpDevelop.Gui;
 using System;

samples/DisplayBindings/HtmlPreview/HtmlPreview.addin

@@ -1,6 +1,5 @@
 <AddIn name        = "HtmlPreview"
-       author      = "Daniel Grunwald"
-       copyright   = "GNU Lesser General Public License">
+       author      = "Daniel Grunwald">
 	
 	<Runtime>
 		<Import assembly = "HtmlPreview.dll"/>

samples/DisplayBindings/HtmlPreview/Src/PreviewDisplayBinding.cs

@@ -1,9 +1,29 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 19.10.2005
- * Time: 17:02
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
 using ICSharpCode.Core;

samples/DisplayBindings/HtmlPreview/Src/PreviewViewContent.cs

@@ -1,9 +1,29 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 19.10.2005
- * Time: 15:53
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
 using System.Windows.Forms;

samples/DisplayBindings/ImageViewer/ImageViewer.addin

@@ -1,6 +1,5 @@
 <AddIn name        = "ImageViewer"
-       author      = "Daniel Grunwald"
-       copyright   = "GNU Lesser General Public License">
+       author      = "Daniel Grunwald">
 	
 	<Runtime>
 		<Import assembly = "ImageViewer.dll"/>

samples/DisplayBindings/ImageViewer/Src/ImageViewContent.cs

@@ -1,9 +1,29 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 19.10.2005
- * Time: 21:43
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
 using System.IO;

samples/DisplayBindings/ImageViewer/Src/ImageViewerDisplayBinding.cs

@@ -1,9 +1,30 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 19.10.2005
- * Time: 21:41
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using System;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;

samples/HtmlSyntaxColorizer/HtmlWriter.cs

@@ -1,9 +1,29 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <author name="Daniel Grunwald"/>
-//     <version>$Revision$</version>
-// </file>
+// SharpDevelop samples
+// Copyright (c) 2007, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
 using System.Collections.Generic;

samples/HtmlSyntaxColorizer/Main.cs

@@ -1,9 +1,30 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <author name="Daniel Grunwald"/>
-//     <version>$Revision$</version>
-// </file>
+// SharpDevelop samples
+// Copyright (c) 2007, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using System;
 using System.Diagnostics;
 using System.IO;

samples/LineCounter/Src/Command.cs

@@ -1,9 +1,29 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 09.05.2006
- * Time: 17:22
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
 using System.Text;

samples/LineCounter/Src/Extensibility.cs

@@ -1,9 +1,29 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 18.07.2006
- * Time: 17:08
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
 using ICSharpCode.Core;

samples/LineCounter/Src/ImageListHelper.cs

@@ -1,9 +1,29 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 18.07.2006
- * Time: 15:53
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
 using System.Collections.Generic;

samples/LineCounter/Src/LineCounterBrowser.cs

@@ -823,7 +823,7 @@ namespace LineCounterAddin
 		/// <param name="projectItems">The ProjectItems collection to scan.</param>
 		/// <param name="summary">The root summary data object that these
 		/// files belong to.</param>
-		private void ScanProjectItems(List<ProjectItem> projectItems, LineCountSummary summary)
+		private void ScanProjectItems(IList<ProjectItem> projectItems, LineCountSummary summary)
 		{
 			tsprgTask.Maximum += projectItems.Count;
 			foreach (ProjectItem projectItem in projectItems)

samples/LineCounter/Src/LineCounterViewContent.cs

@@ -1,10 +1,30 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 09.05.2006
- * Time: 17:53
- */
- 
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using System;
 using System.Windows.Forms;
 using ICSharpCode.SharpDevelop.Gui;

samples/NRefactoryDemo/AstView.Designer.cs

@@ -1,9 +1,30 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: ${DATE}
- * Time: ${TIME}
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 namespace NRefactoryDemo
 {
 	partial class AstView : System.Windows.Forms.UserControl

samples/NRefactoryDemo/AstView.cs

@@ -1,9 +1,29 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 07.05.2006
- * Time: 18:25
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
 using System.Collections;

samples/NRefactoryDemo/EditDialog.Designer.cs

@@ -1,9 +1,30 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: ${DATE}
- * Time: ${TIME}
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 namespace NRefactoryDemo
 {
 	partial class EditDialog : System.Windows.Forms.Form

samples/NRefactoryDemo/EditDialog.cs

@@ -1,9 +1,29 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 07.05.2006
- * Time: 19:57
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
 using System.Drawing;

samples/NRefactoryDemo/MainForm.Designer.cs

@@ -1,9 +1,30 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 07.05.2006
- * Time: 18:09
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 namespace NRefactoryDemo
 {
 	partial class MainForm : System.Windows.Forms.Form

samples/NRefactoryDemo/MainForm.cs

@@ -1,9 +1,29 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 07.05.2006
- * Time: 18:09
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
 using System.Collections.Generic;

samples/NRefactoryExample/MainForm.cs

@@ -1,3 +1,30 @@
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using System;
 using System.Collections.Generic;
 using System.Drawing;

samples/NRefactoryExample/MainForm.resx

@@ -119,8 +119,8 @@
   </resheader>
   <data name="inputTextBox.Text" xml:space="preserve">
     <value>// &lt;file&gt;
-//     &lt;copyright see="prj:///doc/copyright.txt"&gt;2002-2005 AlphaSierraPapa&lt;/copyright&gt;
-//     &lt;license see="prj:///doc/license.txt"&gt;GNU General Public License&lt;/license&gt;
+//     &lt;copyright see="prj:///doc/copyright.txt"/&gt;
+//     &lt;license see="prj:///doc/license.txt"/&gt;
 //     &lt;owner name="David Srbecký" email="dsrbecky@gmail.com"/&gt;
 //     &lt;version&gt;$Revision: 698 $&lt;/version&gt;
 // &lt;/file&gt;

samples/NRefactoryExample/WrapperGeneratorVisitor.cs

@@ -1,9 +1,29 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 09.11.2005
- * Time: 18:15
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
 using System.Collections.Generic;

samples/SdaUser/MainForm.Designer.cs

@@ -1,9 +1,30 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 26.07.2006
- * Time: 19:49
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 namespace SdaUser
 {
 	partial class MainForm : System.Windows.Forms.Form

samples/SdaUser/MainForm.cs

@@ -1,9 +1,29 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 26.07.2006
- * Time: 19:49
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
 using System.Collections.Generic;

samples/SdaUser/SharpDevelopInteraction/InteractionClass.cs

@@ -1,9 +1,30 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel Grunwald
- * Date: 28.07.2006
- * Time: 23:10
- */
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;

samples/SharpPad/SharpPad.Designer.cs

@@ -1,4 +1,30 @@
-
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 namespace SharpPad
 {
 	partial class SharpPad : System.Windows.Forms.Form

samples/SharpPad/SharpPad.cs

@@ -1,3 +1,30 @@
+// SharpDevelop samples
+// Copyright (c) 2006, AlphaSierraPapa
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must retain the above copyright notice, this list
+//   of conditions and the following disclaimer.
+//
+// - Redistributions in binary form must reproduce the above copyright notice, this list
+//   of conditions and the following disclaimer in the documentation and/or other materials
+//   provided with the distribution.
+//
+// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
+//   endorse or promote products derived from this software without specific prior written
+//   permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using System;
 using System.Collections.Generic;
 using System.Drawing;

src/AddIns/BackendBindings/Boo/BooBinding/Project/Templates/ConsoleProject.xpt

@@ -31,7 +31,13 @@ import System
 import System.Collections
 
 print "Hello, World!"
+
+// TODO: Implement Functionality Here
+
+print "Press any key to continue . . . "
+Console.ReadKey(true)
 ]]></File>
+			<File name="AssemblyInfo.boo" src="DefaultAssemblyInfo.boo"/>
 		</Files>
 	</Project>
 </Template>

src/AddIns/BackendBindings/Boo/BooBinding/Project/Templates/DefaultAssemblyInfo.boo

@@ -1,20 +1,22 @@
 import System.Reflection
 import System.Runtime.CompilerServices
+import System.Runtime.InteropServices
 
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("${ProjectName}")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("${ProjectName}")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
 
-[assembly: AssemblyTitle('')]
-[assembly: AssemblyDescription('')]
-[assembly: AssemblyConfiguration('')]
-[assembly: AssemblyCompany('')]
-[assembly: AssemblyProduct('')]
-[assembly: AssemblyCopyright('')]
-[assembly: AssemblyTrademark('')]
-[assembly: AssemblyCulture('')]
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
 
 // The assembly version has following format :
 //
@@ -23,4 +25,4 @@ import System.Runtime.CompilerServices
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.*")]

src/AddIns/BackendBindings/WixBinding/Project/Templates/WixProject.xpt

@@ -94,423 +94,20 @@
 	</Fragment>
 </Wix>
 ]]></File>
-			<File name="SelectFolderDialog.wxs"><![CDATA[<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Fragment>
-		<UI>
-			<Dialog Id="SelectFolderDialog" Width="370" Height="270" Title="[ProductName]" TrackDiskSpace="yes">
-				<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[Button_Next]">
-					<Publish Event="NewDialog" Value="VerifyReadyDialog">1</Publish>
-				</Control>
-				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[Button_Cancel]">
-					<Publish Event="SpawnDialog" Value="CancelDialog">1</Publish>
-				</Control>
-				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[Button_Back]">
-					<Publish Event="NewDialog" Value="ViewLicenseAgreement">1</Publish>
-				</Control>
-				<Control Id="FolderEdit" Type="PathEdit" X="18" Y="126" Width="252" Height="18" Property="INSTALLDIR" Sunken="yes" />
-				<Control Id="Browse" Type="PushButton" X="276" Y="126" Width="90" Height="18" Text="[Button_Browse]">
-					<Publish Property="_BrowseProperty" Value="INSTALLDIR">1</Publish>
-					<Publish Event="SpawnDialog" Value="BrowseDialog">1</Publish>
-				</Control>		
-				<Control Id="Text" Type="Text" X="25" Y="70" Width="320" Height="40">
-					<Text>To install in this folder, click "Next". To install to a different folder, enter it below or click "Browse".</Text>
-				</Control>
-				<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" FixedSize="yes" Text="banner.bmp" />
-				<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="374" Height="0" />		
-				<Control Id="BottomLine" Type="Line" X="4" Y="234" Width="370" Height="0" />	
-				<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
-					<Text>This is the folder where [ProductName] will be installed.</Text>
-				</Control>			
-				<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-					<Text>[TitleFont]Select Installation Folder</Text>
-				</Control>
-				<Control Id="FolderLabel" Type="Text" X="20" Y="114" Width="348" Height="12" Text="&amp;Folder:" />
-			</Dialog>
-		</UI>
-	</Fragment>
-</Wix>
-]]></File>
-			<File name="VerifyReadyDialog.wxs"><![CDATA[<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Fragment>
-		<UI>
-			<Dialog Id="VerifyReadyDialog" Width="370" Height="270" Title="[ProductName]" TrackDiskSpace="yes">
-				<Control Id="Install" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[Button_Install]">
-					<Publish Event="EndDialog" Value="Return">OutOfDiskSpace &lt;&gt; 1</Publish>
-					<Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-					<Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-					<Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-					<Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-				</Control>
-				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[Button_Cancel]">
-					<Publish Event="SpawnDialog" Value="CancelDialog">1</Publish>
-				</Control>
-				<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" FixedSize="yes" TabSkip="no" Text="banner.bmp" />
-				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[Button_Back]">
-					<!--					<Publish Event="NewDialog" Value="AdminInstallPointDlg">InstallMode = "Server Image"</Publish>
-					<Publish Event="NewDialog" Value="CustomizeDlg">InstallMode = "Custom" OR InstallMode = "Change"</Publish>
-					<Publish Event="NewDialog" Value="MaintenanceTypeDlg">InstallMode = "Repair"</Publish> InstallMode = "Typical" OR InstallMode = "Complete" -->
-					<Publish Event="NewDialog" Value="SelectFolderDialog"></Publish>
-				</Control>
-				<Control Id="Text" Type="Text" X="25" Y="70" Width="320" Height="80">
-					<Text>Click Install to begin the installation.  If you want to review or change any of your installation settings, click Back.  Click Cancel to exit the wizard.</Text>
-				</Control>
-				<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-				<Control Id="BottomLine" Type="Line" X="4" Y="234" Width="370" Height="0" />
-				<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
-					<Text>The [Wizard] is ready to begin the [InstallMode] installation</Text>
-				</Control>
-				<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-					<Text>[TitleFont]Ready to Install</Text>
-				</Control>
-			</Dialog>
-		</UI>
-	</Fragment>
-</Wix>
-]]></File>
-			<File name="ViewLicenseAgreementDialog.wxs"><![CDATA[<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Fragment>
-		<UI>
-			<RadioButtonGroup Property="AcceptLicense">
-				<RadioButton Text="I &amp;accept the terms in the License Agreement" X="5" Y="0" Width="300" Height="15" Value="Yes"/>
-				<RadioButton Text="I &amp;do not accept the terms in the License Agreement" X="5" Y="20" Width="300" Height="15"  Value="No"/>
-			</RadioButtonGroup>
-
-			<Dialog Id="ViewLicenseAgreement" Width="370" Height="270" Title="[ProductName]">
-				<Control Id="Buttons" Type="RadioButtonGroup" X="20" Y="187" Width="330" Height="40" Property="AcceptLicense" />
-				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[Button_Back]">
-					<Publish Event="NewDialog" Value="WelcomeDialog">1</Publish>
-				</Control>		
-				<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[Button_Next]">
-					<Publish Event="NewDialog" Value="SelectFolderDialog">AcceptLicense = "Yes"</Publish>
-					<Condition Action="disable">AcceptLicense &lt;&gt; "Yes"</Condition>
-					<Condition Action="enable">AcceptLicense = "Yes"</Condition>
-				</Control>
-				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[Button_Cancel]">
-					<Publish Event="SpawnDialog" Value="CancelDialog">1</Publish>
-				</Control>
-				<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" FixedSize="yes" TabSkip="no" Text="banner.bmp" />
-				<Control Id="AgreementText" Type="ScrollableText" X="20" Y="60" Width="330" Height="120" Sunken="yes" TabSkip="no">
-					<Text SourceFile="$(sys.SOURCEFILEDIR)/license.rtf"/>
-				</Control>	
-				<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-				<Control Id="BottomLine" Type="Line" X="4" Y="234" Width="370" Height="0" />
-				<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
-					<Text>Please read the following license agreement carefully!</Text>
-				</Control>
-				<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-					<Text>[TitleFont]End-User License Agreement</Text>
-				</Control>
-			</Dialog>
-		</UI>
-	</Fragment>
-</Wix>
-]]></File>
-			<File name="WelcomeDialog.wxs"><![CDATA[<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Fragment>
-		<UI>
-			<Dialog Id="WelcomeDialog" Width="370" Height="270" Title="[ProductName] [Setup]">
-				<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[Button_Next]">
-					<Publish Event="NewDialog" Value="ViewLicenseAgreement">1</Publish>
-				</Control>
-				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[Button_Cancel]">
-					<Publish Event="SpawnDialog" Value="CancelDialog">1</Publish>
-				</Control>
-				<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" FixedSize="yes" TabSkip="no" Text="dialog.bmp" />
-				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="[Button_Back]" />
-				<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-				<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="90" Transparent="yes" NoPrefix="yes">
-					<Text>The installer will guide you through the steps required to install [ProductName] on your computer.</Text>
-				</Control>
-				<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-					<Text>[BigFont]Welcome to the [ProductName] installation</Text>
-				</Control>
-			</Dialog>
-		</UI>
-	</Fragment>
-</Wix>
-]]></File>
-			<File name="ProgressDialog.wxs"><![CDATA[<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Fragment>
-		<UI>
-			<Dialog Id="ProgressDialog" Width="370" Height="270" Title="[ProductName]" Modeless="yes">
-				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="[Button_Cancel]">
-					<Publish Event="SpawnDialog" Value="CancelDialog">1</Publish>
-				</Control>
-				<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" FixedSize="yes" TabSkip="no" Text="banner.bmp" />
-				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="[Button_Back]" />
-				<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="[Button_Next]" />
-				<Control Id="Text" Type="Text" X="35" Y="65" Width="300" Height="20">
-					<Text>Please wait while [ProductName] is installed.</Text>
-				</Control>
-				<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="374" Height="0" />
-				<Control Id="BottomLine" Type="Line" X="4" Y="234" Width="370" Height="0" />
-				<Control Id="Title" Type="Text" X="20" Y="15" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-					<Text>Install [ProductName]</Text>
-				</Control>
-				<Control Id="ActionText" Type="Text" X="70" Y="100" Width="265" Height="10">
-					<Subscribe Event="ActionText" Attribute="Text" />
-				</Control>
-				<Control Id="ProgressBar" Type="ProgressBar" X="35" Y="115" Width="300" Height="10" ProgressBlocks="yes" Text="Progress done">
-					<Subscribe Event="SetProgress" Attribute="Progress" />
-				</Control>
-				<Control Id="StatusLabel" Type="Text" X="35" Y="100" Width="35" Height="10" Text="Status:" />
-			</Dialog>
-		</UI>
-	</Fragment>
-</Wix>
-]]></File>
-			<File name="CancelDialog.wxs"><![CDATA[<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Fragment>
-		<UI>
-			<Dialog Id="CancelDialog" Width="260" Height="85" Title="[ProductName] [Setup]" NoMinimize="yes">
-				<Control Id="Text" Type="Text" X="48" Y="15" Width="194" Height="30">
-					<Text>Are you sure you want to cancel [ProductName] installation?</Text>
-				</Control>
-				<Control Id="Yes" Type="PushButton" X="72" Y="57" Width="56" Height="17" Text="[Button_Yes]">
-					<Publish Event="EndDialog" Value="Exit">1</Publish>
-				</Control>
-				<Control Id="No" Type="PushButton" X="132" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="[Button_No]">
-					<Publish Event="EndDialog" Value="Return">1</Publish>
-				</Control>	
-				<Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" FixedSize="yes" IconSize="32" Text="info.bmp" />
-			</Dialog>
-		</UI>
-	</Fragment>
-</Wix>
-]]></File>
-			<File name="BrowseDialog.wxs"><![CDATA[<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Fragment>
-		<UI>
-			<Dialog Id="BrowseDialog" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
-				<Control Id="PathEdit" Type="PathEdit" X="84" Y="202" Width="261" Height="18" Property="_BrowseProperty" Indirect="yes" />
-				<Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Text="[Button_OK]">
-					<Publish Event="EndDialog" Value="Return">1</Publish>
-				</Control>
-				<Control Id="Cancel" Type="PushButton" X="240" Y="243" Width="56" Height="17" Cancel="yes" Text="[Button_Cancel]">
-					<Publish Event="Reset" Value="0">1</Publish>
-					<Publish Event="EndDialog" Value="Return">1</Publish>
-				</Control>
-				<Control Id="ComboLabel" Type="Text" X="25" Y="58" Width="44" Height="10" TabSkip="no" Text="&amp;Look in:" />
-				<Control Id="DirectoryCombo" Type="DirectoryCombo" X="70" Y="55" Width="220" Height="80" Property="_BrowseProperty" Indirect="yes" Fixed="yes" Remote="yes">
-					<Subscribe Event="IgnoreChange" Attribute="IgnoreChange" />
-				</Control>
-				<Control Id="Up" Type="PushButton" X="298" Y="55" Width="19" Height="19" Icon="yes" FixedSize="yes" IconSize="16" Text="up.bmp">
-					<Publish Event="DirectoryListUp" Value="0">1</Publish>
-				</Control>
-				<Control Id="NewFolder" Type="PushButton" X="325" Y="55" Width="19" Height="19" Icon="yes" FixedSize="yes" IconSize="16" Text="new.bmp">
-					<Publish Event="DirectoryListNew" Value="0">1</Publish>
-				</Control>
-				<Control Id="DirectoryList" Type="DirectoryList" X="25" Y="83" Width="320" Height="110" Property="_BrowseProperty" Sunken="yes" Indirect="yes" TabSkip="no" />
-				<Control Id="PathLabel" Type="Text" X="25" Y="205" Width="59" Height="10" TabSkip="no" Text="&amp;Folder name:" />
-				<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" FixedSize="yes" TabSkip="no" Text="banner.bmp" />
-				<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-				<Control Id="BottomLine" Type="Line" X="4" Y="234" Width="366" Height="0" />
-				<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
-					<Text>Browse to the destination folder</Text>
-				</Control>
-				<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-					<Text>[TitleFont]Change current destination folder</Text>
-				</Control>
-			</Dialog>
-		</UI>
-	</Fragment>
-</Wix>
-]]></File>
-			<File name="UserExitDialog.wxs"><![CDATA[<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Fragment>
-		<UI>
-			<Dialog Id="UserExit" Width="370" Height="270" Title="[ProductName] [Setup]">
-				<Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="[Button_Finish]">
-					<Publish Event="EndDialog" Value="Exit">1</Publish>
-				</Control>
-				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="[Button_Cancel]" />
-				<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" FixedSize="yes" TabSkip="no" Text="dialog.bmp" />
-				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="[Button_Back]" />
-				<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-				<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-					<Text>[BigFont][ProductName] installation was interrupted</Text>
-				</Control>
-				<Control Id="Description1" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes">
-					<Text>The installation was interrupted before [ProductName] could be installed. You need to restart the installer to try again.</Text>
-				</Control>
-				<Control Id="Description2" Type="Text" X="135" Y="215" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
-					<Text>Click the Finish button to exit.</Text>
-				</Control>
-			</Dialog>
-		</UI>
-	</Fragment>
-</Wix>
-]]></File>
-			<File name="ExitDialog.wxs"><![CDATA[<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Fragment>
-		<UI>
-			<Dialog Id="ExitDialog" Width="370" Height="270" Title="[ProductName]" NoMinimize="yes">
-				<Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="[Button_Finish]">
-					<Publish Event="EndDialog" Value="Return">1</Publish>
-				</Control>
-				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="[Button_Cancel]" />
-				<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" FixedSize="yes" TabSkip="no" Text="dialog.bmp" />
-				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="[Button_Back]" />
-				<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="374" Height="0" />
-				<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
-					<Text>Click the Finish button to exit.</Text>
-				</Control>
-				<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-					<Text>[BigFont]Completing the [ProductName] installation.</Text>
-				</Control>
-			</Dialog>
-		</UI>
-	</Fragment>
-</Wix>
-]]></File>
-			<File name="OutOfDiskSpaceDialog.wxs"><![CDATA[<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Fragment>
-		<UI>
-			<Dialog Id="OutOfDiskDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
-				<Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="[Button_OK]">
-					<Publish Event="EndDialog" Value="Return">1</Publish>
-				</Control>
-				<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" FixedSize="yes" TabSkip="no" Text="banner.bmp" />
-				<Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="40">
-					<Text>The highlighted volumes do not have enough disk space available for the currently selected features.  You can either remove some files from the highlighted volumes, or choose to install less features onto local drive(s), or select different destination drive(s).</Text>
-				</Control>
-				<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-				<Control Id="BottomLine" Type="Line" X="4" Y="234" Width="370" Height="0" />
-				<Control Id="Description" Type="Text" X="20" Y="20" Width="280" Height="20" Transparent="yes" NoPrefix="yes">
-					<Text>Disk space required for the installation exceeds available disk space.</Text>
-				</Control>
-				<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-					<Text>[TitleFont]Out of Disk Space</Text>
-				</Control>
-				<Control Id="VolumeList" Type="VolumeCostList" X="20" Y="100" Width="330" Height="120" Sunken="yes" Fixed="yes" Remote="yes">
-					<Text>{120}{70}{70}{70}{70}</Text>
-				</Control>
-			</Dialog>
-		</UI>
-	</Fragment>
-</Wix>
-]]></File>
-			<File name="OutOfRollbackDiskSpaceDialog.wxs"><![CDATA[<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Fragment>
-		<UI>
-			<Dialog Id="OutOfRbDiskDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
-				<Control Id="No" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="[Button_No]">
-					<Publish Event="EndDialog" Value="Return">1</Publish>
-				</Control>
-				<Control Id="Yes" Type="PushButton" X="240" Y="243" Width="56" Height="17" Text="[Button_Yes]">
-					<Publish Event="EnableRollback" Value="False">1</Publish>
-					<Publish Event="EndDialog" Value="Return">1</Publish>
-				</Control>
-				<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" FixedSize="yes" TabSkip="no" Text="banner.bmp" />
-				<Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="40">
-					<Text>The highlighted volumes do not have enough disk space available for the currently selected features.  You can either remove some files from the highlighted volumes, or choose to install less features onto local drive(s), or select different destination drive(s).</Text>
-				</Control>
-				<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="374" Height="0" />
-				<Control Id="BottomLine" Type="Line" X="4" Y="234" Width="370" Height="0" />
-				<Control Id="Description" Type="Text" X="20" Y="20" Width="280" Height="20" Transparent="yes" NoPrefix="yes">
-					<Text>Disk space required for the installation exceeds available disk space.</Text>
-				</Control>
-				<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-					<Text>[TitleFont]Out of Disk Space</Text>
-				</Control>
-				<Control Id="VolumeList" Type="VolumeCostList" X="20" Y="140" Width="330" Height="80" Sunken="yes" Fixed="yes" Remote="yes" ShowRollbackCost="yes">
-					<Text>{120}{70}{70}{70}{70}</Text>
-				</Control>
-				<Control Id="Text2" Type="Text" X="20" Y="94" Width="330" Height="40">
-					<Text>Alternatively, you may choose to disable the installer"s rollback functionality.  This allows the installer to restore your computer"s original state should the installation be interrupted in any way.  Click Yes if you wish to take the risk to disable rollback.</Text>
-				</Control>
-			</Dialog>
-		</UI>
-	</Fragment>
-</Wix>
-]]></File>
-			<File name="FatalErrorDialog.wxs"><![CDATA[<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Fragment>
-		<UI>
-			<Dialog Id="FatalError" Width="370" Height="270" Title="[ProductName]" NoMinimize="yes">
-				<Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="[Button_Finish]">
-					<Publish Event="EndDialog" Value="Exit">1</Publish>
-				</Control>
-				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="[Button_Cancel]" />
-				<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" FixedSize="yes" TabSkip="no" Text="dialog.bmp" />
-				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="[Button_Back]" />
-				<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-				<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-					<Text>[BigFont][ProductName] ended prematurely</Text>
-				</Control>
-				<Control Id="Description1" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes">
-					<Text>[ProductName] setup ended prematurely because of an error.  Your system has not been modified.  To install this program at a later time, please run the installation again.</Text>
-				</Control>
-				<Control Id="Description2" Type="Text" X="135" Y="115" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
-					<Text>Click the Finish button to exit the.</Text>
-				</Control>
-			</Dialog>
-		</UI>
-	</Fragment>
-</Wix>
-]]></File>
-			<File name="UserInterface.wxs"><![CDATA[<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-	<Fragment>
-		<UI Id="UserInterface">
-			<!-- FONT DEFINITION -->
-			<Property Id="TitleFont">{&amp;DlgFontBold8}</Property>
-			<Property Id="BigFont">{&amp;VerdanaBold13}</Property>
-			<Property Id="DefaultUIFont">DlgFont8</Property>
-			
-			<TextStyle Id="DlgFont8" FaceName="Tahoma" Size="8" />
-			<TextStyle Id="DlgFontBold8" FaceName="Tahoma" Size="8" Bold="yes" />
-			<TextStyle Id="VerdanaBold13" FaceName="Verdana" Size="13" Bold="yes" />
-			<!-- END FONT DEFINITION -->
-			
-			<InstallUISequence>
-				<Custom Action="SET_INSTALLDIR" Before="CostInitialize">INSTALLDIR=""</Custom>
-				
-				<Show Dialog="WelcomeDialog" After="MigrateFeatureStates" />
-
-				<Show Dialog="ProgressDialog" After="WelcomeDialog" />
-				
-				<Show Dialog="UserExit" OnExit="cancel" />
-				<Show Dialog="ExitDialog" OnExit="success" />
-				<Show Dialog="FatalError" OnExit="error" />
-			</InstallUISequence>
-			
-			<AdminUISequence>
-				<Custom Action="SET_INSTALLDIR" Before="CostInitialize">INSTALLDIR=""</Custom>
-				
-				<Show Dialog="WelcomeDialog" After="CostFinalize" />
-				
-				<Show Dialog="ProgressDialog" After="WelcomeDialog" />
-				
-				<Show Dialog="UserExit"   OnExit="cancel" />
-				<Show Dialog="ExitDialog" OnExit="success" />
-				<Show Dialog="FatalError" OnExit="error" />
-			</AdminUISequence>
-
-			<Binary Id="dialog.bmp" SourceFile="$(var.DATADIR)/default-dialog.bmp" />
-			<Binary Id="banner.bmp" SourceFile="$(var.DATADIR)/default-banner.bmp" />
-			<Binary Id="info.bmp"   SourceFile="$(var.DATADIR)/info.bmp" />
-			<Binary Id="up.bmp"     SourceFile="$(var.DATADIR)/up.bmp" />
-			<Binary Id="new.bmp"    SourceFile="$(var.DATADIR)/new.bmp" />
-		</UI>
-	</Fragment>
-</Wix>
-]]></File>		
-			<File name="license.rtf" buildAction="None"><![CDATA[{\rtf1\ansi\ansicpg1252\deff0\deflang1031{\fonttbl{\f0\fswiss\fcharset0 Arial;}}
-{\*\generator Msftedit 5.41.21.2500;}\viewkind4\uc1\pard\lang1033\f0\fs20 Your License goes here.\lang1031\par
-}]]></File>
+			<File name="SelectFolderDialog.wxs" src="DefaultSelectFolderDialog.wxs" />
+			<File name="VerifyReadyDialog.wxs" src="DefaultVerifyReadyDialog.wxs" />
+			<File name="ViewLicenseAgreementDialog.wxs" src="DefaultViewLicenseAgreementDialog.wxs" />
+			<File name="WelcomeDialog.wxs" src="DefaultWelcomeDialog.wxs" />
+			<File name="ProgressDialog.wxs" src="DefaultProgressDIalog.wxs" />
+			<File name="CancelDialog.wxs" src="DefaultCancelDialog.wxs" />
+			<File name="BrowseDialog.wxs" src="DefaultBrowseDialog.wxs" />
+			<File name="UserExitDialog.wxs" src="DefaultUserExitDialog.wxs" />
+			<File name="ExitDialog.wxs" src="DefaultExitDialog.wxs" />
+			<File name="OutOfDiskSpaceDialog.wxs" src="DefaultOutOfDiskSpaceDialog.wxs" />
+			<File name="OutOfRollbackDiskSpaceDialog.wxs" src="DefaultOutOfRollbackDiskSpaceDialog.wxs" />
+			<File name="FatalErrorDialog.wxs" src="DefaultFatalErrorDialog.wxs" />
+			<File name="UserInterface.wxs" src="DefaultUserInterface.wxs" />		
+			<File name="license.rtf" src="DefaultLicense.rtf" buildAction="None" />		
 		</Files>
 	</Project>
 </Template>

src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj

@@ -150,6 +150,48 @@
     <Compile Include="Src\Gui\WixPackageFilesDiffControl.cs" />
     <Compile Include="Src\Commands\HideDiffCommand.cs" />
     <Compile Include="Src\ExcludedNames.cs" />
+    <Content Include="Templates\DefaultBrowseDialog.wxs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\DefaultCancelDialog.wxs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\DefaultExitDialog.wxs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\DefaultFatalErrorDialog.wxs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\DefaultOutOfDiskSpaceDialog.wxs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\DefaultOutOfRollbackDiskSpaceDialog.wxs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\DefaultProgressDialog.wxs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\DefaultSelectFolderDialog.wxs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\DefaultUserExitDialog.wxs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\DefaultUserInterface.wxs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\DefaultVerifyReadyDialog.wxs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\DefaultViewLicenseAgreementDIalog.wxs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\DefaultWelcomeDialog.wxs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Templates\DefaultLicense.rtf">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Content Include="WixBinding.addin">

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs

@@ -231,9 +231,11 @@ namespace ICSharpCode.FormsDesigner
 		bool FieldChanged(IField oldField, CodeMemberField newField)
 		{
 			// compare types
-			if (oldField.ReturnType.FullyQualifiedName != newField.Type.BaseType) {
-				LoggingService.Debug("FieldChanged: "+oldField.Name+", "+oldField.ReturnType.FullyQualifiedName+" -> "+newField.Type.BaseType);
-				return true;
+			if (oldField.ReturnType != null) { // ignore type changes to untyped VB fields
+				if (oldField.ReturnType.FullyQualifiedName != newField.Type.BaseType) {
+					LoggingService.Debug("FieldChanged: "+oldField.Name+", "+oldField.ReturnType.FullyQualifiedName+" -> "+newField.Type.BaseType);
+					return true;
+				}
 			}
 			
 			// compare modifiers

src/AddIns/Misc/UnitTesting/Src/TestClass.cs

@@ -356,39 +356,37 @@ namespace ICSharpCode.UnitTesting
 				ResultChanged(this, new EventArgs());
 			}
 		}
-		
+				
 		/// <summary>
-		/// First tries the last dotted part of the test result name as the
-		/// method name. If there is no matching method the preceding dotted
-		/// part is prefixed to the method name until a match is found. 
+		/// This function adds the base class as a prefix and tries to find
+		/// the corresponding test method.
 		/// 
-		/// Given a test result of:
+		/// Actual method name:
 		/// 
-		/// RootNamespace.ClassName.BaseClass1.BaseClass2.TestMethod
+		/// RootNamespace.TestFixture.TestFixtureBaseClass.TestMethod
+		/// </summary>
+		/// <remarks>
+		/// NUnit 2.4 uses the correct test method name when a test 
+		/// class uses a base class with test methods. It does 
+		/// not prefix the test method name with the base class name 
+		/// in the test results returned from nunit-console. It still
+		/// displays the name in the NUnit GUI with the base class
+		/// name prefixed. Older versions of NUnit-console (2.2.9) returned
+		/// the test result with the test method name as follows:
 		/// 
-		/// The method names tried are:
+		/// RootNamespace.TestFixture.BaseTestFixture.TestMethod
 		/// 
-		/// TestMethod
-		/// BaseClass2.TestMethod
-		/// BaseClass2.BaseClass1.TestMethod
-		/// etc.
-		/// </summary>
+		/// The test method name would have the base class name prefixed 
+		/// to it.
+		/// </remarks>
 		TestMethod GetPrefixedTestMethod(string testResultName)
 		{
-			int index = 0;
-			string methodName = TestMethod.GetMethodName(testResultName);
-			string className = TestMethod.GetQualifiedClassName(testResultName);
-			do {
-				index = className.LastIndexOf('.');
-				if (index > 0) {
-					methodName = String.Concat(className.Substring(index + 1), ".", methodName);
-					TestMethod method = GetTestMethod(methodName);
-					if (method != null) {
-						return method;
-					}
-					className = className.Substring(0, index);
-				}
-			} while (index > 0);
+			IClass baseClass = c.BaseClass;
+			if (baseClass != null && TestClass.IsTestClass(baseClass)) {
+				string methodName = TestMethod.GetMethodName(testResultName);
+				string actualMethodName = String.Concat(baseClass.Name, ".", methodName);
+				return GetTestMethod(actualMethodName);
+			}
 			return null;
 		}
 	}

src/AddIns/Misc/UnitTesting/Test/NamespaceFilterTests.cs

@@ -44,6 +44,15 @@ namespace UnitTesting.Tests
 			Assert.IsFalse(filter.Pass(testCase));
 		}
 		
+		[Test]
+		public void NullTestCaseFullName()
+		{
+			NamespaceFilter filter = new NamespaceFilter("Project.Tests");
+			MockTestCase testCase = new MockTestCase("Project.Tests.MyTest");
+			testCase.TestName.FullName = null;
+			Assert.IsFalse(filter.Pass(testCase));
+		}		
+		
 		[Test]
 		public void TestCaseNameMatchesNamespace()
 		{
@@ -53,53 +62,41 @@ namespace UnitTesting.Tests
 		}
 
 		[Test]
-		public void NullTestSuite()
-		{
-			NamespaceSuite testSuite = null;
-			NamespaceFilter filter = new NamespaceFilter("Project.Tests");
-			Assert.IsFalse(filter.Pass(testSuite));
-		}
-		
-		[Test]
-		public void NamespaceTestSuiteIncluded()
+		public void NullTestFixture()
 		{
-			NamespaceSuite testSuite = new NamespaceSuite("Project", "Tests", 0);
+			TestFixture testFixture = null;
 			NamespaceFilter filter = new NamespaceFilter("Project.Tests");
-			Assert.IsTrue(filter.Pass(testSuite));
+			Assert.IsFalse(filter.Pass(testFixture));
 		}
 		
 		[Test]
-		public void RootNamespaceTestSuiteIncluded()
+		public void TestFixtureIncluded()
 		{
-			NamespaceSuite testSuite = new NamespaceSuite("Project", 0);
+			MockTestFixture testFixture = new MockTestFixture("Project.Tests.MyTestFixture");
 			NamespaceFilter filter = new NamespaceFilter("Project.Tests");
-			Assert.IsTrue(filter.Pass(testSuite));
-		}
-		
-		[Test]
-		public void ChildNamespaceTestSuiteIncluded()
-		{
-			NamespaceSuite testSuite = new NamespaceSuite("Project", "Tests", 0);
-			NamespaceFilter filter = new NamespaceFilter("Project");
-			Assert.IsTrue(filter.Pass(testSuite));
+			Assert.IsTrue(filter.Pass(testFixture));
 		}
 		
 		[Test]
-		public void NamespaceTestSuiteExcluded()
+		public void TestFixtureExcluded()
 		{
-			NamespaceSuite testSuite = new NamespaceSuite("Project", "Different", 0);
+			MockTestFixture testFixture = new MockTestFixture("Project.Different");
 			NamespaceFilter filter = new NamespaceFilter("Project.Tests");
-			Assert.IsFalse(filter.Pass(testSuite));
+			Assert.IsFalse(filter.Pass(testFixture));
 		}
 		
 		[Test]
 		public void RootNamespaceTestSuiteExcluded()
 		{
-			NamespaceSuite testSuite = new NamespaceSuite("Root", 0);
+			MockTestFixture testSuite = new MockTestFixture("Root");
 			NamespaceFilter filter = new NamespaceFilter("Project.Tests");
 			Assert.IsFalse(filter.Pass(testSuite));
 		}
 		
+		/// <summary>
+		/// All test suite classes should pass. NUnit passes namespaces and
+		/// the assembly itself to the filter as a TestSuite object.
+		/// </summary>		
 		[Test]
 		public void TestSuitePasses()
 		{

src/AddIns/Misc/UnitTesting/Test/Project/TestMethodsInBaseClassTestFixture.cs

@@ -17,14 +17,22 @@ namespace UnitTesting.Tests.Project
 	/// <summary>
 	/// If a test fixture's base class has test attributes then
 	/// NUnit includes the base class test methods by prefixing
-	/// the base class name to them.
+	/// the base class name to them. In NUnit 2.2 this was true for
+	/// both the GUI and the test result information. In 
+	/// NUnit 2.4 the GUI prefixes the base class to the method
+	/// name but the test result does not prefix the base class
+	/// to the name of the method.
 	/// 
 	/// [TestFixture]
 	/// public DerivedClass : BaseClass
 	/// 
-	/// Fully qualified test method is named:
+	/// Test method is shown in UI as:
 	/// 
-	/// RootNamespace.DerivedClass.BaseClass.BaseClassMethod.
+	/// BaseClass.BaseClassMethod
+	/// 
+	/// Test method name returned by NUnit-Console:
+	/// 
+	/// RootNamespace.DerivedClass.BaseClassMethod
 	/// </summary>
 	[TestFixture]
 	public class TestMethodsInBaseClassTestFixture
@@ -34,7 +42,6 @@ namespace UnitTesting.Tests.Project
 		[SetUp]
 		public void SetUp()
 		{			
-			
 			MockProjectContent projectContent = new MockProjectContent();
 			projectContent.Language = LanguageProperties.None;
 			
@@ -83,7 +90,7 @@ namespace UnitTesting.Tests.Project
 		}
 		
 		[Test]
-		public void GetTestClass()
+		public void UpdateTestResultUsingPrefixBaseClassName()
 		{
 			TestClassCollection testClasses = new TestClassCollection();
 			testClasses.Add(testClass);
@@ -94,5 +101,18 @@ namespace UnitTesting.Tests.Project
 			
 			Assert.AreEqual(TestResultType.Failure, testClass.Result);
 		}
+		
+		[Test]
+		public void UpdateTestResult()
+		{
+			TestClassCollection testClasses = new TestClassCollection();
+			testClasses.Add(testClass);
+
+			TestResult testResult = new TestResult("RootNamespace.MyTestFixture.BaseMethod");
+			testResult.IsFailure = true;
+			testClasses.UpdateTestResult(testResult);
+			
+			Assert.AreEqual(TestResultType.Failure, testClass.Result);
+		}
 	}
 }

src/AddIns/Misc/UnitTesting/Test/UnitTesting.Tests.csproj

@@ -45,6 +45,10 @@
       <HintPath>..\..\..\..\Tools\NUnit\nunit.core.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="nunit.core.interfaces">
+      <HintPath>..\..\..\..\Tools\NUnit\nunit.core.interfaces.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\..\..\..\Tools\NUnit\nunit.framework.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
@@ -65,6 +69,7 @@
     <Compile Include="Utils\DerivedTestTreeView.cs" />
     <Compile Include="Utils\DerivedUnitTestsPad.cs" />
     <Compile Include="Utils\MockTestCase.cs" />
+    <Compile Include="Utils\MockTestFixture.cs" />
     <Compile Include="Utils\MockTestTreeView.cs" />
     <Compile Include="Utils\MockMember.cs" />
     <Compile Include="Utils\MockClass.cs" />

src/AddIns/Misc/UnitTesting/Test/Utils/MockTestCase.cs

@@ -12,12 +12,19 @@ namespace UnitTesting.Tests.Utils
 {
 	public class MockTestCase : TestCase
 	{
-		public MockTestCase(string name) : base(null, name)
+		public MockTestCase(string name) : base(CreateTestName(name))
 		{
 		}
 		
 		public override void Run(TestCaseResult result)
 		{
 		}
+		
+		static TestName CreateTestName(string name)
+		{
+			TestName testName = new TestName();
+			testName.FullName = name;
+			return testName;
+		}
 	}
 }

src/AddIns/Misc/UnitTesting/Test/Utils/MockTestFixture.cs

@@ -0,0 +1,20 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using NUnit.Core;
+
+namespace UnitTesting.Tests.Utils
+{
+	public class MockTestFixture : TestFixture
+	{
+		public MockTestFixture(string fullName) : base(typeof(MockTestFixture))
+		{
+			base.TestName.FullName = fullName;
+		}
+	}
+}

src/Libraries/ICSharpCode.TextEditor/Project/Resources/Mode.xsd

@@ -188,8 +188,9 @@
 	<!-- A grouping of keywords that sholuld be colored the same way -->
 	<xsd:complexType name="KeyWords">
 		<xsd:sequence>
+			<!-- allow groups with 0 keywords: this simplifies the syntax highlighting editor -->
 			<!-- A KeyWord -->
-			<xsd:element name="Key" type="Key" minOccurs="1" maxOccurs="unbounded">
+			<xsd:element name="Key" type="Key" minOccurs="0" maxOccurs="unbounded">
 			</xsd:element>
 		</xsd:sequence>
 		<!-- The name of the KeyWord group -->

src/Libraries/ICSharpCode.TextEditor/Project/Src/Actions/CaretActions.cs

@@ -86,7 +86,7 @@ namespace ICSharpCode.TextEditor.Actions
 				Point pos = new Point(xpos,
 				                      textArea.TextView.DrawingPosition.Y + (visualLine - 1) * textArea.TextView.FontHeight - textArea.TextView.TextArea.VirtualTop.Y);
 				textArea.Caret.Position = textArea.TextView.GetLogicalPosition(pos.X, pos.Y);
-				textArea.SetCaretToDesiredColumn(textArea.Caret.Position.Y);
+				textArea.SetCaretToDesiredColumn();
 			}
 //			if (textArea.Caret.Line  > 0) {
 //				textArea.SetCaretToDesiredColumn(textArea.Caret.Line - 1);
@@ -106,7 +106,7 @@ namespace ICSharpCode.TextEditor.Actions
 				Point pos = new Point(xpos,
 				                      textArea.TextView.DrawingPosition.Y + (visualLine + 1) * textArea.TextView.FontHeight - textArea.TextView.TextArea.VirtualTop.Y);
 				textArea.Caret.Position = textArea.TextView.GetLogicalPosition(pos.X, pos.Y);
-				textArea.SetCaretToDesiredColumn(textArea.Caret.Position.Y);
+				textArea.SetCaretToDesiredColumn();
 			}
 //			if (textArea.Caret.Line + 1 < textArea.Document.TotalNumberOfLines) {
 //				textArea.SetCaretToDesiredColumn(textArea.Caret.Line + 1);

src/Libraries/ICSharpCode.TextEditor/Project/Src/Actions/MiscActions.cs

@@ -212,7 +212,7 @@ namespace ICSharpCode.TextEditor.Actions
 				} else {
 					textArea.Caret.DesiredColumn = Math.Max(0, currentColumn - remainder);
 				}
-				textArea.SetCaretToDesiredColumn(textArea.Caret.Line);
+				textArea.SetCaretToDesiredColumn();
 			}
 		}
 	}

src/Libraries/ICSharpCode.TextEditor/Project/Src/Actions/SelectionActions.cs

@@ -156,13 +156,7 @@ namespace ICSharpCode.TextEditor.Actions
 					return;
 				}
 			}
-            textArea.Caret.Position = textArea.SelectionManager.NextValidPosition(endPoint.Y);
-            textArea.SelectionManager.ExtendSelection(startPoint, endPoint);
-            // after a SelectWholeDocument selection, the caret is placed correctly,
-            // but it is not positioned internally.  The effect is when the cursor
-            // is moved up or down a line, the caret will take on the column that
-            // it was in before the SelectWholeDocument
-			textArea.SetDesiredColumn();
+			textArea.SelectionManager.SetSelection(new DefaultSelection(textArea.Document, startPoint, endPoint));
 		}
 	}
 	

src/Libraries/ICSharpCode.TextEditor/Project/Src/Document/Selection/SelectionManager.cs

@@ -154,17 +154,17 @@ namespace ICSharpCode.TextEditor.Document
 		
 		public void ExtendSelection(Point oldPosition, Point newPosition)
 		{
-            // where oldposition is where the cursor was,
-            // and newposition is where it has ended up from a click (both zero based)
+			// where oldposition is where the cursor was,
+			// and newposition is where it has ended up from a click (both zero based)
 
-			if (oldPosition == newPosition) 
-            {
+			if (oldPosition == newPosition)
+			{
 				return;
 			}
 
 			Point min;
 			Point max;
-            int oldnewX = newPosition.X;
+			int oldnewX = newPosition.X;
 			bool  oldIsGreater = GreaterEqPos(oldPosition, newPosition);
 			if (oldIsGreater) {
 				min = newPosition;
@@ -174,57 +174,59 @@ namespace ICSharpCode.TextEditor.Document
 				max = newPosition;
 			}
 
-            if (min == max) {
-                return;
-            }
+			if (min == max) {
+				return;
+			}
 
-            if (!HasSomethingSelected) 
-            {
+			if (!HasSomethingSelected) {
 				SetSelection(new DefaultSelection(document, min, max));
-                // initialise selectFrom for a cursor selection
-                if (selectFrom.where == WhereFrom.None)
-                    selectionStart = oldPosition; //textArea.Caret.Position;
 				return;
 			}
 
 			ISelection selection = this.selectionCollection[0];
 
-            if (min == max) {
+			if (min == max) {
 				//selection.StartPosition = newPosition;
-                return;
-            } else {
-                // changed selection via gutter
-			    if (selectFrom.where == WhereFrom.Gutter) 
-                {
-                    // selection new position is always at the left edge for gutter selections
-                    newPosition.X = 0;
-                }
+				return;
+			} else {
+				// changed selection via gutter
+				if (selectFrom.where == WhereFrom.Gutter) {
+					// selection new position is always at the left edge for gutter selections
+					newPosition.X = 0;
+				}
 
-			    if (GreaterEqPos(newPosition, selectionStart)) // selecting forward
-			    {
-			        selection.StartPosition = selectionStart;
-                    // this handles last line selection
-                    if (selectFrom.where == WhereFrom.Gutter ) //&& newPosition.Y != oldPosition.Y)
-                        selection.EndPosition = new Point(textArea.Caret.Column, textArea.Caret.Line);
-                    else {
-                        newPosition.X = oldnewX;
-			            selection.EndPosition = newPosition;
-                    }
-			    } else { // selecting back
-	                if (selectFrom.where == WhereFrom.Gutter && selectFrom.first == WhereFrom.Gutter) 
-                    { // gutter selection
-					    selection.EndPosition = NextValidPosition(selectionStart.Y);
-                    } else { // internal text selection
-					    selection.EndPosition = selectionStart; //selection.StartPosition;
-                    }
-				    selection.StartPosition = newPosition;
-			    }
-            }
+				if (newPosition.Y >= selectionStart.Y) {
+					// selecting down
+					if(GreaterEqPos(newPosition, selectionStart)) {
+						selection.StartPosition = selectionStart;
+						// this handles last line selection
+						//if( textArea.Document.TotalNumberOfLines - 1 == newPosition.Y)
+						if (selectFrom.where == WhereFrom.Gutter ) //&& newPosition.Y != oldPosition.Y)
+							//selection.EndPosition = NextValidPosition(newPosition.Y - 1);
+							selection.EndPosition = new Point(textArea.Caret.Column, textArea.Caret.Line);
+						else {
+							newPosition.X = oldnewX;
+							selection.EndPosition = newPosition;
+						}
+					} else { // generally this occurs if the selection is on the same line, at a point less than the start position
+						selection.StartPosition = newPosition;
+						selection.EndPosition = selectionStart;
+					}
+				} else { // selecting up
+					if (selectFrom.where == WhereFrom.Gutter && selectFrom.first == WhereFrom.Gutter) {
+						// gutter selection
+						selection.EndPosition = NextValidPosition(selectionStart.Y);
+					} else { // internal text selection
+						selection.EndPosition = selectionStart; //selection.StartPosition;
+					}
+					selection.StartPosition = newPosition;
+				}
+			}
 
 			document.RequestUpdate(new TextAreaUpdate(TextAreaUpdateType.LinesBetween, min.Y, max.Y));
 			document.CommitUpdate();
 			OnSelectionChanged(EventArgs.Empty);
-        }
+		}
 
 		// retrieve the next available line
 		// - checks that there are more lines available after the current one
@@ -257,11 +259,10 @@ namespace ICSharpCode.TextEditor.Document
 			// this is the most logical place to reset selection starting
 			// positions because it is always called before a new selection
 			selectFrom.first = selectFrom.where;
-            selectionStart = textArea.TextView.GetLogicalPosition(mousepos.X - textArea.TextView.DrawingPosition.X, mousepos.Y - textArea.TextView.DrawingPosition.Y);
+			selectionStart = textArea.TextView.GetLogicalPosition(mousepos.X - textArea.TextView.DrawingPosition.X, mousepos.Y - textArea.TextView.DrawingPosition.Y);
 			if(selectFrom.where == WhereFrom.Gutter) {
 				selectionStart.X = 0;
-//				selectionStart.Y = -1;
-            }
+			}
 
 			ClearWithoutUpdate();
 			document.CommitUpdate();

src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/Ime.cs

@@ -19,6 +19,10 @@ namespace ICSharpCode.TextEditor
 	{
 		public Ime(IntPtr hWnd, Font font)
 		{
+			string PROCESSOR_ARCHITEW6432 = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITEW6432");
+			if (PROCESSOR_ARCHITEW6432 == "IA64" || PROCESSOR_ARCHITEW6432 == "AMD64") {
+				disableIME = true;
+			}
 			this.hWnd = hWnd;
 			this.hIMEWnd = ImmGetDefaultIMEWnd(hWnd);
 			this.font = font;
@@ -124,11 +128,11 @@ namespace ICSharpCode.TextEditor
 
 			try {
 				SendMessage(
-				            hIMEWnd,
-				            WM_IME_CONTROL,
-				            new IntPtr(IMC_SETCOMPOSITIONFONT),
-				            lf
-				           );
+					hIMEWnd,
+					WM_IME_CONTROL,
+					new IntPtr(IMC_SETCOMPOSITIONFONT),
+					lf
+				);
 			} catch (AccessViolationException ex) {
 				Handle(ex);
 			}
@@ -149,11 +153,11 @@ namespace ICSharpCode.TextEditor
 
 			try {
 				SendMessage(
-				            hIMEWnd,
-				            WM_IME_CONTROL,
-				            new IntPtr(IMC_SETCOMPOSITIONWINDOW),
-				            lParam
-				           );
+					hIMEWnd,
+					WM_IME_CONTROL,
+					new IntPtr(IMC_SETCOMPOSITIONWINDOW),
+					lParam
+				);
 			} catch (AccessViolationException ex) {
 				Handle(ex);
 			}

src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs

@@ -270,6 +270,12 @@ namespace ICSharpCode.TextEditor
 			Caret.DesiredColumn = TextView.GetDrawingXPos(Caret.Line, Caret.Column) + (int)(VirtualTop.X * textView.WideSpaceWidth);
 		}
 		
+		public void SetCaretToDesiredColumn()
+		{
+			Caret.Position = textView.GetLogicalColumn(Caret.Line, Caret.DesiredColumn + (int)(VirtualTop.X * textView.WideSpaceWidth));
+		}
+		
+		[Obsolete("Use the parameterless version")]
 		public void SetCaretToDesiredColumn(int caretLine)
 		{
 			Caret.Position = textView.GetLogicalColumn(Caret.Line, Caret.DesiredColumn + (int)(VirtualTop.X * textView.WideSpaceWidth));

src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextAreaMouseHandler.cs

@@ -265,12 +265,6 @@ namespace ICSharpCode.TextEditor
 					textArea.SelectionManager.ExtendSelection(minSelection, maxSelection);
 					
 				}
-				// after a double-click selection, the caret is placed correctly,
-				// but it is not positioned internally.  The effect is when the cursor
-				// is moved up or down a line, the caret will take on the column first
-				// clicked on for the double-click
-				textArea.SetDesiredColumn();
-
 				// HACK WARNING !!!
 				// must refresh here, because when a error tooltip is showed and the underlined
 				// code is double clicked the textArea don't update corrctly, updateline doesn't

src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextEditorControlBase.cs

@@ -627,7 +627,11 @@ namespace ICSharpCode.TextEditor
 			document.UndoStack.ClearAll();
 			document.BookmarkManager.Clear();
 			if (autoLoadHighlighting) {
-				document.HighlightingStrategy = HighlightingStrategyFactory.CreateHighlightingStrategyForFile(fileName);
+				try {
+					document.HighlightingStrategy = HighlightingStrategyFactory.CreateHighlightingStrategyForFile(fileName);
+				} catch (HighlightingDefinitionInvalidException ex) {
+					MessageBox.Show(ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
 			}
 			
 			if (autodetectEncoding) {

src/Libraries/ICSharpCode.TextEditor/Project/Src/Util/TipText.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+using System;
 using System.Drawing;
 
 namespace ICSharpCode.TextEditor.Util
@@ -13,7 +14,7 @@ namespace ICSharpCode.TextEditor.Util
 	{
 		float triHeight = 10;
 		float triWidth  = 10;
-			
+		
 		public CountTipText(Graphics graphics, Font font, string text) : base(graphics, font, text)
 		{
 		}
@@ -27,20 +28,20 @@ namespace ICSharpCode.TextEditor.Util
 			brush = Brushes.Black;
 			if (flipped) {
 				base.Graphics.FillPolygon(brush, new PointF[] {
-					new PointF(x,                y + triHeight2 - triHeight4),
-					new PointF(x + triWidth / 2, y + triHeight2 + triHeight4),
-					new PointF(x + triWidth,     y + triHeight2 - triHeight4),
-				});
+				                          	new PointF(x,                y + triHeight2 - triHeight4),
+				                          	new PointF(x + triWidth / 2, y + triHeight2 + triHeight4),
+				                          	new PointF(x + triWidth,     y + triHeight2 - triHeight4),
+				                          });
 				
 			} else {
 				base.Graphics.FillPolygon(brush, new PointF[] {
-					new PointF(x,                y +  triHeight2 + triHeight4),
-					new PointF(x + triWidth / 2, y +  triHeight2 - triHeight4),
-					new PointF(x + triWidth,     y +  triHeight2 + triHeight4),
-				});
+				                          	new PointF(x,                y +  triHeight2 + triHeight4),
+				                          	new PointF(x + triWidth / 2, y +  triHeight2 - triHeight4),
+				                          	new PointF(x + triWidth,     y +  triHeight2 + triHeight4),
+				                          });
 			}
 		}
-	
+		
 		public Rectangle DrawingRectangle1;
 		public Rectangle DrawingRectangle2;
 		
@@ -48,14 +49,14 @@ namespace ICSharpCode.TextEditor.Util
 		{
 			if (tipText != null && tipText.Length > 0) {
 				base.Draw(new PointF(location.X + triWidth + 4, location.Y));
-				DrawingRectangle1 = new Rectangle((int)location.X + 2, 
-				                                 (int)location.Y + 2, 
-				                                 (int)(triWidth), 
-				                                 (int)(triHeight));
+				DrawingRectangle1 = new Rectangle((int)location.X + 2,
+				                                  (int)location.Y + 2,
+				                                  (int)(triWidth),
+				                                  (int)(triHeight));
 				DrawingRectangle2 = new Rectangle((int)(location.X + base.AllocatedSize.Width - triWidth  - 2),
-				                                 (int)location.Y + 2, 
-				                                 (int)(triWidth), 
-				                                 (int)(triHeight));
+				                                  (int)location.Y + 2,
+				                                  (int)(triWidth),
+				                                  (int)(triHeight));
 				DrawTriangle(location.X + 2, location.Y + 2, false);
 				DrawTriangle(location.X + base.AllocatedSize.Width - triWidth  - 2, location.Y + 2, true);
 			}
@@ -79,16 +80,18 @@ namespace ICSharpCode.TextEditor.Util
 	class TipText: TipSection
 	{
 		protected StringAlignment horzAlign;
-		protected StringAlignment vertAlign;	
+		protected StringAlignment vertAlign;
 		protected Color           tipColor;
 		protected Font            tipFont;
 		protected StringFormat    tipFormat;
 		protected string          tipText;
-        
+		
 		public TipText(Graphics graphics, Font font, string text):
 			base(graphics)
 		{
 			tipFont = font; tipText = text;
+			if (text != null && text.Length > short.MaxValue)
+				throw new ArgumentException("TipText: text too long (max. is " + short.MaxValue + " characters)", "text");
 			
 			Color               = SystemColors.InfoText;
 			HorizontalAlignment = StringAlignment.Near;
@@ -103,7 +106,7 @@ namespace ICSharpCode.TextEditor.Util
 				Graphics.DrawString(tipText, tipFont,
 				                    BrushRegistry.GetBrush(Color),
 				                    drawRectangle,
-				                    GetInternalStringFormat());   
+				                    GetInternalStringFormat());
 			}
 		}
 		

src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs

@@ -289,7 +289,13 @@ namespace ICSharpCode.NRefactory.Parser.CSharp
 				// Try to determine a parsable value using ranges. (Quick hack!)
 				double d = 0;
 				if (ishex) {
-					d = ulong.Parse(digit, NumberStyles.HexNumber);
+					ulong result;
+					if (ulong.TryParse(digit, NumberStyles.HexNumber, null, out result)) {
+						d = result;
+					} else {
+						errors.Error(y, x, String.Format("Can't parse hexadecimal constant {0}", digit));
+						return new Token(Tokens.Literal, x, y, stringValue.ToString(), 0);
+					}
 				} else {
 					if (!Double.TryParse(digit, NumberStyles.Integer, null, out d)) {
 						errors.Error(y, x, String.Format("Can't parse integral constant {0}", digit));

src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Lexer.cs

@@ -12,7 +12,7 @@ using System.Text;
 
 namespace ICSharpCode.NRefactory.Parser.VB
 {
-	internal class Lexer : AbstractLexer
+	internal sealed class Lexer : AbstractLexer
 	{
 		bool lineEnd = true;
 		
@@ -318,6 +318,7 @@ namespace ICSharpCode.NRefactory.Parser.VB
 				ch = Char.ToUpper(ch, CultureInfo.InvariantCulture);
 				bool unsigned = ch == 'U';
 				if (unsigned) {
+					ReaderRead(); // read the U
 					ch = (char)ReaderPeek();
 					sb.Append(ch);
 					ch = Char.ToUpper(ch, CultureInfo.InvariantCulture);
@@ -325,60 +326,65 @@ namespace ICSharpCode.NRefactory.Parser.VB
 						errors.Error(Line, Col, "Invalid type character: U" + ch);
 					}
 				}
-				if (isokt) {
-					ReaderRead();
-					ulong number = 0L;
-					for (int i = 0; i < digit.Length; ++i) {
-						number = number * 8 + digit[i] - '0';
+				try {
+					if (isokt) {
+						ReaderRead();
+						ulong number = 0L;
+						for (int i = 0; i < digit.Length; ++i) {
+							number = number * 8 + digit[i] - '0';
+						}
+						if (ch == 'S') {
+							if (unsigned)
+								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (ushort)number);
+							else
+								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (short)number);
+						} else if (ch == '%' || ch == 'I') {
+							if (unsigned)
+								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (uint)number);
+							else
+								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (int)number);
+						} else if (ch == '&' || ch == 'L') {
+							if (unsigned)
+								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (ulong)number);
+							else
+								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (long)number);
+						} else {
+							if (number > uint.MaxValue) {
+								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), unchecked((long)number));
+							} else {
+								return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), unchecked((int)number));
+							}
+						}
 					}
 					if (ch == 'S') {
+						ReaderRead();
 						if (unsigned)
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (ushort)number);
+							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), UInt16.Parse(digit, ishex ? NumberStyles.HexNumber : NumberStyles.Number));
 						else
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (short)number);
+							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), Int16.Parse(digit, ishex ? NumberStyles.HexNumber : NumberStyles.Number));
 					} else if (ch == '%' || ch == 'I') {
+						ReaderRead();
 						if (unsigned)
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (uint)number);
+							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), UInt32.Parse(digit, ishex ? NumberStyles.HexNumber : NumberStyles.Number));
 						else
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (int)number);
+							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), Int32.Parse(digit, ishex ? NumberStyles.HexNumber : NumberStyles.Number));
 					} else if (ch == '&' || ch == 'L') {
+						ReaderRead();
 						if (unsigned)
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (ulong)number);
+							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), UInt64.Parse(digit, ishex ? NumberStyles.HexNumber : NumberStyles.Number));
 						else
-							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), (long)number);
-					} else {
+							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), Int64.Parse(digit, ishex ? NumberStyles.HexNumber : NumberStyles.Number));
+					} else if (ishex) {
+						ulong number = UInt64.Parse(digit, NumberStyles.HexNumber);
 						if (number > uint.MaxValue) {
 							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), unchecked((long)number));
 						} else {
 							return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), unchecked((int)number));
 						}
 					}
-				}
-				if (ch == 'S') {
-					ReaderRead();
-					if (unsigned)
-						return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), UInt16.Parse(digit, ishex ? NumberStyles.HexNumber : NumberStyles.Number));
-					else
-						return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), Int16.Parse(digit, ishex ? NumberStyles.HexNumber : NumberStyles.Number));
-				} else if (ch == '%' || ch == 'I') {
-					ReaderRead();
-					if (unsigned)
-						return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), UInt32.Parse(digit, ishex ? NumberStyles.HexNumber : NumberStyles.Number));
-					else
-						return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), Int32.Parse(digit, ishex ? NumberStyles.HexNumber : NumberStyles.Number));
-				} else if (ch == '&' || ch == 'L') {
-					ReaderRead();
-					if (unsigned)
-						return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), UInt64.Parse(digit, ishex ? NumberStyles.HexNumber : NumberStyles.Number));
-					else
-						return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), Int64.Parse(digit, ishex ? NumberStyles.HexNumber : NumberStyles.Number));
-				} else if (ishex) {
-					ulong number = UInt64.Parse(digit, NumberStyles.HexNumber);
-					if (number > uint.MaxValue) {
-						return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), unchecked((long)number));
-					} else {
-						return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), unchecked((int)number));
-					}
+				} catch (OverflowException ex) {
+					errors.Error(Line, Col, ex.Message);
+					return new Token(Tokens.LiteralInteger, x, y, sb.ToString(), 0);
 				}
 			}
 			Token nextToken = null; // if we accedently read a 'dot'

src/Libraries/NRefactory/Test/Lexer/CSharp/NumberLexerTest.cs

@@ -37,6 +37,7 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.CSharp
 			Assert.AreEqual(Tokens.Literal, t.kind, "Tokens.Literal");
 			Assert.AreEqual(text, t.val, "value");
 			Assert.IsNotNull(t.literalValue, "literalValue is null");
+			Assert.AreEqual(val.GetType(), t.literalValue.GetType(), "literalValue.GetType()");
 			Assert.AreEqual(val, t.literalValue, "literalValue");
 		}
 		
@@ -80,12 +81,15 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.CSharp
 			GenerateLexer(new StringReader("0xG2F")).NextToken();
 			// SD2-457
 			GenerateLexer(new StringReader("0x")).NextToken();
+			// hexadecimal integer >ulong.MaxValue
+			GenerateLexer(new StringReader("0xfedcba98765432100")).NextToken();
 		}
 		
 		[Test]
 		public void TestLongHexadecimalInteger()
 		{
 			CheckToken("0x4244636f446c6d58", 0x4244636f446c6d58);
+			CheckToken("0xf244636f446c6d58", 0xf244636f446c6d58);
 		}
 		
 		[Test]

src/Libraries/NRefactory/Test/Lexer/VBNet/LiteralsTests.cs

@@ -37,6 +37,7 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB
 			Token t = GetSingleToken(text);
 			Assert.AreEqual(tokenType, t.kind, "Tokens.Literal");
 			Assert.IsNotNull(t.literalValue, "literalValue is null");
+			Assert.AreEqual(val.GetType(), t.literalValue.GetType(), "literalValue.GetType()");
 			Assert.AreEqual(val, t.literalValue, "literalValue");
 		}
 		
@@ -63,8 +64,35 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB
 		public void TestHexadecimalInteger()
 		{
 			CheckToken("&H10", Tokens.LiteralInteger, 0x10);
-			CheckToken("&H10&", Tokens.LiteralInteger, 0x10);
-			CheckToken("&h3ff&", Tokens.LiteralInteger, 0x3ff);
+			CheckToken("&H10&", Tokens.LiteralInteger, (long)0x10);
+			CheckToken("&h3ff%", Tokens.LiteralInteger, 0x3ff);
+			CheckToken("&h8000s", Tokens.LiteralInteger, short.MinValue);
+			CheckToken("&h8000us", Tokens.LiteralInteger, (ushort)0x8000);
+			CheckToken("&HffffFFFF", Tokens.LiteralInteger, -1);
+			CheckToken("&HffffFFFF%", Tokens.LiteralInteger, -1);
+			CheckToken("&HffffFFFFui", Tokens.LiteralInteger, uint.MaxValue);
+			CheckToken("&HffffFFFF&", Tokens.LiteralInteger, (long)uint.MaxValue);
+		}
+		
+		[Test]
+		public void TestLongHexadecimalInteger()
+		{
+			CheckToken("&H4244636f446c6d58", Tokens.LiteralInteger, 0x4244636f446c6d58);
+			CheckToken("&hf244636f446c6d58", Tokens.LiteralInteger, -989556688574190248);
+			CheckToken("&hf244636f446c6d58&", Tokens.LiteralInteger, -989556688574190248);
+			CheckToken("&hf244636f446c6d58ul", Tokens.LiteralInteger, 0xf244636f446c6d58);
+		}
+		
+		[Test]
+		public void InvalidHexadecimalInteger()
+		{
+			// just check that we don't get exceptions:
+			GenerateLexer(new StringReader("&H")).NextToken();
+			// >ulong.MaxValue
+			GenerateLexer(new StringReader("&hff244636f446c6d58")).NextToken();
+			// needs an ulong, but "i" postfix specified integer
+			GenerateLexer(new StringReader("&hf244636f446c6d58i")).NextToken();
+			GenerateLexer(new StringReader("&hf244636f446c6d58ui")).NextToken();
 		}
 		
 		[Test]

src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AddWebReferenceDialog.cs

@@ -25,8 +25,6 @@ namespace ICSharpCode.SharpDevelop.Gui
 	{
 		WebServiceDiscoveryClientProtocol discoveryClientProtocol;
 		CredentialCache credentialCache = new CredentialCache();
-		int initialFormWidth;
-		int initialUrlComboBoxWidth;
 		string namespacePrefix = String.Empty;
 		Uri discoveryUri;
 		IProject project;
@@ -42,13 +40,13 @@ namespace ICSharpCode.SharpDevelop.Gui
 			AddMruList();
 			AddImages();
 			AddStringResources();
-			initialFormWidth = Width;
-			initialUrlComboBoxWidth = urlComboBox.Width;
+			// fixes forum-16247: Add Web Reference dialog missing URL on 120 DPI
+			AddWebReferenceDialogResize(null, null);
 			this.project = project;
 		}
 		
 		/// <summary>
-		/// The prefix that will be added to the web service's namespace 
+		/// The prefix that will be added to the web service's namespace
 		/// (typically the project's namespace).
 		/// </summary>
 		public string NamespacePrefix {
@@ -348,7 +346,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		private System.Windows.Forms.ToolStripButton backButton;
 		private ICSharpCode.SharpDevelop.Gui.WebServicesView webServicesView;
 		#endregion
-	
+		
 		void AddMruList()
 		{
 			try {
@@ -374,7 +372,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 				} else if (backButton.Selected && e.Modifiers == Keys.Shift) {
 					toolStrip.TabStop = true;
 				}
-			} 
+			}
 		}
 		
 		void ToolStripEnter(object sender, EventArgs e)
@@ -391,7 +389,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		{
 			try {
 				webBrowser.GoBack();
-			} catch (Exception) { }			
+			} catch (Exception) { }
 		}
 		
 		void ForwardButtonClick(object sender, System.EventArgs e)
@@ -405,7 +403,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		{
 			webBrowser.Stop();
 			StopDiscovery();
-			addButton.Enabled = false;		
+			addButton.Enabled = false;
 		}
 		
 		void RefreshButtonClick(object sender, System.EventArgs e)
@@ -438,7 +436,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		void WebBrowserNavigated(object sender, WebBrowserNavigatedEventArgs e)
 		{
-			Cursor = Cursors.Default;	
+			Cursor = Cursors.Default;
 			stopButton.Enabled = false;
 			urlComboBox.Text = webBrowser.Url.ToString();
 			StartDiscovery(e.Url);
@@ -471,7 +469,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		{
 			if (discoveryUri != null) {
 				return discoveryUri.Host;
-			} 
+			}
 			return String.Empty;
 		}
 
@@ -493,7 +491,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 								break;
 							}
 						}
-					}					
+					}
 				}
 				
 				return valid;
@@ -505,7 +503,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 				if (referenceNameTextBox.Text.Length > 0) {
 					if (referenceNameTextBox.Text.IndexOf('\\') == -1) {
 						if (!ContainsInvalidDirectoryChar(referenceNameTextBox.Text)) {
-						    	return true;
+							return true;
 						}
 					}
 				}
@@ -552,7 +550,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		{
 			AsyncDiscoveryState state = (AsyncDiscoveryState)result.AsyncState;
 			WebServiceDiscoveryClientProtocol protocol = state.Protocol;
-					
+			
 			// Check that we are still waiting for this particular callback.
 			bool wanted = false;
 			lock (this) {
@@ -578,7 +576,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 						Invoke(handler, new object[] {null});
 					}
 				}
-			} 
+			}
 		}
 		
 		/// <summary>
@@ -593,7 +591,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 					} catch (NotImplementedException) {
 					} catch (ObjectDisposedException) {
 						// Receive this error if the url pointed to a file.
-						// The discovery client will already have closed the file 
+						// The discovery client will already have closed the file
 						// so the abort fails.
 					}
 					discoveryClientProtocol.Dispose();
@@ -619,7 +617,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			protocol.ResolveOneLevel();
 			
 			foreach (DictionaryEntry entry in protocol.References) {
-				ContractReference contractRef = entry.Value as ContractReference;				
+				ContractReference contractRef = entry.Value as ContractReference;
 				if (contractRef != null) {
 					services.Add(contractRef.Contract);
 				}
@@ -628,7 +626,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		}
 		
 		void DiscoveredWebServices(DiscoveryClientProtocol protocol)
-		{			
+		{
 			if (protocol != null) {
 				addButton.Enabled = true;
 				namespaceTextBox.Text = GetDefaultNamespace();
@@ -656,8 +654,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		void AddWebReferenceDialogResize(object sender, EventArgs e)
 		{
-			int widthChange = Width - initialFormWidth;
-			urlComboBox.Width = initialUrlComboBoxWidth + widthChange;	
+			int width = toolStrip.ClientSize.Width;
+			foreach (ToolStripItem item in toolStrip.Items) {
+				if (item != urlComboBox)
+					width -= item.Width + 8;
+			}
+			urlComboBox.Width = width;
 		}
 		
 		void AddButtonClick(object sender,EventArgs e)
@@ -665,14 +667,14 @@ namespace ICSharpCode.SharpDevelop.Gui
 			try {
 				if (!IsValidReferenceName) {
 					MessageService.ShowError(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.InvalidReferenceNameError}"));
-					return;					
+					return;
 				}
 				
 				if (!IsValidNamespace) {
 					MessageService.ShowError(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.InvalidNamespaceError}"));
-					return;										
+					return;
 				}
-											
+				
 				webReference.Name = referenceNameTextBox.Text;
 				webReference.ProxyNamespace = namespaceTextBox.Text;
 				
@@ -717,7 +719,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			
 			stopButton.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.StopButtonTooltip}");
 			stopButton.ToolTipText = stopButton.Text;
-				
+			
 			webServicesTabPage.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.WebServicesTabPageTitle}");
 			webServicesTabPage.ToolTipText = webServicesTabPage.Text;
 		}

src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/WebServicesView.cs

@@ -99,8 +99,8 @@ namespace ICSharpCode.SharpDevelop.Gui
 			// webServicesListView
 			// 
 			this.webServicesListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-									this.propertyColumnHeader,
-									this.valueColumnHeader});
+			                                          	this.propertyColumnHeader,
+			                                          	this.valueColumnHeader});
 			this.webServicesListView.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.webServicesListView.Location = new System.Drawing.Point(0, 0);
 			this.webServicesListView.Name = "webServicesListView";
@@ -136,22 +136,22 @@ namespace ICSharpCode.SharpDevelop.Gui
 		private System.Windows.Forms.SplitContainer splitContainer;
 		
 		#endregion
-	
+		
 		void WebServicesTreeViewAfterSelect(object sender, TreeViewEventArgs e)
-		{						
-			ListViewItem item;		
+		{
+			ListViewItem item;
 			webServicesListView.Items.Clear();
-				
+			
 			if(e.Node.Tag is ServiceDescription) {
 				ServiceDescription desc = (ServiceDescription)e.Node.Tag;
-				item = new ListViewItem();				
+				item = new ListViewItem();
 				item.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.RetrievalUriProperty}");
 				item.SubItems.Add(desc.RetrievalUrl);
 				webServicesListView.Items.Add(item);
 			}
 			else if(e.Node.Tag is Service) {
 				Service service = (Service)e.Node.Tag;
-				item = new ListViewItem();				
+				item = new ListViewItem();
 				item.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.DocumentationProperty}");
 				item.SubItems.Add(service.Documentation);
 				webServicesListView.Items.Add(item);
@@ -159,19 +159,19 @@ namespace ICSharpCode.SharpDevelop.Gui
 			else if(e.Node.Tag is Port) {
 				Port port = (Port)e.Node.Tag;
 
-				item = new ListViewItem();				
+				item = new ListViewItem();
 				item.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.DocumentationProperty}");
 				item.SubItems.Add(port.Documentation);
 				webServicesListView.Items.Add(item);
 				
-				item = new ListViewItem();				
+				item = new ListViewItem();
 				item.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.BindingProperty}");
 				item.SubItems.Add(port.Binding.Name);
 				webServicesListView.Items.Add(item);
 				
-				item = new ListViewItem();				
+				item = new ListViewItem();
 				item.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.ServiceNameProperty}");
-				item.SubItems.Add(port.Service.Name);												
+				item.SubItems.Add(port.Service.Name);
 				webServicesListView.Items.Add(item);
 			}
 			else if(e.Node.Tag is Operation) {
@@ -190,7 +190,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		}
 		
 		void Add(ServiceDescription description)
-		{		
+		{
 			TreeNode rootNode = new TreeNode(GetName(description));
 			rootNode.Tag = description;
 			rootNode.ImageIndex = ServiceDescriptionImageIndex;
@@ -199,19 +199,19 @@ namespace ICSharpCode.SharpDevelop.Gui
 
 			foreach(Service service in description.Services) {
 				// Add a Service node
-				TreeNode serviceNode = new TreeNode(service.Name);				
+				TreeNode serviceNode = new TreeNode(service.Name);
 				serviceNode.Tag = service;
 				serviceNode.ImageIndex = ServiceImageIndex;
 				serviceNode.SelectedImageIndex = ServiceImageIndex;
 				rootNode.Nodes.Add(serviceNode);
-					
-				foreach(Port port in service.Ports) {					
+				
+				foreach(Port port in service.Ports) {
 					TreeNode portNode = new TreeNode(port.Name);
 					portNode.Tag = port;
 					portNode.ImageIndex = PortImageIndex;
 					portNode.SelectedImageIndex = PortImageIndex;
 					serviceNode.Nodes.Add(portNode);
-								
+					
 					// Get the operations
 					System.Web.Services.Description.Binding binding = description.Bindings[port.Binding.Name];
 					if (binding != null) {
@@ -223,12 +223,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 								operationNode.ImageIndex = OperationImageIndex;
 								operationNode.SelectedImageIndex = OperationImageIndex;
 								portNode.Nodes.Add(operationNode);
-							}	
+							}
 						}
-					}			
-				}																										
+					}
+				}
 			}
-			webServicesTreeView.ExpandAll();	
+			webServicesTreeView.ExpandAll();
 		}
 		
 		string GetName(ServiceDescription description)
@@ -248,13 +248,17 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		void AddImages()
 		{
-			ImageList imageList = new ImageList();
-			imageList.Images.Add(ResourceService.GetBitmap("Icons.16x16.Library"));
-			imageList.Images.Add(ResourceService.GetBitmap("Icons.16x16.Interface"));
-			imageList.Images.Add(ResourceService.GetBitmap("Icons.16x16.Class"));
-			imageList.Images.Add(ResourceService.GetBitmap("Icons.16x16.Method"));
-			
-			webServicesTreeView.ImageList = imageList;
+			try {
+				ImageList imageList = new ImageList();
+				imageList.Images.Add(ResourceService.GetBitmap("Icons.16x16.Library"));
+				imageList.Images.Add(ResourceService.GetBitmap("Icons.16x16.Interface"));
+				imageList.Images.Add(ResourceService.GetBitmap("Icons.16x16.Class"));
+				imageList.Images.Add(ResourceService.GetBitmap("Icons.16x16.Method"));
+				
+				webServicesTreeView.ImageList = imageList;
+			} catch (ResourceNotFoundException) {
+				// in design mode, the core is not initialized -> the resources cannot be found
+			}
 		}
 		
 		void AddStringResources()

src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs

@@ -857,7 +857,20 @@ namespace ICSharpCode.SharpDevelop.Project
 					project.Load(fileName);
 				} catch (MSBuild.InvalidProjectFileException ex) {
 					LoggingService.Warn(ex);
-					if (ex.ErrorCode == "MSB4075") {
+					LoggingService.Warn("ErrorCode = " + ex.ErrorCode);
+					bool isVS2003ProjectWithInvalidEncoding = false;
+					if (ex.ErrorCode == "MSB4025") {
+						// Invalid XML.
+						// This MIGHT be a VS2003 project in default encoding, so we have to use this
+						// ugly trick to detect old-style projects
+						using (StreamReader r = File.OpenText(fileName)) {
+							if (r.ReadLine() == "<VisualStudioProject>") {
+								isVS2003ProjectWithInvalidEncoding = true;
+							}
+						}
+					}
+					if (ex.ErrorCode == "MSB4075" || isVS2003ProjectWithInvalidEncoding) {
+						// MSB4075 is:
 						// "The project file must be opened in VS IDE and converted to latest version
 						// before it can be build by MSBuild."
 						Converter.PrjxToSolutionProject.ConvertVSNetProject(fileName);

src/Main/Base/Project/Src/Services/RefactoringService/LocalVariableRefactoring.cs

@@ -29,7 +29,11 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 	{
 		public override void Run()
 		{
-			LocalResolveResult local = (LocalResolveResult)Owner;
+			Run((LocalResolveResult)Owner);
+		}
+		
+		public static void Run(LocalResolveResult local)
+		{
 			string newName = MessageService.ShowInputBox("${res:SharpDevelop.Refactoring.Rename}", "${res:SharpDevelop.Refactoring.RenameMemberText}", local.Field.Name);
 			if (!FindReferencesAndRenameHelper.CheckName(newName, local.Field.Name)) return;
 			

src/Main/Base/Project/Src/Services/RefactoringService/RefactorMenu.cs

@@ -114,18 +114,13 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 			ResolveResult rr = ResolveAtCaret(textEditor);
 			if (rr is MixedResolveResult) rr = (rr as MixedResolveResult).PrimaryResult;
 			if (rr is TypeResolveResult) {
-				IClass c = (rr as TypeResolveResult).ResolvedClass;
-				if (c == null) {
-					ShowUnknownSymbolError();
-				} else if (c.CompilationUnit.FileName == null) {
-					ShowNoUserCodeError();
-				} else {
-					FindReferencesAndRenameHelper.RenameClass(c);
-				}
+				Rename((rr as TypeResolveResult).ResolvedClass);
 			} else if (rr is MemberResolveResult) {
 				Rename((rr as MemberResolveResult).ResolvedMember);
 			} else if (rr is MethodResolveResult) {
 				Rename((rr as MethodResolveResult).GetMethodIfSingleOverload());
+			} else if (rr is LocalResolveResult) {
+				RenameLocalVariableCommand.Run(rr as LocalResolveResult);
 			} else {
 				ShowUnknownSymbolError();
 			}
@@ -147,7 +142,23 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 			} else if (member.DeclaringType.CompilationUnit.FileName == null) {
 				ShowNoUserCodeError();
 			} else {
-				FindReferencesAndRenameHelper.RenameMember(member);
+				IMethod method = member as IMethod;
+				if (method != null && method.IsConstructor) {
+					Rename(method.DeclaringType);
+				} else {
+					FindReferencesAndRenameHelper.RenameMember(member);
+				}
+			}
+		}
+		
+		static void Rename(IClass c)
+		{
+			if (c == null) {
+				ShowUnknownSymbolError();
+			} else if (c.CompilationUnit.FileName == null) {
+				ShowNoUserCodeError();
+			} else {
+				FindReferencesAndRenameHelper.RenameClass(c);
 			}
 		}
 	}

src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs

@@ -53,12 +53,22 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
 			// This should prefer non-designer files over designer files.
 			IClass preferredClass = parts[0];
 			for (int i = 1; i < parts.Count; i++) {
-				if (parts[i].CompilationUnit.FileName.Length < preferredClass.CompilationUnit.FileName.Length)
+				if (IsShorterFileName(parts[i].CompilationUnit.FileName, preferredClass.CompilationUnit.FileName))
 					preferredClass = parts[i];
 			}
 			return preferredClass;
 		}
 		
+		static bool IsShorterFileName(string a, string b)
+		{
+			// Fix forum-17295: compilation unit's file name might be null: prefer the non-null file
+			if (a == null)
+				return false;
+			if (b == null)
+				return true;
+			return a.Length < b.Length;
+		}
+		
 		static IClass GetCurrentPart(IClass possibleCompound)
 		{
 			IViewContent viewContent = WorkbenchSingleton.Workbench.ActiveViewContent;

src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs

@@ -145,7 +145,7 @@ namespace ICSharpCode.Core
 			get {
 				return enabled;
 			}
-			internal set {
+			set {
 				enabled = value;
 				this.Action = value ? AddInAction.Enable : AddInAction.Disable;
 			}

src/Main/ICSharpCode.SharpDevelop.Sda/Src/CallHelper.cs

@@ -25,6 +25,12 @@ namespace ICSharpCode.SharpDevelop.Sda
 		SharpDevelopHost.CallbackHelper callback;
 		bool useSharpDevelopErrorHandler;
 		
+		
+		public override object InitializeLifetimeService()
+		{
+			return null;
+		}
+		
 		#region Initialize Core
 		public void InitSharpDevelopCore(SharpDevelopHost.CallbackHelper callback, StartupSettings properties)
 		{

src/Main/ICSharpCode.SharpDevelop.Sda/Src/SharpDevelopHost.cs

@@ -340,6 +340,11 @@ namespace ICSharpCode.SharpDevelop.Sda
 				this.host = host;
 			}
 			
+			public override object InitializeLifetimeService()
+			{
+				return null;
+			}
+			
 			private bool InvokeRequired {
 				get {
 					return host.invokeTarget != null && host.invokeTarget.InvokeRequired;

src/Main/StartUp/Project/SharpDevelopMain.cs

@@ -72,7 +72,7 @@ namespace ICSharpCode.SharpDevelop
 			// LoggingService requires ICSharpCode.Core.dll and log4net.dll
 			// When a method containing a call to LoggingService is JITted, the
 			// libraries are loaded.
-			// We want to show the SplashScreen while those libraries are loaded, so
+			// We want to show the SplashScreen while those libraries are loading, so
 			// don't call LoggingService.
 			
 			#if DEBUG

src/Setup/Files.wxs

@@ -283,8 +283,7 @@
 										<File Source="..\..\bin\Tools\Wix\candle.exe" Name="candle.exe" Id="candle.exe" Assembly=".net" AssemblyApplication="candle.exe" AssemblyManifest="candle.exe" KeyPath="yes" />
 										<File Source="..\..\bin\Tools\Wix\candle.exe.config" Name="CANDLE_1.CON" Id="candle.exe.config" LongName="candle.exe.config" />
 									</Component>
-									<Component Id="WixLicenseFiles" Guid="35784338-0E6A-4046-A82F-79BCE7549F08" DiskId="1">
-										<File Source="..\..\bin\Tools\Wix\CPL.TXT" Name="CPL.TXT" Id="CPL.TXT" />
+									<Component Id="WixLicenseFiles" Guid="3EA29F1C-0855-4521-BEFE-7C6D5C4A5D30" DiskId="1">
 										<File Source="..\..\bin\Tools\Wix\License.rtf" Name="License.rtf" Id="License.rtf" />
 									</Component>
 									<Component Id="DarkExe" Guid="45BAAB13-6E19-42DA-80BE-8C44EAD8A24E" DiskId="1">
@@ -311,18 +310,6 @@
 									<Component Id="NetFxCaDll" Guid="F5970A44-7122-4660-ABCD-821360690CCC" DiskId="1">
 										<File Source="..\..\bin\Tools\Wix\netfxca.dll" Name="netfxca.dll" Id="netfxca.dll" />
 									</Component>
-									<Component Id="PcaExecDll" Guid="978F8CBF-CB97-492F-B787-C4C9049AAFCD" DiskId="1">
-										<File Source="..\..\bin\Tools\Wix\pcaexec.dll" Name="pcaexec.dll" Id="pcaexec.dll" />
-									</Component>
-									<Component Id="PcaExtDll" Guid="993733F6-DE48-4723-B1BF-6BC9BD395AEF" DiskId="1">
-										<File Source="..\..\bin\Tools\Wix\pcaext.dll" Name="pcaext.dll" Id="pcaext.dll" Assembly=".net" AssemblyApplication="pcaext.dll" AssemblyManifest="pcaext.dll" KeyPath="yes" />
-									</Component>
-									<Component Id="PcaSchedDll" Guid="4296DDD0-93F0-4341-AAAC-9D64B7974EE7" DiskId="1">
-										<File Source="..\..\bin\Tools\Wix\pcasched.dll" Name="pcasched.dll" Id="pcasched.dll" />
-									</Component>
-									<Component Id="PubCaWixLib" Guid="FA9D7586-CE64-45EF-B8F4-8104B53BA7D2" DiskId="1">
-										<File Source="..\..\bin\Tools\Wix\pubca.wixlib" Name="pubca.lib" LongName="pubca.wixlib" Id="pubca.wixlib" />
-									</Component>
 									<Component Id="ScaWixLib" Guid="97C97B61-27B2-4520-8406-AFD3C0627081" DiskId="1">
 										<File Source="..\..\bin\Tools\Wix\sca.wixlib" Name="sca.lib" Id="sca.wixlib" LongName="sca.wixlib" />
 									</Component>
@@ -364,11 +351,8 @@
 									<Component Id="WixUiWixLib" Guid="EC84F252-770A-457F-8701-99C93684D6B6" DiskId="1">
 										<File Source="..\..\bin\Tools\Wix\wixui.wixlib" Name="wixui.lib" LongName="wixui.wixlib" Id="wixui.wixlib" />
 									</Component>
-									<Component Id="WixLocalisationFiles" Guid="5BBC8B25-5495-4AFA-B4C3-1A2ABD907314" DiskId="1">
-										<File Source="..\..\bin\Tools\Wix\WixUI_de-de.wxl" Name="wixuide.wxl" Id="WixUI_de_de.wxl" LongName="WixUI_de-de.wxl" />
+									<Component Id="WixUiEnUsWxl" Guid="20AAD10C-F5C9-46E8-A515-B516C494235B" DiskId="1">
 										<File Source="..\..\bin\Tools\Wix\WixUI_en-us.wxl" Name="wixuien.wxs" Id="WixUI_en_us.wxl" LongName="WixUI_en-us.wxl" />
-										<File Source="..\..\bin\Tools\Wix\WixUI_es-es.wxl" Name="wixuies.wxl" Id="WixUI_es_es.wxl" LongName="WixUI_es-es.wxl" />
-										<File Source="..\..\bin\Tools\Wix\WixUI_nl-nl.wxl" Name="wixuinl.wxl" Id="WixUI_nl_nl.wxl" LongName="WixUI_nl-nl.wxl" />
 									</Component>
 									<Directory Id="WixBitmapsFolder" Name="Bitmaps">
 										<Component Guid="363E0512-B16C-43ED-A1BE-CE91DBD2463E" Id="WixBitmapFiles" DiskId="1">
@@ -393,35 +377,9 @@
 											<File Source="..\..\bin\Tools\Wix\doc\vs.xsd" Name="vs.xsd" Id="vs.xsd" />
 										</Component>
 									</Directory>
-									<Directory Id="WixIncFolder" Name="inc">
-										<Component Guid="07E93366-FFBD-4C7A-AF4B-F557EC5B42DD" Id="WixIncFiles" DiskId="1">
-											<File Source="..\..\bin\Tools\Wix\inc\aclutil.h" Name="aclutil.h" Id="aclutil.h" />
-											<File Source="..\..\bin\Tools\Wix\inc\cabcutil.h" Name="cabcutil.h" Id="cabcutil.h" />
-											<File Source="..\..\bin\Tools\Wix\inc\cabutil.h" Name="cabutil.h" Id="cabutil.h" />
-											<File Source="..\..\bin\Tools\Wix\inc\dirutil.h" Name="dirutil.h" Id="dirutil.h" />
-											<File Source="..\..\bin\Tools\Wix\inc\dutil.h" Name="dutil.h" Id="dutil.h" />
-											<File Source="..\..\bin\Tools\Wix\inc\fileutil.h" Name="fileutil.h" Id="fileutil.h" />
-											<File Source="..\..\bin\Tools\Wix\inc\memutil.h" Name="memutil.h" Id="memutil.h" />
-											<File Source="..\..\bin\Tools\Wix\inc\metautil.h" Name="metautil.h" Id="metautil.h" />
-											<File Source="..\..\bin\Tools\Wix\inc\perfutil.h" Name="perfutil.h" Id="perfutil.h" />
-											<File Source="..\..\bin\Tools\Wix\inc\sqlutil.h" Name="sqlutil.h" Id="sqlutil.h" />
-											<File Source="..\..\bin\Tools\Wix\inc\strutil.h" Name="strutil.h" Id="strutil.h" />
-											<File Source="..\..\bin\Tools\Wix\inc\wcautil.h" Name="wcautil.h" Id="wcautil.h" />
-											<File Source="..\..\bin\Tools\Wix\inc\xmlutil.h" Name="xmlutil.h" Id="xmlutil.h" />
-										</Component>
-									</Directory>
-									<Directory Id="WixLibFolder" Name="lib">
-										<Component Guid="B2006977-986A-40C2-8C36-C349AC90DF5E" Id="WixLibFiles" DiskId="1">
-											<File Source="..\..\bin\Tools\Wix\lib\dutil.lib" Name="dutil.lib" Id="dutil.lib" />
-											<File Source="..\..\bin\Tools\Wix\lib\wcautil.lib" Name="wcautil.lib" Id="wcautil.lib" />
-										</Component>
-									</Directory>
 									<Component Guid="6B84E84F-C796-4104-981C-07C16CAAB0F8" Id="WixMMCExtensionDll" DiskId="1">
 										<File Source="..\..\bin\Tools\Wix\WixMMCExtension.dll" Name="WIXMMC.DLL" Id="WixMMCExtension.dll" LongName="WixMMCExtension.dll" Assembly=".net" AssemblyApplication="WixMMCExtension.dll" AssemblyManifest="WixMMCExtension.dll" KeyPath="yes" />
 									</Component>
-									<Component Guid="CB3536B4-5A4E-4578-9FDE-808367353C51" Id="WixUIhuhuWxl" DiskId="1">
-										<File Source="..\..\bin\Tools\Wix\WixUI_hu-hu.wxl" Name="WIXUI.WXL" Id="WixUI_hu_hu.wxl" LongName="WixUI_hu-hu.wxl" KeyPath="yes" />
-									</Component>
 								</Directory>
 								<Directory Id="NUnitFolder" Name="NUnit">
 									<Component Guid="264B36E0-A168-432B-A227-F628D0159370" Id="NUnitCoreExtensionsDll" DiskId="1">
@@ -446,6 +404,9 @@
 									<Component Guid="AB89A052-2D0A-426E-B755-6FA1A9C1C64F" Id="NUnitFrameworkDll" DiskId="1">
 										<File Source="..\..\bin\Tools\NUnit\nunit.framework.dll" Name="nuframe.dll" Id="nunit.framework.dll" LongName="nunit.framework.dll" />
 									</Component>
+									<Component Guid="D67E8EC9-2D98-4889-856F-78FD2BE35947" Id="NUnitCoreInterfacesDll" DiskId="1">
+										<File Id="nunit.core.interfaces.dll" KeyPath="yes" LongName="nunit.core.interfaces.dll" Name="nucorif.dll" Assembly=".net" AssemblyApplication="nunit.core.interfaces.dll" AssemblyManifest="nunit.core.interfaces.dll" Source="..\..\bin\Tools\NUnit\nunit.core.interfaces.dll" />
+									</Component>
 									<Directory Id="NUnitGacFolder" Name="GAC">
 										<!-- 
 											This is a dummy folder since if we just add the 
@@ -488,9 +449,21 @@
 										<Component Guid="1615EFF3-D86A-4F7E-A1C7-4417EB420002" Id="NUnitCoreDllNetv11" DiskId="1">
 											<File Source="..\..\bin\Tools\NUnit\Net-1.1\nunit.core.dll" Name="nucore2.dll" Id="Net_1.1.nunit.core.dll" LongName="nunit.core.dll" Assembly=".net" AssemblyApplication="Net_1.1.nunit.core.dll" AssemblyManifest="Net_1.1.nunit.core.dll" KeyPath="yes" />
 										</Component>
+										<Component Guid="EA6D0786-6103-42DE-8E49-A65FC622D181" Id="NUnitUiKitDllNetv11" DiskId="1">
+											<File Source="..\..\bin\Tools\NUnit\Net-1.1\nunit.uikit.dll" Name="nuuikit.dll" Id="Net_1.1.nunit.uikit.dll" LongName="nunit.uikit.dll" Assembly=".net" AssemblyApplication="Net_1.1.nunit.uikit.dll" AssemblyManifest="Net_1.1.nunit.uikit.dll" KeyPath="yes" />
+										</Component>
 										<Component Guid="3D66D8B1-5C03-404B-882B-105715A598CD" Id="NUnitUtilDllNetv11" DiskId="1">
 											<File Source="..\..\bin\Tools\NUnit\Net-1.1\nunit.util.dll" Name="nuutil2.dll" Id="Net_1.1.nunit.util.dll" LongName="nunit.util.dll" Assembly=".net" AssemblyApplication="Net_1.1.nunit.util.dll" AssemblyManifest="Net_1.1.nunit.util.dll" KeyPath="yes" />
 										</Component>
+										<Component Guid="6B1EB863-88A1-4B3F-95C5-FCAC7C525998" Id="NUnitCoreInterfacesDllNetv11" DiskId="1">
+											<File Source="..\..\bin\Tools\NUnit\Net-1.1\nunit.core.interfaces.dll" Name="nucori2.dll" Id="Net_1.1.nunit.core.interfaces.dll" LongName="nunit.core.interfaces.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Net_1.1.nunit.core.interfaces.dll" AssemblyManifest="Net_1.1.nunit.core.interfaces.dll" />
+										</Component>
+										<Component Guid="F81843D5-CECB-431C-A940-33E8CC478D01" Id="NUnitCoreExtensionsDllNetv11" DiskId="1">
+											<File Source="..\..\bin\Tools\NUnit\Net-1.1\nunit.core.extensions.dll" Name="NCOREX1.DLL" Id="Net_1.1.nunit.core.extensions.dll" LongName="nunit.core.extensions.dll" Assembly=".net" KeyPath="yes" AssemblyApplication="Net_1.1.nunit.core.extensions.dll" AssemblyManifest="Net_1.1.nunit.core.extensions.dll" />
+										</Component>
+										<Component Guid="A1F0ABAB-3E44-4BD3-B2E1-13B9E4F28DA5" Id="NUnitFrameworkDllNetv11" DiskId="1">
+											<File Source="..\..\bin\Tools\NUnit\Net-1.1\nunit.framework.dll" Name="nuframe.dll" Id="Net_1.1.nunit.framework.dll" LongName="nunit.framework.dll" />
+										</Component>
 									</Directory>
 								</Directory>
 							</Directory>
@@ -521,6 +494,9 @@
 									<File Source="..\..\doc\technotes\TechicalWritingMadeEasier.rtf" Name="techwrit.rtf" Id="TechicalWritingMadeEasier.rtf" LongName="TechicalWritingMadeEasier.rtf" />
 									<File Source="..\..\doc\technotes\TheFineArtOfCommenting.rtf" Name="comment.rtf" Id="TheFineArtOfCommenting.rtf" LongName="TheFineArtOfCommenting.rtf" />
 								</Component>
+								<Component Guid="B5E6404F-E602-42AA-9C3A-996425AC3B40" Id="AddInWritingHelpWebsiteShortcut" DiskId="1">
+									<File Name="ADDINWH.URL" Id="AddInWritingHelp.url" LongName="Addin Writing Help.url" Source="..\..\doc\technotes\AddIn Writing Help.url" KeyPath="yes" />
+								</Component>
 							</Directory>
 						</Directory>
 						<Directory Id="DataFolder" Name="data">
@@ -687,7 +663,11 @@
 									<File Source="..\..\data\resources\StringResources.pt-br.resources" Name="STRIN_13.RES" Id="StringResources.pt_br.resources" LongName="StringResources.pt-br.resources" />
 									<File Source="..\..\data\resources\StringResources.ro.resources" Name="STRIN_14.RES" Id="StringResources.ro.resources" LongName="StringResources.ro.resources" />
 									<File Source="..\..\data\resources\StringResources.se.resources" Name="STRIN_15.RES" Id="StringResources.se.resources" LongName="StringResources.se.resources" />
+								</Component>
+								<Component Guid="720DC3DF-9547-4069-9C36-873F41579791" Id="StringResources.pt.resources" DiskId="1">
 									<File Source="..\..\data\resources\StringResources.pt.resources" Name="STRIN_16.RES" Id="StringResources.pt.resources" LongName="StringResources.pt.resources" />
+								</Component>
+								<Component Guid="78CE4E0B-296B-4479-8978-8D389BF01885" Id="StringResources.cngb.resources" DiskId="1">
 									<File Source="..\..\data\resources\StringResources.cn-gb.resources" Name="CB-GB.RES" Id="StringResources.cn_gb.resources" LongName="StringResources.cn-gb.resources" />
 								</Component>
 							</Directory>
@@ -752,6 +732,9 @@
 										<Component Guid="4431463D-4FA8-48A5-9D92-D1FDA818B324" Id="SharpDevelopReportTemplate" DiskId="1">
 											<File Source="..\..\data\templates\file\Misc\EmptyReport.xft" Name="SDR.XFT" Id="EmptyReport.xft" LongName="EmptyReport.xft" />
 										</Component>
+										<Component Guid="DC3D0C22-B117-4FD8-AFF9-77B0CB36ECD1" Id="AppConfigFileTemplate" DiskId="1">
+											<File Source="..\..\data\templates\file\Misc\AppConfigFile.xft" Name="APPCONF.XFT" Id="AppConfigFile.xft" LongName="AppConfigFile.xft" />
+										</Component>
 									</Directory>
 									<Directory Id="SharpDevelopFileTemplatesFolder" LongName="SharpDevelop" Name="SharpDev">
 										<Component Guid="5CD9262F-7A3B-4F28-94FD-43693E669E2B" Id="SharpDevelopFileTemplates" DiskId="1">
@@ -800,6 +783,8 @@
 											<File Source="..\..\data\templates\project\CSharp\SharpDevelopMacro.xpt" Name="SHARPD_2.XPT" Id="CSharpSharpDevelopMacro.xpt" LongName="SharpDevelopMacro.xpt" />
 											<File Source="..\..\data\templates\project\CSharp\WebpageProject.xpt" Name="WEBPAG_1.XPT" Id="CSharpWebpageProject.xpt" LongName="WebpageProject.xpt" />
 											<File Source="..\..\data\templates\project\CSharp\WPFApplication.xpt" Name="WPFAPP_1.XPT" Id="CSharpWPFApplication.xpt" LongName="WPFApplication.xpt" />
+										</Component>
+										<Component Guid="9D156515-C54F-4DAB-AD66-40E44C28E56C" Id="CSharpProjectSharpDevelopCustomToolTemplates" DiskId="1">
 											<File Source="..\..\data\templates\project\CSharp\SharpDevelopCustomTool.xpt" Name="SHARPD_3.XPT" Id="SharpDevelopCustomTool.xpt" LongName="SharpDevelopCustomTool.xpt" />
 											<File Source="..\..\data\templates\project\CSharp\SharpDevelopCustomToolTemplate.xft.xml" Name="SHARPD_1.XML" Id="SharpDevelopCustomToolTemplate.xft.xml" LongName="SharpDevelopCustomToolTemplate.xft.xml" />
 										</Component>
@@ -834,11 +819,15 @@
 											<File Source="..\..\data\templates\project\VBNet\Service.xpt" Name="Service.xpt" Id="VBNetService.xpt" />
 											<File Source="..\..\data\templates\project\VBNet\SharedAddin.xpt" Name="SHARED_1.XPT" Id="VBNetSharedAddin.xpt" LongName="SharedAddin.xpt" />
 											<File Source="..\..\data\templates\project\VBNet\SharpDevelopAddin.xpt" Name="SHARPD_4.XPT" Id="VBNetSharpDevelopAddin.xpt" LongName="SharpDevelopAddin.xpt" />
+										</Component>
+										<Component Guid="5B2ED689-37E3-4C9C-A21B-A5315943792E" Id="VBNetProjectCompactFormsProjectTemplate" DiskId="1">
 											<File Source="..\..\data\templates\project\VBNet\CompactFormsProject.xpt" Name="COMPAC_1.XPT" Id="CompactFormsProject.xpt" LongName="CompactFormsProject.xpt" />
 										</Component>
 									</Directory>
 									<Component Guid="73EAC135-57B6-46C0-9F24-70A347B9AAC8" Id="ExampleProjectTemplate" DiskId="1">
 										<File Source="..\..\data\templates\project\ComplexExample.xpt.test" Name="COMPLE_1.TES" Id="ComplexExample.xpt.test" LongName="ComplexExample.xpt.test" />
+									</Component>
+									<Component Guid="56D8230D-F249-4BC8-A2A3-0BC800F29253" Id="AddInWritingHelp" DiskId="1">
 										<File Source="..\..\data\templates\project\AddInWritingHelp.txt" Name="ADDINW_1.TXT" Id="AddInWritingHelp.txt" LongName="AddInWritingHelp.txt" />
 									</Component>
 								</Directory>
@@ -937,6 +926,22 @@
 												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\EmptyWixProject.xpt" Name="EMPTYW_1.XPT" Id="EmptyWixProject.xpt" LongName="EmptyWixProject.xpt" />
 												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\WixDialog.xft" Name="WIXDIA_1.XFT" Id="WixDialog.xft" LongName="WixDialog.xft" />
 											</Component>
+											<Component Guid="2A63D916-4372-48F7-B486-45A4B35F96CA" Id="WixProjectIncludes" DiskId="1">
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultBrowseDialog.wxs" Name="BrwseDlg.wxs" Id="DefaultBrowseDialog.wxs" LongName="DefaultBrowseDialog.wxs" />
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultCancelDialog.wxs" Name="CanclDlg.wxs" Id="DefaultCancelDialog.wxs" LongName="DefaultCancelDialog.wxs" />
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultExitDialog.wxs" Name="ExitDlg.wxs" Id="DefaultExitDialog.wxs" LongName="DefaultExitDialog.wxs" />
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultFatalErrorDialog.wxs" Name="FatalDlg.wxs" Id="DefaultFatalErrorDialog.wxs" LongName="DefaultFatalErrorDialog.wxs" />
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultLicense.rtf" Name="License.rtf" Id="DefaultLicense.rtf" LongName="DefaultLicense.rtf" />
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultOutOfDiskSpaceDialog.wxs" Name="NoDskDlg.wxs" Id="DefaultOutOfDiskSpaceDialog.wxs" LongName="DefaultOutOfDiskSpaceDialog.wxs" />
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultOutOfRollbackDiskSpaceDialog.wxs" Name="RllbkDlg.wxs" Id="DefaultOutOfRollbackDiskSpaceDialog.wxs" LongName="DefaultOutOfRollbackDiskSpaceDialog.wxs" />
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultProgressDialog.wxs" Name="PrgsDlg.wxs" Id="DefaultProgressDialog.wxs" LongName="DefaultProgressDialog.wxs" />
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultSelectFolderDialog.wxs" Name="FldrDlg.wxs" Id="DefaultSelectFolderDialog.wxs" LongName="DefaultSelectFolderDialog.wxs" />
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultUserExitDialog.wxs" Name="ExitDlg.wxs" Id="DefaultUserExitDialog.wxs" LongName="DefaultUserExitDialog.wxs" />
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultUserInterface.wxs" Name="Intrface.wxs" Id="DefaultUserInterface.wxs" LongName="DefaultUserInterface.wxs" />
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultVerifyReadyDialog.wxs" Name="ReadyDlg.wxs" Id="DefaultVerifyReadyDialog.wxs" LongName="DefaultVerifyReadyDialog.wxs" />
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultViewLicenseAgreementDialog.wxs" Name="LicDlg.wxs" Id="DefaultViewLicenseAgreementDialog.wxs" LongName="DefaultViewLicenseAgreementDialog.wxs" />
+												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultWelcomeDialog.wxs" Name="WelcmDlg.wxs" Id="DefaultWelcomeDialog.wxs" LongName="DefaultWelcomeDialog.wxs" />
+											</Component>
 										</Directory>
 									</Directory>
 								</Directory>
@@ -1199,7 +1204,7 @@
 						</Directory>
 						<Component Guid="5212F79E-568F-426D-AFD2-FC93914D5CE9" Id="SharpDevelopWebsiteShortcut" DiskId="1">
 							<!--
-								The choice here is to either use the IniFile element to
+								The choice here is to either useW the IniFile element to
  								generate the two website shortcuts or create a 
 								SharpDevelop.url file on disk and use a File element and
 								link to the file instead. We will use a file otherwise an

src/Setup/Setup.wxs

@@ -208,8 +208,6 @@
 				<ComponentRef Id="WixDocFiles"/>
 				<ComponentRef Id="NetFxSchema"/>
 				<ComponentRef Id="VSExtensionSchema"/>
-				<ComponentRef Id="WixIncFiles"/>
-				<ComponentRef Id="WixLibFiles"/>
 				<ComponentRef Id="WixVSExtension"/>
 				<ComponentRef Id="CandleExe"/>
 				<ComponentRef Id="DarkExe"/>
@@ -219,10 +217,6 @@
 				<ComponentRef Id="MicrosoftToolsWindowsInstallerXmlNAntTasksDll"/>
 				<ComponentRef Id="NetFxWixLib"/>
 				<ComponentRef Id="NetFxCaDll"/>
-				<ComponentRef Id="PcaExecDll"/>
-				<ComponentRef Id="PcaExtDll"/>
-				<ComponentRef Id="PcaSchedDll"/>
-				<ComponentRef Id="PubCaWixLib"/>
 				<ComponentRef Id="ScaWixLib"/>
 				<ComponentRef Id="ScaExecDll"/>
 				<ComponentRef Id="ScashedDll"/>
@@ -237,8 +231,7 @@
 				<ComponentRef Id="WixNetFxExtensionDll"/>
 				<ComponentRef Id="WixTasksDll"/>
 				<ComponentRef Id="WixUiWixLib"/>
-				<ComponentRef Id="WixLocalisationFiles"/>
-				<ComponentRef Id="WixUIhuhuWxl"/>
+				<ComponentRef Id="WixUiEnUsWxl"/>
 				<ComponentRef Id="NUnitCoreExtensionsDll"/>
 				<ComponentRef Id="NUnitUiKitDll"/>
 				<ComponentRef Id="NUnitUtilDll"/>
@@ -248,10 +241,15 @@
 				<ComponentRef Id="NUnitCoreGacDll"/>
 				<ComponentRef Id="NUnitFrameworkGacDll"/>
 				<ComponentRef Id="NunitConsoleRunnerDll"/>
+				<ComponentRef Id="NUnitCoreInterfacesDll"/>
+				<ComponentRef Id="NUnitUiKitDllNetv11"/>
 				<ComponentRef Id="NUnitUtilDllNetv11"/>
 				<ComponentRef Id="NUnitConsoleNetv11Files"/>
 				<ComponentRef Id="NUnitCoreDllNetv11"/>
+				<ComponentRef Id="NUnitCoreExtensionsDllNetv11"/>
 				<ComponentRef Id="NUnitConsoleRunnerDllNetv11"/>
+				<ComponentRef Id="NUnitCoreInterfacesDllNetv11"/>
+				<ComponentRef Id="NUnitFrameworkDllNetv11"/>
 				<ComponentRef Id="ConversionStyleSheetFiles"/>
 				<ComponentRef Id="TextLibOptionsFiles"/>
 				<ComponentRef Id="OptionsFiles"/>
@@ -362,7 +360,15 @@
 				<ComponentRef Id="SyntaxModesFiles"/>
 				<ComponentRef Id="SharpDevelopWebsiteShortcut"/>
 				<ComponentRef Id="SharpDevelopAppPathRegistrySetting"/>
+				<ComponentRef Id="WixProjectIncludes"/>
 				<ComponentRef Id="WPFAssemblyInfoTemplate"/>
+				<ComponentRef Id="AddInWritingHelp"/>
+				<ComponentRef Id="CSharpProjectSharpDevelopCustomToolTemplates"/>
+				<ComponentRef Id="StringResources.pt.resources"/>
+				<ComponentRef Id="VBNetProjectCompactFormsProjectTemplate"/>
+				<ComponentRef Id="StringResources.cngb.resources"/>
+				<ComponentRef Id="AddInWritingHelpWebsiteShortcut"/>
+				<ComponentRef Id="AppConfigFileTemplate"/>
 			</Feature>
 			<Feature Id="SharpDevelopFileAssociations"
 			         Level="1"

src/Tools/Tools.build

@@ -5,7 +5,6 @@
 		<WixBitmapFiles Include="wix\Bitmaps\*"/>
 		<WixDocFiles Include="wix\doc\*"/>
 		<WixLibFiles Include="wix\lib\*"/>
-		<WixIncFiles Include="wix\inc\*"/>
 		<NUnitFiles Include="NUnit\*.dll;NUnit\*.exe"/>
 		<NUnitConfigFileNetv11 Include="NUnit\nunit-console-netv11.exe.config"/>
 		<NUnitConfigFile Include="NUnit\nunit-console.exe.config"/>
@@ -17,7 +16,6 @@
 		<Copy SourceFiles="@(WixFiles)" DestinationFolder="..\..\bin\Tools\Wix" SkipUnchangedFiles="true"/>
 		<Copy SourceFiles="@(WixDocFiles)" DestinationFolder="..\..\bin\Tools\Wix\doc" SkipUnchangedFiles="true"/>
 		<Copy SourceFiles="@(WixBitmapFiles)" DestinationFolder="..\..\bin\Tools\Wix\Bitmaps" SkipUnchangedFiles="true"/>
-		<Copy SourceFiles="@(WixIncFiles)" DestinationFolder="..\..\bin\Tools\Wix\inc" SkipUnchangedFiles="true"/>
 		<Copy SourceFiles="@(WixLibFiles)" DestinationFolder="..\..\bin\Tools\Wix\lib" SkipUnchangedFiles="true"/>
 		<Copy SourceFiles="@(NUnitFiles)" DestinationFolder="..\..\bin\Tools\NUnit" SkipUnchangedFiles="true"/>
 		<Copy SourceFiles="@(NUnitFiles)" DestinationFolder="..\..\bin\Tools\NUnit\Net-1.1" SkipUnchangedFiles="true"/>