From 2bb8881add54a93e8bcf2d4bce16198771230a82 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sat, 23 Apr 2005 16:37:23 +0000
Subject: [PATCH] Fixed project template options.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@106 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../project/CSharp/ConsoleProject.xpt         |  8 +--
 .../project/CSharp/ControlLibrary.xpt         | 14 ++---
 .../project/CSharp/Direct3DProject.xpt        | 11 ++--
 .../templates/project/CSharp/FormsProject.xpt | 11 ++--
 data/templates/project/CSharp/Library.xpt     | 13 ++---
 data/templates/project/CSharp/Service.xpt     | 18 +++----
 .../project/VBNet/ConsoleProject.xpt          |  5 +-
 .../project/VBNet/ControlLibrary.xpt          | 12 ++---
 .../project/VBNet/Direct3DProject.xpt         |  5 --
 data/templates/project/VBNet/FormsProject.xpt | 14 ++---
 data/templates/project/VBNet/Library.xpt      |  9 +---
 data/templates/project/VBNet/Service.xpt      | 13 ++---
 .../Project/Resources/Signing.xfrm            | 52 +++++++++++--------
 .../Project/Src/CSharpLanguageBinding.cs      |  4 +-
 .../Project/Src/OptionPanels/Signing.cs       |  3 +-
 .../Project/Resources/Signing.xfrm            |  4 +-
 .../Project/Src/OptionPanels/Signing.cs       |  3 +-
 .../Project/Src/VBNetLanguageBinding.cs       |  4 +-
 .../Project/Src/Lexer/AbstractLexer.cs        |  4 +-
 .../Project/Src/Lexer/CSharp/Lexer.cs         |  6 ++-
 .../CompilerMessageView.cs                    | 33 ++++++------
 .../Gui/XmlForms/Lib/DefaultObjectCreator.cs  |  1 -
 .../Project/Src/Project/AbstractProject.cs    | 18 +++++++
 .../Services/MessageService/MessageService.cs | 14 ++---
 24 files changed, 132 insertions(+), 147 deletions(-)

diff --git a/data/templates/project/CSharp/ConsoleProject.xpt b/data/templates/project/CSharp/ConsoleProject.xpt
index 91a58b2d24..fe346ce4ca 100644
--- a/data/templates/project/CSharp/ConsoleProject.xpt
+++ b/data/templates/project/CSharp/ConsoleProject.xpt
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Template originator   = "Mike Krueger"
           created      = "06/10/2001"
-          lastModified = "02/01/2003">
+          lastModified = "23/04/2005">
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
@@ -28,6 +28,7 @@
 			<Files>
 				<File name="Main.cs"><![CDATA[${StandardHeader.C#}
 using System;
+using System.Collections.Generic;
 
 namespace ${StandardNamespace}
 {
@@ -66,11 +67,6 @@ using System.Runtime.CompilerServices;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
 ]]></File>
 			</Files>
 		</Project>
diff --git a/data/templates/project/CSharp/ControlLibrary.xpt b/data/templates/project/CSharp/ControlLibrary.xpt
index 288bb5bc33..39b670872f 100644
--- a/data/templates/project/CSharp/ControlLibrary.xpt
+++ b/data/templates/project/CSharp/ControlLibrary.xpt
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Template originator   = "Mike Krueger"
           created      = "06/10/2001"
-          lastModified = "02/01/2003">
+          lastModified = "23/04/2005">
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
@@ -23,7 +23,7 @@
 		</Options>
 		
 		<Project name = "${ProjectName}" directory = ".">
-			<Options Target = "Library" PauseConsoleOutput = "False" />
+			<Options OutputType = "Library" />
 
 			<References>
 				<Reference type="Gac" refto="System" />
@@ -36,14 +36,15 @@
 			<Files>
 				<File name="UserControl1.cs"><![CDATA[${StandardHeader.C#}
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
-using System.ComponentModel;
 
 namespace ${StandardNamespace}
 {
 	/// <summary>
-	/// Description of UserControl1.	
+	/// Description of UserControl1.
 	/// </summary>
 	public class UserControl1 : System.Windows.Forms.UserControl
 	{
@@ -104,11 +105,6 @@ using System.Runtime.CompilerServices;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
 ]]></File>
 			</Files>
 		</Project>
diff --git a/data/templates/project/CSharp/Direct3DProject.xpt b/data/templates/project/CSharp/Direct3DProject.xpt
index 1c48247c9f..229ec387da 100644
--- a/data/templates/project/CSharp/Direct3DProject.xpt
+++ b/data/templates/project/CSharp/Direct3DProject.xpt
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Template originator   = "Mike Krueger"
           created      = "22/01/2003"
-          lastModified = "20/10/2004">
+          lastModified = "23/04/2005">
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
@@ -38,7 +38,7 @@
 			
 			<Files>
 				<File name="MainClass.cs"><![CDATA[using System;
-using System.Collections;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
@@ -134,7 +134,7 @@ namespace ${StandardNamespace}
 		{
 			// While the form is still valid, render and process messages
 			while (Created) {
-				FrameMove();	
+				FrameMove();
 				Render();
 				Application.DoEvents();
 			}
@@ -197,11 +197,6 @@ using System.Runtime.CompilerServices;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
 ]]></File>
 			</Files>
 		</Project>
diff --git a/data/templates/project/CSharp/FormsProject.xpt b/data/templates/project/CSharp/FormsProject.xpt
index dd5b01a6e7..392fb5eb22 100644
--- a/data/templates/project/CSharp/FormsProject.xpt
+++ b/data/templates/project/CSharp/FormsProject.xpt
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Template originator   = "Mike Krueger"
           created      = "06/10/2001"
-          lastModified = "02/01/2003">
+          lastModified = "23/04/2005">
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
@@ -23,8 +23,7 @@
 		</Options>
 		
 		<Project name = "${ProjectName}" directory = ".">
-			
-			<Options Target = "WinExe" PauseConsoleOutput = "False" />
+			<Options OutputType = "WinExe" />
 
 			<References>
 				<Reference type="Gac" refto="System" />
@@ -37,6 +36,7 @@
 			<Files>
 				<File name="MainForm.cs"><![CDATA[${StandardHeader.C#}
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -112,11 +112,6 @@ using System.Runtime.CompilerServices;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
 ]]></File>
 			</Files>
 		</Project>
diff --git a/data/templates/project/CSharp/Library.xpt b/data/templates/project/CSharp/Library.xpt
index 9df3a1b04a..a9160deac7 100644
--- a/data/templates/project/CSharp/Library.xpt
+++ b/data/templates/project/CSharp/Library.xpt
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Template originator   = "Mike Krueger"
           created      = "02/01/2003"
-          lastModified = "02/01/2003">
+          lastModified = "23/04/2005">
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
@@ -24,11 +24,13 @@
 		</Options>
 		
 		<Project name = "${ProjectName}" directory = ".">
-			<Options Target = "Library" PauseConsoleOutput = "False" />
+			<Options OutputType = "Library" />
 
 			<Files>
 				<File name="MyClass.cs"><![CDATA[${StandardHeader.C#}
 using System;
+using System.Collections.Generic;
+
 namespace ${StandardNamespace}
 {
 	/// <summary>
@@ -36,7 +38,7 @@ namespace ${StandardNamespace}
 	/// </summary>
 	public class MyClass
 	{
-
+			
 	}
 }]]></File>
 		<File name="AssemblyInfo.cs">
@@ -67,11 +69,6 @@ using System.Runtime.CompilerServices;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
 ]]></File>
 			</Files>
 		</Project>
diff --git a/data/templates/project/CSharp/Service.xpt b/data/templates/project/CSharp/Service.xpt
index a3ad873948..2db319a3ce 100644
--- a/data/templates/project/CSharp/Service.xpt
+++ b/data/templates/project/CSharp/Service.xpt
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Template originator   = "Mike Krueger"
           created      = "02/01/2003"
-          lastModified = "02/01/2003">
+          lastModified = "23/04/2005">
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
@@ -24,13 +24,12 @@
 		</Options>
 		
 		<Project name = "${ProjectName}" directory = ".">
-			
-			<Options Target = "Library" PauseConsoleOutput = "False" />
-	
+			<Options />
+
 			<Files>
 				<File name="MyService.cs"><![CDATA[${StandardHeader.C#}
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Diagnostics;
@@ -47,10 +46,10 @@ namespace ${StandardNamespace}
 		public MyService()
 		{
 			InitializeComponents();
-
+			
 			// TODO: Add any further initialization code
 		}
-
+		
 		private void InitializeComponents()
 		{
 			this.ServiceName = "MyService";
@@ -137,11 +136,6 @@ using System.Runtime.CompilerServices;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
 ]]></File>
 			</Files>
 		</Project>
diff --git a/data/templates/project/VBNet/ConsoleProject.xpt b/data/templates/project/VBNet/ConsoleProject.xpt
index c56bfce593..7bdb5952bb 100644
--- a/data/templates/project/VBNet/ConsoleProject.xpt
+++ b/data/templates/project/VBNet/ConsoleProject.xpt
@@ -25,8 +25,7 @@
 		</Options>
 		
 		<Project name = "${ProjectName}" directory = ".">
-			
-			<Options Target = "Exe" PauseConsoleOutput = "True"/>
+			<Options />
 			
 				<References>
 					<Reference type="Gac" refto="System" />
@@ -39,6 +38,8 @@
 		<File name="Main.vb">
 			<![CDATA[${StandardHeader.VBNET}
 Imports System
+Imports System.Collections.Generic
+
 Module Main
 	Sub Main()
 		Console.WriteLine("Hello World!")
diff --git a/data/templates/project/VBNet/ControlLibrary.xpt b/data/templates/project/VBNet/ControlLibrary.xpt
index 3915b460bf..403c6d692f 100644
--- a/data/templates/project/VBNet/ControlLibrary.xpt
+++ b/data/templates/project/VBNet/ControlLibrary.xpt
@@ -23,7 +23,7 @@
 		</Options>
 		
 		<Project name = "${ProjectName}" directory = ".">
-			<Options Target = "Library" PauseConsoleOutput = "False"/>	
+			<Options OutputType = "Library" />
 			
 
 			<References>
@@ -37,12 +37,12 @@
 			<Files>
 				<File name="UserControl1.vb"><![CDATA[${StandardHeader.VBNET}
 Imports System
+Imports System.Collections.Generic
+Imports System.ComponentModel
 Imports System.Drawing
 Imports System.Windows.Forms
-Imports System.ComponentModel
 
 Namespace ${StandardNamespace}
-	
 	Public Class UserControl1
 		Inherits System.Windows.Forms.UserControl
 		
@@ -98,11 +98,7 @@ Imports System.Runtime.CompilerServices
 
 <assembly: AssemblyVersion("1.0.*")>
 
-' The following attributes specify the key for the sign of your assembly. See the
-' .NET Framework documentation for more information about signing.
-' This is not required, if you don't want signing let these attributes like they're.
-<assembly: AssemblyDelaySign(false)>
-<assembly: AssemblyKeyFile("")>]]></File>
+]]></File>
 			</Files>
 		</Project>
 	</Combine>	
diff --git a/data/templates/project/VBNet/Direct3DProject.xpt b/data/templates/project/VBNet/Direct3DProject.xpt
index 840a30577a..3db4935bed 100644
--- a/data/templates/project/VBNet/Direct3DProject.xpt
+++ b/data/templates/project/VBNet/Direct3DProject.xpt
@@ -181,11 +181,6 @@ Imports System.Runtime.CompilerServices
 
 <assembly: AssemblyVersion("1.0.*")>
 
-' The following attributes specify the key for the sign of your assembly. See the
-' .NET Framework documentation for more information about signing.
-' This is not required, if you don't want signing let these attributes like they're.
-<assembly: AssemblyDelaySign(false)>
-<assembly: AssemblyKeyFile("")>]]>
 </File>
 			</Files>
 		</Project>
diff --git a/data/templates/project/VBNet/FormsProject.xpt b/data/templates/project/VBNet/FormsProject.xpt
index 8bd50e888d..55d2a45336 100644
--- a/data/templates/project/VBNet/FormsProject.xpt
+++ b/data/templates/project/VBNet/FormsProject.xpt
@@ -24,8 +24,7 @@
 		</Options>
 		
 		<Project name = "${ProjectName}" directory = ".">
-	
-			<Options Target = "WinExe" PauseConsoleOutput = "False"/>
+			<Options OutputType = "WinExe" />
 			
 			<References>
 				<Reference type="Gac" refto="System" />
@@ -40,6 +39,7 @@
 				<File name="MainForm.vb">
 			<![CDATA[${StandardHeader.VBNET}
 Imports System
+Imports System.Collections.Generic
 Imports System.Drawing
 Imports System.Windows.Forms
 
@@ -49,8 +49,7 @@ Namespace ${StandardNamespace}
 		Inherits System.Windows.Forms.Form
 		
 		Public Shared Sub Main
-			Dim fMainForm As New MainForm
-			fMainForm.ShowDialog()
+			Application.Run(New MainForm())
 		End Sub
 		
 		Public Sub New()
@@ -109,12 +108,7 @@ Imports System.Runtime.CompilerServices
 ' numbers with the '*' character (the default):
 
 <assembly: AssemblyVersion("1.0.*")>
-
-' The following attributes specify the key for the sign of your assembly. See the
-' .NET Framework documentation for more information about signing.
-' This is not required, if you don't want signing let these attributes like they're.
-<assembly: AssemblyDelaySign(false)>
-<assembly: AssemblyKeyFile("")>]]></File>
+]]></File>
 			</Files>
 		</Project>
 	</Combine>	
diff --git a/data/templates/project/VBNet/Library.xpt b/data/templates/project/VBNet/Library.xpt
index c4f66d6b34..0625042ba9 100644
--- a/data/templates/project/VBNet/Library.xpt
+++ b/data/templates/project/VBNet/Library.xpt
@@ -24,7 +24,7 @@
 		
 		
 		<Project name = "${ProjectName}" directory = ".">
-			<Options Target = "Library" PauseConsoleOutput = "False"/>	
+			<Options OutputType = "Library" />	
 			
 			<References>
 				<Reference type="Gac" refto="System" />
@@ -68,12 +68,7 @@ Imports System.Runtime.CompilerServices
 ' numbers with the '*' character (the default):
 
 <assembly: AssemblyVersion("1.0.*")>
-
-' The following attributes specify the key for the sign of your assembly. See the
-' .NET Framework documentation for more information about signing.
-' This is not required, if you don't want signing let these attributes like they're.
-<assembly: AssemblyDelaySign(false)>
-<assembly: AssemblyKeyFile("")>]]></File>
+]]></File>
 			</Files>
 		</Project>
 	</Combine>	
diff --git a/data/templates/project/VBNet/Service.xpt b/data/templates/project/VBNet/Service.xpt
index 73ff6152e9..70e0846592 100644
--- a/data/templates/project/VBNet/Service.xpt
+++ b/data/templates/project/VBNet/Service.xpt
@@ -22,10 +22,8 @@
 			<StartupProject>${ProjectName}</StartupProject>
 		</Options>
 		<Project name = "${ProjectName}" directory = ".">
+			<Options />
 			
-			<Options Target = "Library" PauseConsoleOutput = "False"/>
-			
-						
 			<References>
 				<Reference type="Gac" refto="System" />
 				<Reference type="Gac" refto="System.Data" />
@@ -37,7 +35,7 @@
 			<Files>
 				<File name="MyService.vb"><![CDATA[${StandardHeader.VBNET}
 Imports System
-Imports System.Collections
+Imports System.Collections.Generic
 Imports System.ComponentModel
 Imports System.Data
 Imports System.Diagnostics
@@ -129,12 +127,7 @@ Imports System.Runtime.CompilerServices
 ' numbers with the '*' character (the default):
 
 <assembly: AssemblyVersion("1.0.*")>
-
-' The following attributes specify the key for the sign of your assembly. See the
-' .NET Framework documentation for more information about signing.
-' This is not required, if you don't want signing let these attributes like they're.
-<assembly: AssemblyDelaySign(false)>
-<assembly: AssemblyKeyFile("")>]]></File>
+]]></File>
 			</Files>
 		</Project>
 	</Combine>	
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/Signing.xfrm b/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/Signing.xfrm
index 7526bc0631..a7a77ded2a 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/Signing.xfrm
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/Signing.xfrm
@@ -1,82 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Components version="1.0">
   <System.Windows.Forms.UserControl>
     <Name value="XmlUserControl1" />
-    <DockPadding value="" />
     <ClientSize value="{Width=392, Height=312}" />
     <Controls>
       <System.Windows.Forms.GroupBox>
-        <Name value="groupBox1" />
-        <TabIndex value="1" />
+        <Name value="signingGroupBox" />
         <Location value="{X=8,Y=28}" />
-        <Anchor value="Top, Left, Right" />
-        <Size value="{Width=368, Height=196}" />
         <Text value="Key Selection" />
+        <Size value="{Width=368, Height=196}" />
+        <TabIndex value="1" />
+        <Anchor value="Top, Left, Right" />
         <Controls>
           <System.Windows.Forms.CheckBox>
             <Name value="delaySignOnlyCheckBox" />
             <Location value="{X=4,Y=169}" />
-            <Size value="{Width=356, Height=24}" />
+            <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
             <Text value="Dela&amp;y Sign only" />
-            <Anchor value="Top, Left, Right" />
             <TabIndex value="8" />
+            <Size value="{Width=356, Height=24}" />
+            <Anchor value="Top, Left, Right" />
           </System.Windows.Forms.CheckBox>
           <System.Windows.Forms.ComboBox>
             <Name value="containerComboBox" />
-            <Anchor value="Top, Left, Right" />
             <TabIndex value="7" />
-            <Location value="{X=108,Y=133}" />
+            <Anchor value="Top, Left, Right" />
             <Size value="{Width=252, Height=21}" />
+            <FormattingEnabled value="True" />
+            <Location value="{X=108,Y=133}" />
           </System.Windows.Forms.ComboBox>
           <System.Windows.Forms.Label>
             <Name value="label2" />
+            <Location value="{X=8,Y=128}" />
             <Text value="&amp;Container:" />
             <TextAlign value="MiddleRight" />
+            <Size value="{Width=100, Height=23}" />
             <TabIndex value="6" />
-            <Location value="{X=8,Y=128}" />
           </System.Windows.Forms.Label>
           <System.Windows.Forms.ComboBox>
             <Name value="providerNameComboBox" />
-            <Anchor value="Top, Left, Right" />
             <TabIndex value="5" />
-            <Location value="{X=108,Y=105}" />
+            <Anchor value="Top, Left, Right" />
             <Size value="{Width=252, Height=21}" />
+            <FormattingEnabled value="True" />
+            <Location value="{X=108,Y=105}" />
           </System.Windows.Forms.ComboBox>
           <System.Windows.Forms.Label>
             <Name value="label1" />
+            <Location value="{X=8,Y=100}" />
             <Text value="Provider &amp;name:" />
             <TextAlign value="MiddleRight" />
+            <Size value="{Width=100, Height=23}" />
             <TabIndex value="4" />
-            <Location value="{X=8,Y=100}" />
           </System.Windows.Forms.Label>
           <System.Windows.Forms.RadioButton>
             <Name value="useKeyProviderRadioButton" />
             <Location value="{X=4,Y=77}" />
-            <Size value="{Width=356, Height=24}" />
             <Text value="Use this key &amp;provider:" />
+            <Size value="{Width=356, Height=24}" />
             <Anchor value="Top, Left, Right" />
+            <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
             <TabIndex value="3" />
           </System.Windows.Forms.RadioButton>
           <System.Windows.Forms.ComboBox>
             <Name value="keyFileComboBox" />
-            <Anchor value="Top, Left, Right" />
             <TabIndex value="1" />
-            <Location value="{X=20,Y=49}" />
+            <Anchor value="Top, Left, Right" />
             <Size value="{Width=184, Height=21}" />
+            <FormattingEnabled value="True" />
+            <Location value="{X=20,Y=49}" />
           </System.Windows.Forms.ComboBox>
           <System.Windows.Forms.Button>
             <Name value="changePasswordButton" />
             <Location value="{X=212,Y=49}" />
-            <Size value="{Width=148, Height=21}" />
             <Text value="Change Pass&amp;word..." />
+            <Size value="{Width=148, Height=21}" />
             <Anchor value="Top, Right" />
+            <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
             <TabIndex value="2" />
           </System.Windows.Forms.Button>
           <System.Windows.Forms.RadioButton>
             <Name value="useKeyFileRadioButton" />
             <Location value="{X=4,Y=25}" />
-            <Size value="{Width=356, Height=24}" />
             <Text value="Use a key &amp;file:" />
+            <Size value="{Width=356, Height=24}" />
             <Anchor value="Top, Left, Right" />
+            <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
             <TabIndex value="0" />
           </System.Windows.Forms.RadioButton>
         </Controls>
@@ -84,11 +93,12 @@
       <System.Windows.Forms.CheckBox>
         <Name value="signAssemblyCheckBox" />
         <Location value="{X=8,Y=4}" />
-        <Size value="{Width=376, Height=24}" />
+        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <Text value="Sign the &amp;assembly" />
-        <Anchor value="Top, Left, Right" />
         <TabIndex value="0" />
+        <Size value="{Width=376, Height=24}" />
+        <Anchor value="Top, Left, Right" />
       </System.Windows.Forms.CheckBox>
     </Controls>
   </System.Windows.Forms.UserControl>
-</Components>
\ No newline at end of file
+</Components>
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpLanguageBinding.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpLanguageBinding.cs
index faad1c6bd2..6eeeaf551d 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpLanguageBinding.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpLanguageBinding.cs
@@ -84,7 +84,9 @@ namespace CSharpBinding
 		
 		public IProject CreateProject(ProjectCreateInformation info, XmlElement projectOptions)
 		{
-			return new CSharpProject(info);
+			CSharpProject p = new CSharpProject(info);
+			p.ImportOptions(projectOptions.Attributes);
+			return p;
 		}
 	}
 }
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/Signing.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/Signing.cs
index 6eaef3866a..0f78d6012e 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/Signing.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/Signing.cs
@@ -17,6 +17,7 @@ namespace CSharpBinding.OptionPanels
 			this.project = (CSharpProject)((Properties)CustomizationObject).Get("Project");
 			
 			Get<CheckBox>("signAssembly").Checked = project.SignAssembly;
+			Get<CheckBox>("signAssembly").CheckedChanged += new EventHandler(UpdateEnabledStates);
 			Get<CheckBox>("signAssembly").CheckedChanged += new EventHandler(Save);
 			
 			Get<RadioButton>("useKeyFile").Checked         = project.AssemblyOriginatorKeyMode == AssemblyOriginatorKeyMode.File;
@@ -57,7 +58,7 @@ namespace CSharpBinding.OptionPanels
 			
 			Get<ComboBox>("providerName").Enabled = Get<ComboBox>("container").Enabled = Get<RadioButton>("useKeyProvider").Checked;
 			Get<ComboBox>("keyFile").Enabled = Get<RadioButton>("useKeyFile").Checked;
-			Get<CheckBox>("signAssembly").Enabled = Get<RadioButton>("useKeyFile").Checked;
+			Get<GroupBox>("signing").Enabled = Get<CheckBox>("signAssembly").Checked;
 		}
 		
 		public override bool StorePanelContents()
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Resources/Signing.xfrm b/src/AddIns/BackendBindings/VBNetBinding/Project/Resources/Signing.xfrm
index 7526bc0631..d993a357ea 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/Resources/Signing.xfrm
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Resources/Signing.xfrm
@@ -5,7 +5,7 @@
     <ClientSize value="{Width=392, Height=312}" />
     <Controls>
       <System.Windows.Forms.GroupBox>
-        <Name value="groupBox1" />
+        <Name value="signingGroupBox" />
         <TabIndex value="1" />
         <Location value="{X=8,Y=28}" />
         <Anchor value="Top, Left, Right" />
@@ -91,4 +91,4 @@
       </System.Windows.Forms.CheckBox>
     </Controls>
   </System.Windows.Forms.UserControl>
-</Components>
\ No newline at end of file
+</Components>
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/Signing.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/Signing.cs
index ffdf24a083..4aaf80e19e 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/Signing.cs
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/Signing.cs
@@ -17,6 +17,7 @@ namespace VBNetBinding.OptionPanels
 			this.project = (VBNetProject)((Properties)CustomizationObject).Get("Project");
 			
 			Get<CheckBox>("signAssembly").Checked = project.SignAssembly;
+			Get<CheckBox>("signAssembly").CheckedChanged += new EventHandler(UpdateEnabledStates);
 			Get<CheckBox>("signAssembly").CheckedChanged += new EventHandler(Save);
 			
 			Get<RadioButton>("useKeyFile").Checked         = project.AssemblyOriginatorKeyMode == AssemblyOriginatorKeyMode.File;
@@ -57,7 +58,7 @@ namespace VBNetBinding.OptionPanels
 			
 			Get<ComboBox>("providerName").Enabled = Get<ComboBox>("container").Enabled = Get<RadioButton>("useKeyProvider").Checked;
 			Get<ComboBox>("keyFile").Enabled = Get<RadioButton>("useKeyFile").Checked;
-			Get<CheckBox>("signAssembly").Enabled = Get<RadioButton>("useKeyFile").Checked;
+			Get<GroupBox>("signing").Enabled = Get<CheckBox>("signAssembly").Checked;
 		}
 		
 		public override bool StorePanelContents()
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetLanguageBinding.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetLanguageBinding.cs
index e87fb4b16d..071e3b7ef7 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetLanguageBinding.cs
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetLanguageBinding.cs
@@ -84,7 +84,9 @@ namespace VBNetBinding
 		
 		public IProject CreateProject(ProjectCreateInformation info, XmlElement projectOptions)
 		{
-			return new VBNetProject(info);
+			VBNetProject p = new VBNetProject(info);
+			p.ImportOptions(projectOptions.Attributes);
+			return p;
 		}
 	}
 }
diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/AbstractLexer.cs b/src/Libraries/NRefactory/Project/Src/Lexer/AbstractLexer.cs
index 966460069a..deb5907532 100644
--- a/src/Libraries/NRefactory/Project/Src/Lexer/AbstractLexer.cs
+++ b/src/Libraries/NRefactory/Project/Src/Lexer/AbstractLexer.cs
@@ -157,7 +157,9 @@ namespace ICSharpCode.NRefactory.Parser
 			
 			if (curToken.next == null) {
 				curToken.next = Next();
-				specialTracker.InformToken(curToken.next.kind);
+				if (curToken.next != null) {
+					specialTracker.InformToken(curToken.next.kind);
+				}
 			}
 			
 			curToken  = curToken.next;
diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs b/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs
index 1b81fedeff..e5ec559302 100644
--- a/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs
+++ b/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs
@@ -511,8 +511,10 @@ namespace ICSharpCode.NRefactory.Parser.CSharp
 				escapeSequence = ReadEscapeSequence(out chValue);
 			}
 			
-			if ((char)reader.Read() != '\'') {
-				errors.Error(y, x, String.Format("Char not terminated"));
+			unchecked {
+				if ((char)reader.Read() != '\'') {
+					errors.Error(y, x, String.Format("Char not terminated"));
+				}
 			}
 			return new Token(Tokens.Literal, x, y, "'" + ch + escapeSequence + "'", chValue);
 		}
diff --git a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
index 458ecfb429..a78d55b28e 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
@@ -109,7 +109,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			textEditorControl.ShowEOLMarkers    = false;
 			
 			textEditorControl.ContextMenuStrip = MenuService.CreateContextMenu(this, "/SharpDevelop/Pads/CompilerMessageView/ContextMenu");
-				
+			
 			properties = (Properties)PropertyService.Get(OutputWindowOptionsPanel.OutputWindowsProperty, new Properties());
 			
 			textEditorControl.Font     = FontSelectionPanel.ParseFont(properties.Get("DefaultFont", new Font("Courier New", 10).ToString()).ToString());
@@ -117,7 +117,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			
 			textEditorControl.MouseDown += new MouseEventHandler(TextEditorControlMouseDown);
 			textEditorControl.BackColor = SystemColors.Window;
-				
+			
 			ToolStrip toolStrip = ToolbarService.CreateToolStrip(this, "/SharpDevelop/Pads/CompilerMessageView/Toolbar");
 			toolStrip.Stretch   = true;
 			toolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
@@ -167,7 +167,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		}
 		void ClearText()
 		{
-			textEditorControl.Document.TextContent = "";
+			textEditorControl.Text = "";
 		}
 		
 		void CategoryTextSet(object sender, TextEventArgs e)
@@ -204,13 +204,13 @@ namespace ICSharpCode.SharpDevelop.Gui
 			if (text == null) {
 				text = String.Empty;
 			}
-			textEditorControl.Document.TextContent = text;
+			textEditorControl.Text = text;
 //			textEditorControl.Select(text.Length , 0);
 //			textEditorControl.Select();
 //			textEditorControl.ScrollToCaret();
 		}
 		
-				
+		
 		public void SelectCategory(string categoryName)
 		{
 			for (int i = 0; i < messageCategories.Count; ++i) {
@@ -250,7 +250,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		}
 		
 		/// <summary>
-		/// Occurs when the mouse pointer is over the control and a 
+		/// Occurs when the mouse pointer is over the control and a
 		/// mouse button is pressed.
 		/// </summary>
 		void TextEditorControlMouseDown(object sender, MouseEventArgs e)
@@ -259,18 +259,18 @@ namespace ICSharpCode.SharpDevelop.Gui
 //			if (e.Clicks == 2) {
 //				// Any text?
 //				if (textEditorControl.Text.Length > 0) {
-//					
+//
 //					// Parse text line double clicked.
 //					Point point = new Point(e.X, e.Y);
-//					
+//
 //					int charIndex = textEditorControl.GetCharIndexFromPosition(point);
 //					string textLine = GetTextLine(charIndex, textEditorControl.Text);
-//										
+//
 //					FileLineReference lineReference = OutputTextLineParser.GetFileLineReference(textLine);
 //					if (lineReference != null) {
 //						// Open matching file.
-//						JumpToFilePosition(Path.GetFullPath(lineReference.FileName), 
-//						                   lineReference.Line, 
+//						JumpToFilePosition(Path.GetFullPath(lineReference.FileName),
+//						                   lineReference.Line,
 //						                   lineReference.Column);
 //					}
 //				}
@@ -289,12 +289,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 			Debug.Assert(charIndex < textLines.Length, String.Concat("CharIndex out of range. charIndex=", charIndex, ", textLines.Length=", textLines.Length));
 			
 			string textLine = String.Empty;
-									
+			
 			int lineStartIndex = 0;
 			int lineLength = 0;
 			bool wasFound = false;
 			
-			for (int i = 0; i < textLines.Length; ++i) {				
+			for (int i = 0; i < textLines.Length; ++i) {
 				char ch = textLines[i];
 				
 				if (ch == '\r' || ch == '\n') {
@@ -304,8 +304,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 						textLine = textLines.Substring(lineStartIndex, lineLength);
 						wasFound = true;
 						break;
-					}
-					else {
+					} else {
 						lineStartIndex = i + 1;
 						lineLength = 0;
 					}
@@ -362,7 +361,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		public event EventHandler MessageCategoryAdded;
 		public event EventHandler SelectedCategoryIndexChanged;
 		
-	#region ICSharpCode.SharpDevelop.Gui.IClipboardHandler interface implementation
+		#region ICSharpCode.SharpDevelop.Gui.IClipboardHandler interface implementation
 		public bool EnableCut {
 			get {
 				return false;
@@ -416,6 +415,6 @@ namespace ICSharpCode.SharpDevelop.Gui
 //			textEditorControl.SelectAll();
 		}
 		#endregion
-			
+		
 	}
 }
diff --git a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/DefaultObjectCreator.cs b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/DefaultObjectCreator.cs
index 0c2bd18e8b..8e35ae239f 100644
--- a/src/Main/Base/Project/Src/Gui/XmlForms/Lib/DefaultObjectCreator.cs
+++ b/src/Main/Base/Project/Src/Gui/XmlForms/Lib/DefaultObjectCreator.cs
@@ -33,7 +33,6 @@ namespace ICSharpCode.SharpDevelop.Gui.XmlForms
 				t = typeof(String).Assembly.GetType(name);
 			}
 			
-			
 			// try to create the object from some assembly which is currently
 			// loaded by the running application.
 			if (t == null) {
diff --git a/src/Main/Base/Project/Src/Project/AbstractProject.cs b/src/Main/Base/Project/Src/Project/AbstractProject.cs
index b3d523826b..740ff03d81 100644
--- a/src/Main/Base/Project/Src/Project/AbstractProject.cs
+++ b/src/Main/Base/Project/Src/Project/AbstractProject.cs
@@ -5,6 +5,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Globalization;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
@@ -24,6 +25,23 @@ namespace ICSharpCode.SharpDevelop.Project
 		protected string fileName;
 		protected string language;
 		
+		/// <summary>
+		/// Import options from an attribute collection. This is used to read the template options.
+		/// </summary>
+		public void ImportOptions(XmlAttributeCollection attributes)
+		{
+			Type t = GetType();
+			foreach (XmlAttribute attr in attributes) {
+				PropertyInfo prop = t.GetProperty(attr.Name, BindingFlags.IgnoreCase | BindingFlags.Instance | BindingFlags.Public);
+				if (prop == null) {
+					MessageService.ShowError("Property '" + attr.Name + "' does not exist!");
+				} else {
+					TypeConverter desc = TypeDescriptor.GetConverter(prop.PropertyType);
+					prop.SetValue(this, desc.ConvertFromInvariantString(attr.Value), null);
+				}
+			}
+		}
+		
 		protected bool isDirty = false;
 		
 		[Browsable(false)]
diff --git a/src/Main/Core/Project/Src/Services/MessageService/MessageService.cs b/src/Main/Core/Project/Src/Services/MessageService/MessageService.cs
index 3157c5a9ad..7fc65f087c 100644
--- a/src/Main/Core/Project/Src/Services/MessageService/MessageService.cs
+++ b/src/Main/Core/Project/Src/Services/MessageService/MessageService.cs
@@ -53,11 +53,14 @@ namespace ICSharpCode.Core
 		{
 			#if DEBUG
 			Console.WriteLine();
-				if (message != null)
-			Console.WriteLine(message);
-			Console.WriteLine(ex);
-			Console.Beep();
-			#else
+			if (message != null)
+				Console.WriteLine(message);
+			if (ex != null) {
+				Console.WriteLine(ex);
+				Console.Beep();
+				return;
+			}
+			#endif
 			string msg = String.Empty;
 			
 			if (message != null) {
@@ -73,7 +76,6 @@ namespace ICSharpCode.Core
 			}
 			
 			MessageBox.Show(MessageService.MainForm, StringParser.Parse(msg), StringParser.Parse("${res:Global.ErrorText}"), MessageBoxButtons.OK, MessageBoxIcon.Error);
-			#endif
 		}
 		
 		public static void ShowWarning(string message)