From c2acd544b100f1b2d60d5992cb3f7f8ef2df460c Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Thu, 13 May 2010 18:03:11 +0000
Subject: [PATCH] updated templates for VB and C# (see SD2-1318)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/vbnet@5819 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../file/CSharp/CSharp.WPFFlowDocument.xft    |  12 ++
 data/templates/file/CSharp/CSharp.WPFPage.xft |  12 ++
 .../file/CSharp/CSharp.WPFPageFunction.xft    |  12 ++
 .../CSharp/CSharp.WPFResourceDictionary.xft   |  12 ++
 .../file/CSharp/CSharp.WPFUserControl.xft     |  12 ++
 .../file/CSharp/CSharp.WPFWindow.xft          |  12 ++
 .../templates/file/VBNet/VBNet.Forms.Form.xft |   2 +-
 .../file/VBNet/VBNet.WPFFlowDocument.xft      |  48 +++++
 data/templates/file/VBNet/VBNet.WPFPage.xft   |  70 +++++++
 .../file/VBNet/VBNet.WPFPageFunction.xft      |  99 ++++++++++
 .../VBNet/VBNet.WPFResourceDictionary.xft     |  46 +++++
 .../file/VBNet/VBNet.WPFUserControl.xft       |  69 +++++++
 data/templates/file/VBNet/VBNet.WPFWindow.xft |  70 +++++++
 .../file/VBNet/VBNet.Web.WebControl.xft       |  79 ++++++++
 .../file/VBNet/VBNet.Web.WebForm.xft          | 175 ++++++++++++++++++
 .../file/VBNet/VBNet.Web.WebService.xft       |  62 +++++++
 .../Internal/Templates/File/FileTemplate.cs   |   7 +-
 17 files changed, 797 insertions(+), 2 deletions(-)
 create mode 100644 data/templates/file/VBNet/VBNet.WPFFlowDocument.xft
 create mode 100644 data/templates/file/VBNet/VBNet.WPFPage.xft
 create mode 100644 data/templates/file/VBNet/VBNet.WPFPageFunction.xft
 create mode 100644 data/templates/file/VBNet/VBNet.WPFResourceDictionary.xft
 create mode 100644 data/templates/file/VBNet/VBNet.WPFUserControl.xft
 create mode 100644 data/templates/file/VBNet/VBNet.WPFWindow.xft
 create mode 100644 data/templates/file/VBNet/VBNet.Web.WebControl.xft
 create mode 100644 data/templates/file/VBNet/VBNet.Web.WebForm.xft
 create mode 100644 data/templates/file/VBNet/VBNet.Web.WebService.xft

diff --git a/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft b/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
index f586f08787..2a85fbd699 100644
--- a/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
+++ b/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
@@ -11,6 +11,18 @@
 	 
 	<Description>${res:Templates.File.WinFXFlowDocument.Name}</Description>
 	
+	<References>
+		<Reference include="PresentationCore">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="PresentationFramework">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="WindowsBase">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+	</References>
+	
 	<!-- 
 	Special new file templates:
 		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
diff --git a/data/templates/file/CSharp/CSharp.WPFPage.xft b/data/templates/file/CSharp/CSharp.WPFPage.xft
index f4f65d2f73..857ac4c451 100644
--- a/data/templates/file/CSharp/CSharp.WPFPage.xft
+++ b/data/templates/file/CSharp/CSharp.WPFPage.xft
@@ -11,6 +11,18 @@
 	 
 	<Description>${res:Templates.File.WinFXPage.Name}</Description>
 	
+	<References>
+		<Reference include="PresentationCore">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="PresentationFramework">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="WindowsBase">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+	</References>
+	
 	<!-- 
 	Special new file templates:
 		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
diff --git a/data/templates/file/CSharp/CSharp.WPFPageFunction.xft b/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
index 4ddf86058d..7fd3f1156c 100644
--- a/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
+++ b/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
@@ -11,6 +11,18 @@
 	 
 	<Description>${res:Templates.File.WinFXPageFunction.Name}</Description>
 	
+	<References>
+		<Reference include="PresentationCore">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="PresentationFramework">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="WindowsBase">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+	</References>
+	
 	<!-- 
 	Special new file templates:
 		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
diff --git a/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft b/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
index c2e7b0fd1b..8c6ff7adf6 100644
--- a/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
+++ b/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
@@ -11,6 +11,18 @@
 	 
 	<Description>${res:Templates.File.WinFXResourceDictionary.Name}</Description>
 	
+	<References>
+		<Reference include="PresentationCore">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="PresentationFramework">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="WindowsBase">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+	</References>
+	
 	<!-- 
 	Special new file templates:
 		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
diff --git a/data/templates/file/CSharp/CSharp.WPFUserControl.xft b/data/templates/file/CSharp/CSharp.WPFUserControl.xft
index 29aaf40bfb..adc0aaacc4 100644
--- a/data/templates/file/CSharp/CSharp.WPFUserControl.xft
+++ b/data/templates/file/CSharp/CSharp.WPFUserControl.xft
@@ -11,6 +11,18 @@
 	 
 	<Description>${res:Templates.File.WinFXUserControl.Description}</Description>
 	
+	<References>
+		<Reference include="PresentationCore">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="PresentationFramework">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="WindowsBase">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+	</References>
+	
 	<!-- 
 	Special new file templates:
 		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
diff --git a/data/templates/file/CSharp/CSharp.WPFWindow.xft b/data/templates/file/CSharp/CSharp.WPFWindow.xft
index 077f1e75d2..2e86644073 100644
--- a/data/templates/file/CSharp/CSharp.WPFWindow.xft
+++ b/data/templates/file/CSharp/CSharp.WPFWindow.xft
@@ -11,6 +11,18 @@
 	 
 	<Description>${res:Templates.File.WinFXWindow.Description}</Description>
 	
+	<References>
+		<Reference include="PresentationCore">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="PresentationFramework">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="WindowsBase">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+	</References>
+	
 	<!-- 
 	Special new file templates:
 		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
diff --git a/data/templates/file/VBNet/VBNet.Forms.Form.xft b/data/templates/file/VBNet/VBNet.Forms.Form.xft
index d4ac7d3c01..82e31320bc 100644
--- a/data/templates/file/VBNet/VBNet.Forms.Form.xft
+++ b/data/templates/file/VBNet/VBNet.Forms.Form.xft
@@ -12,7 +12,7 @@
 	
 	<Description>${res:Templates.File.WindowsForm.Description}</Description>
 	
-		<References>
+	<References>
 		<Reference include="System.Drawing" />
 		<Reference include="System.Windows.Forms" />
 	</References>
diff --git a/data/templates/file/VBNet/VBNet.WPFFlowDocument.xft b/data/templates/file/VBNet/VBNet.WPFFlowDocument.xft
new file mode 100644
index 0000000000..0ee6f60cbd
--- /dev/null
+++ b/data/templates/file/VBNet/VBNet.WPFFlowDocument.xft
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<Template author="Siegfried Pammer" version="1.0">
+	
+	<Config
+		  name        = "${res:Templates.File.WinFXFlowDocument.Name}"
+		  icon        = "Icons.32x32.XMLFileIcon"
+		  category    = "VB"
+		  subcategory = "WPF"
+		  defaultname = "FlowDocument${Number}.xaml"
+		  language    = "XML"/>
+	 
+	<Description>${res:Templates.File.WinFXFlowDocument.Name}</Description>
+	
+	<References>
+		<Reference include="PresentationCore">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="PresentationFramework">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="WindowsBase">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+	</References>
+	
+	<!-- 
+	Special new file templates:
+		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
+		${FullName}                 -> Full generated path name
+		${FileName}                 -> File name with extension
+		${FileNameWithoutExtension} -> File name without extension
+		${Extension}                -> Extension in the form ".vb"
+		${Path}                     -> Full path of the file
+	 -->
+	<Files>
+		<File name="${FullName}" language="XML" buildAction="Page"><![CDATA[<FlowDocument xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	ColumnWidth="400" FontSize="14" FontFamily="Georgia"
+>
+	<Paragraph>
+		
+	</Paragraph>
+</FlowDocument>]]></File>
+	</Files>
+	
+	<AdditionalOptions/>
+</Template>
+
+
diff --git a/data/templates/file/VBNet/VBNet.WPFPage.xft b/data/templates/file/VBNet/VBNet.WPFPage.xft
new file mode 100644
index 0000000000..3bb8b53b9c
--- /dev/null
+++ b/data/templates/file/VBNet/VBNet.WPFPage.xft
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<Template author="Siegfried Pammer" version="1.0">
+	
+	<Config
+		  name        = "${res:Templates.File.WinFXPage.Name}"
+		  icon        = "Icons.32x32.XMLFileIcon"
+		  category    = "VB"
+		  subcategory = "WPF"
+		  defaultname = "Page${Number}.xaml"
+		  language    = "VBNET"/>
+	 
+	<Description>${res:Templates.File.WinFXPage.Name}</Description>
+	
+	<References>
+		<Reference include="PresentationCore">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="PresentationFramework">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="WindowsBase">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+	</References>
+	
+	<!-- 
+	Special new file templates:
+		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
+		${FullName}                 -> Full generated path name
+		${FileName}                 -> File name with extension
+		${FileNameWithoutExtension} -> File name without extension
+		${Extension}                -> Extension in the form ".vb"
+		${Path}                     -> Full path of the file
+	 -->
+	<Files>
+		<File name="${FullName}" language="XML" buildAction="Page"><![CDATA[<Page x:Class="${StandardNamespace}.${ClassName}"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	Title="${FileNameWithoutExtension}">
+	<Grid>
+		
+	</Grid>
+</Page>]]></File>
+		<File name="${FullName}.vb" language="VBNET" DependentUpon="${FileName}" SubType="Code"><![CDATA[${StandardHeader.VBNET}
+Imports System
+Imports System.Collections.Generic
+Imports System.Text
+Imports System.Windows
+Imports System.Windows.Controls
+Imports System.Windows.Data
+Imports System.Windows.Documents
+Imports System.Windows.Input
+Imports System.Windows.Media
+
+Namespace ${StandardNamespace}
+	''' <summary>
+	''' Interaction logic for ${FileName}
+	''' </summary>
+	Public Partial Class ${ClassName} Inherits Page
+		Public Sub New()
+			InitializeComponent()
+		End Sub
+	End Class
+End Namespace]]></File>
+	</Files>
+	
+	<AdditionalOptions/>
+</Template>
+
+
diff --git a/data/templates/file/VBNet/VBNet.WPFPageFunction.xft b/data/templates/file/VBNet/VBNet.WPFPageFunction.xft
new file mode 100644
index 0000000000..dc11e4b809
--- /dev/null
+++ b/data/templates/file/VBNet/VBNet.WPFPageFunction.xft
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<Template author="Siegfried Pammer" version="1.0">
+	
+	<Config
+		  name        = "${res:Templates.File.WinFXPageFunction.Name}"
+		  icon        = "Icons.32x32.XMLFileIcon"
+		  category    = "VB"
+		  subcategory = "WPF"
+		  defaultname = "PageFunction${Number}.xaml"
+		  language    = "XML"/>
+	 
+	<Description>${res:Templates.File.WinFXPageFunction.Name}</Description>
+	
+	<References>
+		<Reference include="PresentationCore">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="PresentationFramework">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="WindowsBase">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+	</References>
+	
+	<!-- 
+	Special new file templates:
+		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
+		${FullName}                 -> Full generated path name
+		${FileName}                 -> File name with extension
+		${FileNameWithoutExtension} -> File name without extension
+		${Extension}                -> Extension in the form ".vb"
+		${Path}                     -> Full path of the file
+	 -->
+	<Files>
+		<File name="${FullName}" language="XML" buildAction="Page"><![CDATA[<PageFunction
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib" 
+    x:Class="${StandardNamespace}.${FileNameWithoutExtension}"
+    x:TypeArguments="sys:String"
+    Title="${FileNameWithoutExtension}">
+  <Grid>
+
+  </Grid>
+</PageFunction>]]></File>
+		<File name="${FullName}.vb" language="VBNET" DependentUpon="${FileName}" SubType="Code"><![CDATA[${StandardHeader.VBNET}
+Imports System.Collections.Generic
+Imports System.Text
+Imports System.Windows
+Imports System.Windows.Controls
+Imports System.Windows.Data
+Imports System.Windows.Documents
+Imports System.Windows.Input
+Imports System.Windows.Media
+Imports System.Windows.Media.Imaging
+Imports System.Windows.Navigation
+Imports System.Windows.Shapes
+
+Namespace ${StandardNamespace}
+	''' <summary>
+	''' Interaction logic for ${FileName}
+	''' </summary>
+
+	Public Partial Class ${FileNameWithoutExtension}
+		Inherits PageFunction(Of String)
+
+		Public Sub New()
+			InitializeComponent()
+		End Sub
+
+		' The OnLoaded handler can be run automatically when the class is loaded. To use it, add Loaded="OnLoaded" to the attributes of the root element of the .xaml file and uncomment the following line.
+		' Private Sub OnLoaded(sender As Object, e As RoutedEventArgs)
+		' End Sub
+		'
+		' Sample Finish Handler
+		' Private Sub OnClickDone(sender As Object, e As RoutedEventArgs)
+		'     OnFinish(New ReturnEventArgs(Of String)("The return value"))
+		' End Sub
+
+		' To launch this page function, put this code in the launching page.
+		' Dim pageFunction As New ${FileNameWithoutExtension}()
+		' pageFunction.[Return] += New ReturnEventHandler(Of String)(OnFileNameWithoutExtensionReturned)
+		' _NavWin.Navigate(pageFunction)
+		'
+		' This handler goes in the launching page.
+		' Public Sub On${FileNameWithoutExtension}Returned(sender As Object, e As ReturnEventArgs(Of String))
+		'     Console.WriteLine("${FileNameWithoutExtension} returned: " & e.Result)
+		' End Sub
+
+
+	End Class
+End Namespace]]></File>
+	</Files>
+	
+	<AdditionalOptions/>
+</Template>
+
+
diff --git a/data/templates/file/VBNet/VBNet.WPFResourceDictionary.xft b/data/templates/file/VBNet/VBNet.WPFResourceDictionary.xft
new file mode 100644
index 0000000000..188c662202
--- /dev/null
+++ b/data/templates/file/VBNet/VBNet.WPFResourceDictionary.xft
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<Template author="Siegfried Pammer" version="1.0">
+	
+	<Config
+		  name        = "${res:Templates.File.WinFXResourceDictionary.Name}"
+		  icon        = "Icons.32x32.XMLFileIcon"
+		  subcategory = "WPF"
+		  category    = "VB"
+		  defaultname = "Dictionary${Number}.xaml"
+		  language    = "XML"/>
+	 
+	<Description>${res:Templates.File.WinFXResourceDictionary.Name}</Description>
+	
+	<References>
+		<Reference include="PresentationCore">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="PresentationFramework">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="WindowsBase">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+	</References>
+	
+	<!-- 
+	Special new file templates:
+		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
+		${FullName}                 -> Full generated path name
+		${FileName}                 -> File name with extension
+		${FileNameWithoutExtension} -> File name without extension
+		${Extension}                -> Extension in the form ".vb"
+		${Path}                     -> Full path of the file
+	 -->
+	<Files>
+		<File name="${FullName}" language="XML" buildAction="Page"><![CDATA[<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+	
+</ResourceDictionary>]]></File>
+	</Files>
+	
+	<AdditionalOptions/>
+</Template>
+
+
diff --git a/data/templates/file/VBNet/VBNet.WPFUserControl.xft b/data/templates/file/VBNet/VBNet.WPFUserControl.xft
new file mode 100644
index 0000000000..6990c80a4a
--- /dev/null
+++ b/data/templates/file/VBNet/VBNet.WPFUserControl.xft
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<Template author="Mathias Simmack" version="1.0">
+	
+	<Config
+		  name        = "${res:Templates.File.WinFXUserControl.Name}"
+		  icon        = "Icons.32x32.XMLFileIcon"
+		  category    = "VB"
+		  subcategory = "WPF"
+		  defaultname = "UserControl${Number}.xaml"
+		  language    = "VBNET"/>
+	 
+	<Description>${res:Templates.File.WinFXUserControl.Description}</Description>
+	
+	<References>
+		<Reference include="PresentationCore">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="PresentationFramework">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="WindowsBase">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+	</References>
+	
+	<!-- 
+	Special new file templates:
+		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
+		${FullName}                 -> Full generated path name
+		${FileName}                 -> File name with extension
+		${FileNameWithoutExtension} -> File name without extension
+		${Extension}                -> Extension in the form ".cs"
+		${Path}                     -> Full path of the file
+	 -->
+	<Files>
+		<File name="${FullName}" language="C#"><![CDATA[<UserControl x:Class="${StandardNamespace}.${ClassName}"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<Grid>
+		
+	</Grid>
+</UserControl>]]></File>
+		<File name="${FullName}.cs" language="VBNET" DependentUpon="${FileName}" SubType="Code"><![CDATA[${StandardHeader.VBNET}
+Imports System
+Imports System.Collections.Generic
+Imports System.Text
+Imports System.Windows
+Imports System.Windows.Controls
+Imports System.Windows.Data
+Imports System.Windows.Documents
+Imports System.Windows.Input
+Imports System.Windows.Media
+
+Namespace ${StandardNamespace}
+	''' <summary>
+	''' Interaction logic for ${FileName}
+	''' </summary>
+	Public Partial Class ${ClassName} Inherits UserControl
+		Public Sub New()
+			InitializeComponent()
+		End Sub
+	End Class
+End Namespace]]></File>
+	</Files>
+	
+	<AdditionalOptions/>
+</Template>
+
+
diff --git a/data/templates/file/VBNet/VBNet.WPFWindow.xft b/data/templates/file/VBNet/VBNet.WPFWindow.xft
new file mode 100644
index 0000000000..1443479ae4
--- /dev/null
+++ b/data/templates/file/VBNet/VBNet.WPFWindow.xft
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<Template author="Siegfried Pammer" version="1.0">
+	
+	<Config
+		  name        = "${res:Templates.File.WinFXWindow.Name}"
+		  icon        = "Icons.32x32.XMLFileIcon"
+		  category    = "VB"
+		  subcategory = "WPF"
+		  defaultname = "Window${Number}.xaml"
+		  language    = "VBNET"/>
+	 
+	<Description>${res:Templates.File.WinFXWindow.Description}</Description>
+	
+	<References>
+		<Reference include="PresentationCore">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="PresentationFramework">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+		<Reference include="WindowsBase">
+			<RequiredTargetFramework>3.0</RequiredTargetFramework>
+		</Reference>
+	</References>
+	
+	<!-- 
+	Special new file templates:
+		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
+		${FullName}                 -> Full generated path name
+		${FileName}                 -> File name with extension
+		${FileNameWithoutExtension} -> File name without extension
+		${Extension}                -> Extension in the form ".vb"
+		${Path}                     -> Full path of the file
+	 -->
+	<Files>
+		<File name="${FullName}" language="XML" buildAction="Page"><![CDATA[<Window x:Class="${StandardNamespace}.${ClassName}"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	Title="${StandardNamespace}" Height="300" Width="300">
+	<Grid>
+		
+	</Grid>
+</Window>]]></File>
+		<File name="${FullName}.vb" language="VBNET" DependentUpon="${FileName}" SubType="Code"><![CDATA[${StandardHeader.VBNET}
+Imports System
+Imports System.Collections.Generic
+Imports System.Text
+Imports System.Windows
+Imports System.Windows.Controls
+Imports System.Windows.Data
+Imports System.Windows.Documents
+Imports System.Windows.Input
+Imports System.Windows.Media
+
+Namespace ${StandardNamespace}
+	' <summary>
+	' Interaction logic for ${FileName}
+	' </summary>
+	Public Partial Class ${ClassName} Inherits Window
+		Public Sub New()
+			InitializeComponent()
+		End Sub
+	End Class
+End Namespace]]></File>
+	</Files>
+	
+	<AdditionalOptions/>
+</Template>
+
+
diff --git a/data/templates/file/VBNet/VBNet.Web.WebControl.xft b/data/templates/file/VBNet/VBNet.Web.WebControl.xft
new file mode 100644
index 0000000000..01b77996f0
--- /dev/null
+++ b/data/templates/file/VBNet/VBNet.Web.WebControl.xft
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<Template author="Siegfried Pammer" version="1.0">
+
+	<Config
+		name        = "${res:Templates.File.WebControl.Name}"
+		icon        = "VBNet.File.NewClass"
+		category    = "VB"
+		subcategory = "ASP.NET"
+		defaultname = "WebControl${Number}"
+		language    = "VBNET"
+	/>
+
+	<Description>${res:Templates.File.WebControl.Description}</Description>
+	<!--
+	Special new file templates:
+		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
+		${FullName}                 -> Full generated path name
+		${FileName}                 -> File name with extension
+		${FileNameWithoutExtension} -> File name without extension
+		${Extension}                -> Extension in the form ".vb"
+		${Path}                     -> Full path of the file
+	 -->
+	<Files>
+		<File name="${Path}/${FileNameWithoutExtension}.vb" DependentUpon="${FileName}" language="VBNET"><![CDATA[${StandardHeader.VBNET}
+Imports System.Web
+Imports System.Web.SessionState
+Imports System.Web.UI
+Imports System.Web.UI.WebControls
+Imports System.Web.UI.HtmlControls
+
+Namespace ${StandardNamespace}
+	''' <summary>
+	''' Description of ${ClassName}
+	''' </summary>
+	Public Class ${ClassName}
+		Inherits Control
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		#Region "Data"
+		#End Region
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		#Region "Constructor"
+
+		Public Sub New()
+			AddHandler Init, New EventHandler(AddressOf OnInit)
+			AddHandler Load, New EventHandler(AddressOf OnLoad)
+		End Sub
+
+		#End Region
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		#Region "OnInit"
+
+		Private Overloads Sub OnInit(sender As Object, e As EventArgs)
+		End Sub
+
+		#End Region
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		#Region "OnLoad"
+
+		Private Overloads Sub OnLoad(sender As Object, e As EventArgs)
+		End Sub
+
+		#End Region
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		#Region "Properties"
+		#End Region
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		#Region "Render"
+
+		Protected Overrides Sub Render(Writer As HtmlTextWriter)
+			Writer.Write("${ClassName} Control")
+		End Sub
+		#End Region
+	End Class
+End Namespace]]></File>
+
+	</Files>
+
+	<AdditionalOptions/>
+</Template>
diff --git a/data/templates/file/VBNet/VBNet.Web.WebForm.xft b/data/templates/file/VBNet/VBNet.Web.WebForm.xft
new file mode 100644
index 0000000000..eaf17bd520
--- /dev/null
+++ b/data/templates/file/VBNet/VBNet.Web.WebForm.xft
@@ -0,0 +1,175 @@
+<?xml version="1.0"?>
+<Template author="Siegfried Pammer" version="1.0">
+
+	<Config
+		name        = "${res:Templates.File.WebForm.Name}"
+		icon        = "VBNet.File.NewClass"
+		category    = "VB"
+		subcategory = "ASP.NET"
+		defaultname = "WebForm${Number}.aspx"
+		language    = "VBNET"
+	/>
+
+	<Description>${res:Templates.File.WebForm.Description}</Description>
+	<!--
+	Special new file templates:
+		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
+		${FullName}                 -> Full generated path name
+		${FileName}                 -> File name with extension
+		${FileNameWithoutExtension} -> File name without extension
+		${Extension}                -> Extension in the form ".vb"
+		${Path}                     -> Full path of the file
+	 -->
+	<Files>
+		<File name="${Path}/${FileName}.vb" DependentUpon="${FileName}" language="VBNET"><![CDATA[${StandardHeader.VBNET}
+Imports System.Collections
+Imports System.ComponentModel
+Imports System.Data
+Imports System.Drawing
+Imports System.Web
+Imports System.Web.SessionState
+Imports System.Web.UI
+Imports System.Web.UI.WebControls
+Imports System.Web.UI.HtmlControls
+
+Namespace ${StandardNamespace}
+	''' <summary>
+	''' Description of ${ClassName}
+	''' </summary>
+	Public Class ${ClassName}
+		Inherits Page
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		#Region "Data"
+
+		Protected _Button_Ok As HtmlInputButton
+		Protected _Input_Name As HtmlInputText
+
+		#End Region
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		#Region "Page Init & Exit (Open/Close DB connections here...)"
+
+		Protected Sub PageInit(sender As Object, e As System.EventArgs)
+		End Sub
+		'----------------------------------------------------------------------
+		Protected Sub PageExit(sender As Object, e As System.EventArgs)
+		End Sub
+
+		#End Region
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		#Region "Page Load"
+		Private Sub Page_Load(sender As Object, e As System.EventArgs)
+			Response.Write("Hello #Develop<br>")
+			'------------------------------------------------------------------
+			If IsPostBack Then
+			End If
+			'------------------------------------------------------------------
+		End Sub
+		#End Region
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		#Region "Click_Button_OK"
+
+		'----------------------------------------------------------------------
+		Protected Sub Click_Button_Ok(sender As Object, e As System.EventArgs)
+			Response.Write(_Button_Ok.Value & " was cklicked!<br>")
+		End Sub
+
+		#End Region
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		#Region "Change_Input_Name"
+
+		'----------------------------------------------------------------------
+		Protected Sub Changed_Input_Name(sender As Object, e As System.EventArgs)
+			Response.Write(_Input_Name.Value & " has changed!<br>")
+		End Sub
+
+		#End Region
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		#Region "Add more events here..."
+
+		#End Region
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+		#Region "Initialize Component"
+
+		Protected Overrides Sub OnInit(e As EventArgs)
+			InitializeComponent()
+			MyBase.OnInit(e)
+		End Sub
+		'----------------------------------------------------------------------
+		Private Sub InitializeComponent()
+			'------------------------------------------------------------------
+			AddHandler Me.Load, New System.EventHandler(AddressOf Page_Load)
+			AddHandler Me.Init, New System.EventHandler(AddressOf PageInit)
+			AddHandler Me.Unload, New System.EventHandler(AddressOf PageExit)
+			'------------------------------------------------------------------
+			AddHandler _Button_Ok.ServerClick, New EventHandler(AddressOf Click_Button_Ok)
+			AddHandler _Input_Name.ServerChange, New EventHandler(AddressOf Changed_Input_Name)
+			'------------------------------------------------------------------
+		End Sub
+		#End Region
+		'<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+	End Class
+End Namespace]]></File>
+		<File name="${FullName}" language="HTML"><![CDATA[<%@ Page
+	Language           = "VB"
+	AutoEventWireup    = "false"
+	Inherits           = "${StandardNamespace}.${ClassName}"
+	ValidateRequest    = "false"
+	EnableSessionState = "false"
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>${ClassName}</title>
+
+		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+		<meta http-equiv="CACHE-CONTROL" content="NO-CACHE" />
+		<meta http-equiv="PRAGMA" content="NO-CACHE" />
+
+		<link href="${StandardNamespace}.css" type="text/css" rel="stylesheet" />
+		
+	</head>
+	<body>
+		<form id="Form_${ClassName}" method="post" runat="server">
+
+			<table>
+
+				<tr>
+					<td colspan="2">
+						Table
+					</td>
+				</tr>
+
+				<tr>
+				<td>
+						Name:
+					</td>
+					<td>
+						<input id="_Input_Name" runat="server" />
+					</td>
+				</tr>
+
+				<tr>
+					<td colspan="2">
+						<input id="_Button_No" type="submit" value="Oh No!" runat="server" />
+						<input id="ButtonOk" type="submit" value="Ok" runat="server" />
+					</td>
+				</tr>
+
+				<tr>
+					<td colspan="2" align="center">
+						<a href="?" >Click Here</a>
+					</td>
+				</tr>
+
+			</table>
+
+		</form>
+	</body>
+</html>
+]]>		</File>
+
+	</Files>
+
+	<AdditionalOptions/>
+</Template>
diff --git a/data/templates/file/VBNet/VBNet.Web.WebService.xft b/data/templates/file/VBNet/VBNet.Web.WebService.xft
new file mode 100644
index 0000000000..b8b5c35a7c
--- /dev/null
+++ b/data/templates/file/VBNet/VBNet.Web.WebService.xft
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<Template author="Siegfried Pammer" version="1.0">
+
+	<Config
+		name        = "${res:Templates.File.WebService.Name}"
+		icon        = "VBNet.File.NewClass"
+		category    = "VB"
+		subcategory = "ASP.NET"
+		defaultname = "WebService${Number}.asmx"
+		language    = "VBNET"
+	/>
+
+	<Description>${res:Templates.File.WebService.Description}</Description>
+	<!--
+	Special new file templates:
+		${StandardNamespace}        -> Standardnamespace of the current project or FileNameWithoutExtension
+		${FullName}                 -> Full generated path name
+		${FileName}                 -> File name with extension
+		${FileNameWithoutExtension} -> File name without extension
+		${Extension}                -> Extension in the form ".vb"
+		${Path}                     -> Full path of the file
+	 -->
+	<Files>
+		<File name="${Path}/${FileNameWithoutExtension}.vb" DependentUpon="${FileName}" language="VBNET"><![CDATA[${StandardHeader.VBNET}
+using System;
+using System.Web.Services;
+
+namespace ${StandardNamespace}
+{
+	/// <summary>
+	/// Description of ${ClassName}
+	/// </summary>
+	[WebService
+ 	 (	Name = "${ClassName}",
+  		Description = "${ClassName}",
+  		Namespace = "http://www.${ClassName}.example"
+ 	 )
+	]
+	public class ${ClassName} : WebService
+	{
+		public ${ClassName}()
+		{
+		}
+		
+		[WebMethod]
+		public string Status()
+		{
+			string s = string.Format("Time: {0}", DateTime.Now);
+			return s;
+		}
+	}
+}
+]]></File>
+		<File name="${FullName}"><![CDATA[
+<%@ WebService  Class="${StandardNamespace}.${ClassName}" Language="VB" %>
+
+]]>		</File>
+
+	</Files>
+
+	<AdditionalOptions/>
+</Template>
diff --git a/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs b/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs
index d8bcfcb711..8d72b12899 100644
--- a/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs
+++ b/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs
@@ -9,8 +9,9 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
 using System.Xml;
-
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Project;
 
@@ -270,6 +271,10 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 						throw new InvalidDataException("Reference without 'include' attribute!");
 					ReferenceProjectItem item = new ReferenceProjectItem(null, reference.GetAttribute("include"));
 					item.SetMetadata("HintPath", reference.GetAttribute("hintPath"));
+					var requiredTargetFramework = reference.GetElementsByTagName("RequiredTargetFramework").OfType<XmlElement>().FirstOrDefault();
+					if (requiredTargetFramework != null) {
+						item.SetMetadata("RequiredTargetFramework", requiredTargetFramework.Value);
+					}
 					requiredAssemblyReferences.Add(item);
 				}
 			}