diff --git a/data/templates/file/VBNet/VBNet.WPFPage.xft b/data/templates/file/VBNet/VBNet.WPFPage.xft index 3bb8b53b9c..9d1801fac5 100644 --- a/data/templates/file/VBNet/VBNet.WPFPage.xft +++ b/data/templates/file/VBNet/VBNet.WPFPage.xft @@ -33,7 +33,7 @@ ${Path} -> Full path of the file --> - @@ -52,16 +52,16 @@ Imports System.Windows.Documents Imports System.Windows.Input Imports System.Windows.Media -Namespace ${StandardNamespace} - ''' - ''' Interaction logic for ${FileName} - ''' - Public Partial Class ${ClassName} Inherits Page - Public Sub New() - InitializeComponent() - End Sub - End Class -End Namespace]]> +''' +''' Interaction logic for ${FileName} +''' +Public Partial Class ${ClassName} + Inherits Page + + Public Sub New() + InitializeComponent() + End Sub +End Class]]> diff --git a/data/templates/file/VBNet/VBNet.WPFPageFunction.xft b/data/templates/file/VBNet/VBNet.WPFPageFunction.xft index dc11e4b809..89dab45de5 100644 --- a/data/templates/file/VBNet/VBNet.WPFPageFunction.xft +++ b/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}"> @@ -57,40 +57,37 @@ Imports System.Windows.Media.Imaging Imports System.Windows.Navigation Imports System.Windows.Shapes -Namespace ${StandardNamespace} - ''' - ''' Interaction logic for ${FileName} - ''' +''' +''' Interaction logic for ${FileName} +''' - Public Partial Class ${FileNameWithoutExtension} - Inherits PageFunction(Of String) +Public Partial Class ${FileNameWithoutExtension} + Inherits PageFunction(Of String) - Public Sub New() - InitializeComponent() - End Sub + 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 + ' 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]]> + ' 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]]> diff --git a/data/templates/file/VBNet/VBNet.WPFUserControl.xft b/data/templates/file/VBNet/VBNet.WPFUserControl.xft index 6990c80a4a..890627bcbc 100644 --- a/data/templates/file/VBNet/VBNet.WPFUserControl.xft +++ b/data/templates/file/VBNet/VBNet.WPFUserControl.xft @@ -33,14 +33,14 @@ ${Path} -> Full path of the file --> - ]]> - - ''' Interaction logic for ${FileName} - ''' - Public Partial Class ${ClassName} Inherits UserControl - Public Sub New() - InitializeComponent() - End Sub - End Class -End Namespace]]> +''' +''' Interaction logic for ${FileName} +''' +Public Partial Class ${ClassName} + Inherits UserControl + + Public Sub New() + InitializeComponent() + End Sub +End Class]]> diff --git a/data/templates/file/VBNet/VBNet.WPFWindow.xft b/data/templates/file/VBNet/VBNet.WPFWindow.xft index 1443479ae4..ecb0daedb8 100644 --- a/data/templates/file/VBNet/VBNet.WPFWindow.xft +++ b/data/templates/file/VBNet/VBNet.WPFWindow.xft @@ -33,7 +33,7 @@ ${Path} -> Full path of the file --> - @@ -52,16 +52,16 @@ Imports System.Windows.Documents Imports System.Windows.Input Imports System.Windows.Media -Namespace ${StandardNamespace} - ' - ' Interaction logic for ${FileName} - ' - Public Partial Class ${ClassName} Inherits Window - Public Sub New() - InitializeComponent() - End Sub - End Class -End Namespace]]> +''' +''' Interaction logic for ${FileName} +''' +Public Partial Class ${ClassName} + Inherits Window + + Public Sub New() + InitializeComponent() + End Sub +End Class]]> diff --git a/data/templates/project/VBNet/WPFApplication.xpt b/data/templates/project/VBNet/WPFApplication.xpt index 46d09d08a3..f0be803808 100644 --- a/data/templates/project/VBNet/WPFApplication.xpt +++ b/data/templates/project/VBNet/WPFApplication.xpt @@ -39,7 +39,7 @@ - @@ -54,16 +54,14 @@ Imports System.Data Imports System.Xml Imports System.Configuration -Namespace ${StandardNamespace} - ''' - ''' Interaction logic for App.xaml - ''' - Public Partial Class App - Inherits Application - - End Class -End Namespace]]> - +''' Interaction logic for App.xaml +''' +Public Partial Class App + Inherits Application + +End Class]]> + - ''' Interaction logic for Window1.xaml - ''' - Public Partial Class Window1 - Inherits Window +''' +''' Interaction logic for Window1.xaml +''' +Public Partial Class Window1 + Inherits Window - Public Sub New() - InitializeComponent() - End Sub - End Class -End Namespace]]> + Public Sub New() + InitializeComponent() + End Sub +End Class]]> diff --git a/data/templates/project/VBNet/WPFNavigationApplication.xpt b/data/templates/project/VBNet/WPFNavigationApplication.xpt index 9c9b8b05c1..8ab17eae32 100644 --- a/data/templates/project/VBNet/WPFNavigationApplication.xpt +++ b/data/templates/project/VBNet/WPFNavigationApplication.xpt @@ -39,7 +39,7 @@ - - ''' Interaction logic for App.xaml - ''' - Public Partial Class App - Inherits Application - - End Class -End Namespace]]> - +''' Interaction logic for App.xaml +''' +Public Partial Class App + Inherits Application + +End Class]]> + - /// Interaction logic for Page1.xaml - /// - Public Partial Class Page1 - Inherits Page +''' +''' Interaction logic for Page1.xaml +''' +Public Partial Class Page1 + Inherits Page - Public Sub New() - InitializeComponent() - End Sub - End Class -End Namespace]]> + Public Sub New() + InitializeComponent() + End Sub +End Class]]>