fixed namespace problems in VB WPF templates

data/templates/file/VBNet/VBNet.WPFPage.xft

@@ -33,7 +33,7 @@
 		${Path}                     -> Full path of the file
 	 -->
 	<Files>
-		<File name="${FullName}" language="XML" buildAction="Page"><![CDATA[<Page x:Class="${StandardNamespace}.${ClassName}"
+		<File name="${FullName}" language="XML" buildAction="Page"><![CDATA[<Page x:Class="${ClassName}"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	Title="${FileNameWithoutExtension}">
@@ -52,16 +52,16 @@ 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 Partial Class ${ClassName}
+	Inherits Page
+	
 	Public Sub New()
 		InitializeComponent()
 	End Sub
-	End Class
+End Class]]></File>
-End Namespace]]></File>
 	</Files>
 	
 	<AdditionalOptions/>

data/templates/file/VBNet/VBNet.WPFPageFunction.xft

@@ -37,7 +37,7 @@
     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:Class="${FileNameWithoutExtension}"
     x:TypeArguments="sys:String"
     Title="${FileNameWithoutExtension}">
   <Grid>
@@ -57,7 +57,6 @@ Imports System.Windows.Media.Imaging
 Imports System.Windows.Navigation
 Imports System.Windows.Shapes
 
-Namespace ${StandardNamespace}
 ''' <summary>
 ''' Interaction logic for ${FileName}
 ''' </summary>
@@ -88,9 +87,7 @@ Namespace ${StandardNamespace}
 	'     Console.WriteLine("${FileNameWithoutExtension} returned: " & e.Result)
 	' End Sub
 	
-
+End Class]]></File>
-	End Class
-End Namespace]]></File>
 	</Files>
 	
 	<AdditionalOptions/>

data/templates/file/VBNet/VBNet.WPFUserControl.xft

@@ -33,14 +33,14 @@
 		${Path}                     -> Full path of the file
 	 -->
 	<Files>
-		<File name="${FullName}" language="C#"><![CDATA[<UserControl x:Class="${StandardNamespace}.${ClassName}"
+		<File name="${FullName}" language="XML"><![CDATA[<UserControl x:Class="${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}
+		<File name="${FullName}.vb" language="VBNET" DependentUpon="${FileName}" SubType="Code"><![CDATA[${StandardHeader.VBNET}
 Imports System
 Imports System.Collections.Generic
 Imports System.Text
@@ -51,16 +51,16 @@ 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 Partial Class ${ClassName}
+	Inherits UserControl
+	
 	Public Sub New()
 		InitializeComponent()
 	End Sub
-	End Class
+End Class]]></File>
-End Namespace]]></File>
 	</Files>
 	
 	<AdditionalOptions/>

data/templates/file/VBNet/VBNet.WPFWindow.xft

@@ -33,7 +33,7 @@
 		${Path}                     -> Full path of the file
 	 -->
 	<Files>
-		<File name="${FullName}" language="XML" buildAction="Page"><![CDATA[<Window x:Class="${StandardNamespace}.${ClassName}"
+		<File name="${FullName}" language="XML" buildAction="Page"><![CDATA[<Window x:Class="${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">
@@ -52,16 +52,16 @@ Imports System.Windows.Documents
 Imports System.Windows.Input
 Imports System.Windows.Media
 
-Namespace ${StandardNamespace}
+''' <summary>
-	' <summary>
+''' Interaction logic for ${FileName}
-	' Interaction logic for ${FileName}
+''' </summary>
-	' </summary>
+Public Partial Class ${ClassName}
-	Public Partial Class ${ClassName} Inherits Window
+	Inherits Window
+	
 	Public Sub New()
 		InitializeComponent()
 	End Sub
-	End Class
+End Class]]></File>
-End Namespace]]></File>
 	</Files>
 	
 	<AdditionalOptions/>

data/templates/project/VBNet/WPFApplication.xpt

@@ -39,7 +39,7 @@
 		</PropertyGroup>
 		
 		<Files>
-			<File name="App.xaml" buildAction="ApplicationDefinition" language="XML"><![CDATA[<Application x:Class="${StandardNamespace}.App"
+			<File name="App.xaml" buildAction="ApplicationDefinition" language="XML"><![CDATA[<Application x:Class="App"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	StartupUri="Window1.xaml">
@@ -54,16 +54,14 @@ Imports System.Data
 Imports System.Xml
 Imports System.Configuration
 
-Namespace ${StandardNamespace}
 ''' <summary>
 ''' Interaction logic for App.xaml
 ''' </summary>
 Public Partial Class App
 	Inherits Application
 	
-	End Class
+End Class]]></File>
-End Namespace]]></File>
+			<File name="Window1.xaml" buildAction="Page" language="XML"><![CDATA[<Window x:Class="Window1"
-			<File name="Window1.xaml" buildAction="Page" language="XML"><![CDATA[<Window x:Class="${StandardNamespace}.Window1"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	Title="${StandardNamespace}" Height="300" Width="300"
@@ -83,7 +81,6 @@ Imports System.Windows.Documents
 Imports System.Windows.Input
 Imports System.Windows.Media
 
-Namespace ${StandardNamespace}
 ''' <summary>
 ''' Interaction logic for Window1.xaml
 ''' </summary>
@@ -93,8 +90,7 @@ Namespace ${StandardNamespace}
 	Public Sub New()
 		InitializeComponent()
 	End Sub
-	End Class
+End Class]]></File>
-End Namespace]]></File>
 			<File name="Properties\WPFAssemblyInfo.vb" src="WPFAssemblyInfo.vb" />
 			<File name="Properties\AssemblyInfo.vb" src="DefaultAssemblyInfo.vb" />
 			<File name="Properties\MyExtensions\MyWpfExtension.vb" src="MyWpfExtension.vb" />

data/templates/project/VBNet/WPFNavigationApplication.xpt

@@ -39,7 +39,7 @@
 		</PropertyGroup>
 		
 		<Files>
-			<File name="App.xaml" buildAction="ApplicationDefinition" language="XML"><![CDATA[<Application x:Class="${StandardNamespace}.App"
+			<File name="App.xaml" buildAction="ApplicationDefinition" language="XML"><![CDATA[<Application x:Class="App"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	StartupUri="Page1.xaml"
@@ -55,16 +55,14 @@ Imports System.Data
 Imports System.Xml
 Imports System.Configuration
 
-Namespace ${StandardNamespace}
 ''' <summary>
 ''' Interaction logic for App.xaml
 ''' </summary>
 Public Partial Class App
 	Inherits Application
 	
-	End Class
+End Class]]></File>
-End Namespace]]></File>
+			<File name="Page1.xaml" language="XML" buildAction="Page"><![CDATA[<Page x:Class="Page1"
-			<File name="Page1.xaml" language="XML" buildAction="Page"><![CDATA[<Page x:Class="${StandardNamespace}.Page1"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	Title="Page1"
@@ -87,18 +85,16 @@ Imports System.Windows.Media.Imaging
 Imports System.Windows.Navigation
 Imports System.Windows.Shapes
 
-Namespace ${StandardNamespace}
+''' <summary>
-	/// <summary>
+''' Interaction logic for Page1.xaml
-	/// Interaction logic for Page1.xaml
+''' </summary>
-	/// </summary>
 Public Partial Class Page1
 	Inherits Page
 
 	Public Sub New()
 		InitializeComponent()
 	End Sub
-	End Class
+End Class]]></File>
-End Namespace]]></File>
 			<File name="Properties\AssemblyInfo.vb" src="DefaultAssemblyInfo.vb" />
 			<File name="Properties\WPFAssemblyInfo.vb" src="WPFAssemblyInfo.vb" />
 			<File name="Properties\MyExtensions\MyWpfExtension.vb" src="MyWpfExtension.vb" />