Improved project and item templates

vsix/ItemTemplates/BlankPage/BlankPage.cpp

@@ -13,19 +13,4 @@ namespace winrt::$rootnamespace$::implementation
     {
         InitializeComponent();
     }
-
-    int32_t $safeitemname$::MyProperty()
-    {
-        throw hresult_not_implemented();
-    }
-
-    void $safeitemname$::MyProperty(int32_t /* value */)
-    {
-        throw hresult_not_implemented();
-    }
-
-    void $safeitemname$::ClickHandler(IInspectable const&, RoutedEventArgs const&)
-    {
-        Button().Content(box_value(L"Clicked"));
-    }
 }

vsix/ItemTemplates/BlankPage/BlankPage.h

@@ -1,17 +1,11 @@
 #pragma once
-
 #include "$safeitemname$.g.h"
 
 namespace winrt::$rootnamespace$::implementation
 {
     struct $safeitemname$ : $safeitemname$T<$safeitemname$>
     {
         $safeitemname$();
-
-        int32_t MyProperty();
-        void MyProperty(int32_t value);
-
-        void ClickHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
     };
 }
 

vsix/ItemTemplates/BlankPage/BlankPage.idl

@@ -4,6 +4,5 @@ namespace $rootnamespace$
     runtimeclass $safeitemname$ : Windows.UI.Xaml.Controls.Page
     {
         $safeitemname$();
-        Int32 MyProperty;
     }
 }

vsix/ItemTemplates/BlankPage/BlankPage.xaml

@@ -2,12 +2,10 @@
     x:Class="$rootnamespace$.$safeitemname$"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:$rootnamespace$"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:$rootnamespace$"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-        <Button x:Name="Button" Click="ClickHandler">Click Me</Button>
-    </StackPanel>
+    <Grid />
 </Page>

vsix/ItemTemplates/BlankUserControl/BlankUserControl.cpp

@@ -13,19 +13,4 @@ namespace winrt::$rootnamespace$::implementation
     {
         InitializeComponent();
     }
-
-    int32_t $safeitemname$::MyProperty()
-    {
-        throw hresult_not_implemented();
-    }
-
-    void $safeitemname$::MyProperty(int32_t /* value */)
-    {
-        throw hresult_not_implemented();
-    }
-
-    void $safeitemname$::ClickHandler(IInspectable const&, RoutedEventArgs const&)
-    {
-        Button().Content(box_value(L"Clicked"));
-    }
 }

vsix/ItemTemplates/BlankUserControl/BlankUserControl.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "winrt/Windows.UI.Xaml.h"
 #include "winrt/Windows.UI.Xaml.Markup.h"
 #include "winrt/Windows.UI.Xaml.Interop.h"
@@ -11,11 +10,6 @@ namespace winrt::$rootnamespace$::implementation
     struct $safeitemname$ : $safeitemname$T<$safeitemname$>
     {
         $safeitemname$();
-
-        int32_t MyProperty();
-        void MyProperty(int32_t value);
-
-        void ClickHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
     };
 }
 

vsix/ItemTemplates/BlankUserControl/BlankUserControl.idl

@@ -4,6 +4,5 @@ namespace $rootnamespace$
     runtimeclass $safeitemname$ : Windows.UI.Xaml.Controls.UserControl
     {
         $safeitemname$();
-        Int32 MyProperty;
     }
 }

vsix/ItemTemplates/BlankUserControl/BlankUserControl.xaml

@@ -2,12 +2,12 @@
     x:Class="$rootnamespace$.$safeitemname$"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:$rootnamespace$"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:$rootnamespace$"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-        <Button x:Name="Button" Click="ClickHandler">Click Me</Button>
-    </StackPanel>
+    <Grid>
+
+    </Grid>
 </UserControl>

vsix/ItemTemplates/ViewModel/ViewModel.cpp

@@ -4,15 +4,18 @@
 #include "$safeitemname$.g.cpp"
 #endif
 
+using namespace winrt;
+using namespace Windows::UI::Xaml::Data;
+
 namespace winrt::$rootnamespace$::implementation
 {
-    int32_t $safeitemname$::MyProperty()
+    event_token $safeitemname$::PropertyChanged(PropertyChangedEventHandler const& handler)
     {
-        throw hresult_not_implemented();
+        return m_PropertyChanged.add(handler);
     }
 
-    void $safeitemname$::MyProperty(int32_t /*value*/)
+    void $safeitemname$::PropertyChanged(event_token token) noexcept
     {
-        throw hresult_not_implemented();
+        m_PropertyChanged.remove(token);
     }
 }

vsix/ItemTemplates/ViewModel/ViewModel.h

@@ -1,5 +1,5 @@
 #pragma once
-
+#include "winrt/Windows.UI.Xaml.Data.h"
 #include "$safeitemname$.g.h"
 
 namespace winrt::$rootnamespace$::implementation
@@ -8,8 +8,10 @@ namespace winrt::$rootnamespace$::implementation
     {
         $safeitemname$() = default;
 
-        int32_t MyProperty();
-        void MyProperty(int32_t value);
+        event_token PropertyChanged(Windows::UI::Xaml::Data::PropertyChangedEventHandler const& handler);
+        void PropertyChanged(event_token token) noexcept;
+    private:
+        event<Windows::UI::Xaml::Data::PropertyChangedEventHandler> m_PropertyChanged;
     };
 }
 

vsix/ItemTemplates/ViewModel/ViewModel.idl

@@ -2,9 +2,8 @@ namespace $rootnamespace$
 {
     [bindable]
     [default_interface]
-    runtimeclass $safeitemname$ 
+    runtimeclass $safeitemname$ : Windows.UI.Xaml.Data.INotifyPropertyChanged
     {
         $safeitemname$();
-        Int32 MyProperty;
     }
 }

vsix/ProjectTemplates/VC/Windows Desktop/WindowsApplication/pch.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <windows.h>
 #ifdef GetCurrentTime
 #undef GetCurrentTime

vsix/ProjectTemplates/VC/Windows Universal/BlankApp/App.cpp

@@ -1,5 +1,4 @@
 #include "pch.h"
-
 #include "App.h"
 #include "MainPage.h"
 

vsix/ProjectTemplates/VC/Windows Universal/BlankApp/MainPage.cpp

@@ -4,6 +4,7 @@
 
 using namespace winrt;
 using namespace Windows::UI::Xaml;
+using namespace Windows::Foundation;
 
 namespace winrt::$safeprojectname$::implementation
 {
@@ -17,7 +18,7 @@ namespace winrt::$safeprojectname$::implementation
         throw hresult_not_implemented();
     }
 
-    void MainPage::MyProperty(int32_t /* value */)
+    void MainPage::MyProperty([[maybe_unused]] int32_t value)
     {
         throw hresult_not_implemented();
     }

vsix/ProjectTemplates/VC/Windows Universal/BlankApp/MainPage.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "MainPage.g.h"
 
 namespace winrt::$safeprojectname$::implementation
@@ -10,7 +9,6 @@ namespace winrt::$safeprojectname$::implementation
 
         int32_t MyProperty();
         void MyProperty(int32_t value);
-
         void ClickHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
     };
 }

vsix/ProjectTemplates/VC/Windows Universal/BlankApp/MainPage.xaml

@@ -1,13 +1,13 @@
-<Page
+<Page
     x:Class="$safeprojectname$.MainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:$safeprojectname$"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:$safeprojectname$"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal">
         <Button x:Name="myButton" Click="ClickHandler">Click Me</Button>
     </StackPanel>
 </Page>

vsix/ProjectTemplates/VC/Windows Universal/CoreApp/App.cpp

@@ -1,7 +1,6 @@
 #include "pch.h"
 
 using namespace winrt;
-
 using namespace Windows;
 using namespace Windows::ApplicationModel::Core;
 using namespace Windows::Foundation::Numerics;

vsix/ProjectTemplates/VC/Windows Universal/StaticLibrary/Class.cpp

@@ -9,7 +9,7 @@ namespace winrt::$safeprojectname$::implementation
         throw hresult_not_implemented();
     }
 
-    void Class::MyProperty(int32_t /* value */)
+    void Class::MyProperty([[maybe_unused]] int32_t value)
     {
         throw hresult_not_implemented();
     }

vsix/ProjectTemplates/VC/Windows Universal/StaticLibrary/Class.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "Class.g.h"
 
 namespace winrt::$safeprojectname$::implementation

vsix/ProjectTemplates/VC/Windows Universal/WindowsRuntimeComponent/Class.cpp

@@ -9,7 +9,7 @@ namespace winrt::$safeprojectname$::implementation
         throw hresult_not_implemented();
     }
 
-    void Class::MyProperty(int32_t /* value */)
+    void Class::MyProperty([[maybe_unused]] int32_t value)
     {
         throw hresult_not_implemented();
     }

vsix/ProjectTemplates/VC/Windows Universal/WindowsRuntimeComponent/Class.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "Class.g.h"
 
 namespace winrt::$safeprojectname$::implementation