Various fixes for C++ project and item templates (#3745)

This is a partial adoption of #3619 by @JaiganeshKumaran in order to expedite the merging of the changes from that PR which do not need additional time for discussion. The individual changes that were extracted from the aforementioned PR are as follows: - Removed usage of InitializeComponent as it's no longer recommended by C++/WinRT (see https:/microsoft/cppwinrt/tree/master/nuget#initializecomponent for more details). - Removed Microsoft copyright notice. - Removed #include XAML headers in a template control header. This was in the C++/WinRT templates because a runtime component will not include XAML headers in pch.h, which is no longer the case with a WinUI 3 runtime component. - Made the WinUI 3 runtime component "desktop-only" as WinUI 3 cannot be used by UWP apps. This is a fix for #1780. (Note that unlike the original PR the source directory structure is not being changed in order to minimize potential merge conflicts.) - Removed App.idl because it's empty and not needed. - Indented App.xaml.cpp's content inside the implementation namespace, rather than `using namespace` for consistency with the rest of the code. Also removed `using namespace` for namespaces that aren't actually used (Controls and Navigation namespaces were needed for Frame navigation, which isn't performed in the WinUI 3 template. IInspectable is available as an alias in every WinRT implementation type, thus doesn't require prefixing it with Windows::Foundation). Additionally, this PR replaces `<ProjectTypeTag>uwp</ProjectTypeTag>` with `<ProjectTypeTag>WinUI</ProjectTypeTag>` (or just adds the latter if the former was not present at all) in the item templates. I don't believe this tag is surfaced anywhere in the Visual Studio UI but the consistency makes me happier. --------- Co-authored-by: Jaiganésh Kumaran <[email protected]> (cherry picked from commit 18ada2f)
microsoft · Jul 21, 2023 · 23a3653 · 23a3653
1 parent cf90544
commit 23a3653
Show file tree

Hide file tree

Showing 61 changed files with 119 additions and 237 deletions.
diff --git a/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/WinUI.Desktop.Cs.BlankWindow.vstemplate b/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/WinUI.Desktop.Cs.BlankWindow.vstemplate
@@ -15,6 +15,7 @@
  <LanguageTag>csharp</LanguageTag>
  <PlatformTag>windows</PlatformTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent>
  <ProjectItem OpenInEditor="true" ReplaceParameters="true" ItemType="Page" CustomTool="MSBuild:Compile" TargetFileName="$fileinputname$.xaml">BlankWindow.xaml</ProjectItem>

diff --git a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation and Contributors.
-// Licensed under the MIT License.
-
 #include "pch.h"
 #include "$safeitemname$.xaml.h"
 #if __has_include("$safeitemname$.g.cpp")
@@ -15,11 +12,6 @@ using namespace Microsoft::UI::Xaml;
 
 namespace winrt::$rootnamespace$::implementation
 {
- $safeitemname$::$safeitemname$()
- {
- InitializeComponent();
- }
-
  int32_t $safeitemname$::MyProperty()
  {
  throw hresult_not_implemented();

diff --git a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.h b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.h
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation and Contributors.
-// Licensed under the MIT License.
-
 #pragma once
 
 #include "$safeitemname$.g.h"
@@ -9,12 +6,16 @@ namespace winrt::$rootnamespace$::implementation
 {
  struct $safeitemname$ : $safeitemname$T<$safeitemname$>
  {
- $safeitemname$();
+ $safeitemname$()
+ {
+ // Xaml objects should not call InitializeComponent during construction.
+ // See https:/microsoft/cppwinrt/tree/master/nuget#initializecomponent
+ }
 
  int32_t MyProperty();
  void MyProperty(int32_t value);
 
- void myButton_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
+ void myButton_Click(IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
  };
 }
 

diff --git a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.idl b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.idl
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation and Contributors.
-// Licensed under the MIT License.
-
 namespace $rootnamespace$
 {
  [default_interface]

diff --git a/.../ItemTemplates/Desktop/CppWinRT/BlankWindow/WinUI.Desktop.CppWinRT.BlankWindow.vstemplate b/.../ItemTemplates/Desktop/CppWinRT/BlankWindow/WinUI.Desktop.CppWinRT.BlankWindow.vstemplate
@@ -15,6 +15,7 @@
  <LanguageTag>cpp</LanguageTag>
  <PlatformTag>windows</PlatformTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent>
  <ProjectItem SubType="Designer" TargetFileName="$fileinputname$.xaml" ReplaceParameters="true">BlankWindow.xaml</ProjectItem>

diff --git a/dev/VSIX/ItemTemplates/Neutral/CSharp/BlankPage/WinUI.Neutral.Cs.BlankPage.vstemplate b/dev/VSIX/ItemTemplates/Neutral/CSharp/BlankPage/WinUI.Neutral.Cs.BlankPage.vstemplate
@@ -14,8 +14,8 @@
  <TargetPlatformName>Windows</TargetPlatformName>
  <LanguageTag>csharp</LanguageTag>
  <PlatformTag>windows</PlatformTag>
- <ProjectTypeTag>uwp</ProjectTypeTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent>
  <ProjectItem OpenInEditor="true" ReplaceParameters="true" ItemType="Page" CustomTool="MSBuild:Compile" TargetFileName="$fileinputname$.xaml">BlankPage.xaml</ProjectItem>

diff --git a/...emplates/Neutral/CSharp/ResourceDictionary/WinUI.Neutral.Cs.ResourceDictionary.vstemplate b/...emplates/Neutral/CSharp/ResourceDictionary/WinUI.Neutral.Cs.ResourceDictionary.vstemplate
@@ -14,8 +14,8 @@
  <TargetPlatformName>Windows</TargetPlatformName>
  <LanguageTag>csharp</LanguageTag>
  <PlatformTag>windows</PlatformTag>
- <ProjectTypeTag>uwp</ProjectTypeTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent>
  <ProjectItem OpenInEditor="true" ReplaceParameters="true" ItemType="Page" CustomTool="MSBuild:Compile" TargetFileName="$fileinputname$.xaml">ResourceDictionary.xaml</ProjectItem>

diff --git a/dev/VSIX/ItemTemplates/Neutral/CSharp/Resw/WinUI.Neutral.Cs.Resw.vstemplate b/dev/VSIX/ItemTemplates/Neutral/CSharp/Resw/WinUI.Neutral.Cs.Resw.vstemplate
@@ -14,8 +14,8 @@
  <TargetPlatformName>Windows</TargetPlatformName>
  <LanguageTag>csharp</LanguageTag>
  <PlatformTag>windows</PlatformTag>
- <ProjectTypeTag>uwp</ProjectTypeTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent>
  <ProjectItem ItemType="PRIResource">Resources.resw</ProjectItem>

diff --git a/...temTemplates/Neutral/CSharp/TemplatedControl/WinUI.Neutral.Cs.TemplatedControl.vstemplate b/...temTemplates/Neutral/CSharp/TemplatedControl/WinUI.Neutral.Cs.TemplatedControl.vstemplate
@@ -14,8 +14,8 @@
  <TargetPlatformName>Windows</TargetPlatformName>
  <LanguageTag>csharp</LanguageTag>
  <PlatformTag>windows</PlatformTag>
- <ProjectTypeTag>uwp</ProjectTypeTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent>
  <ProjectItem ReplaceParameters="true" TargetFileName="$fileinputname$.cs">CustomControl.cs</ProjectItem>

diff --git a/dev/VSIX/ItemTemplates/Neutral/CSharp/UserControl/WinUI.Neutral.Cs.UserControl.vstemplate b/dev/VSIX/ItemTemplates/Neutral/CSharp/UserControl/WinUI.Neutral.Cs.UserControl.vstemplate
@@ -14,8 +14,8 @@
  <TargetPlatformName>Windows</TargetPlatformName>
  <LanguageTag>csharp</LanguageTag>
  <PlatformTag>windows</PlatformTag>
- <ProjectTypeTag>uwp</ProjectTypeTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent>
  <ProjectItem OpenInEditor="true" ReplaceParameters="true" ItemType="Page" CustomTool="MSBuild:Compile" TargetFileName="$fileinputname$.xaml">UserControl.xaml</ProjectItem>

diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.cpp b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.cpp
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation and Contributors.
-// Licensed under the MIT License.
-
 #include "pch.h"
 #include "$safeitemname$.xaml.h"
 #if __has_include("$safeitemname$.g.cpp")
@@ -15,11 +12,6 @@ using namespace Microsoft::UI::Xaml;
 
 namespace winrt::$rootnamespace$::implementation
 {
- $safeitemname$::$safeitemname$()
- {
- InitializeComponent();
- }
-
  int32_t $safeitemname$::MyProperty()
  {
  throw hresult_not_implemented();

diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.h b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.h
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation and Contributors.
-// Licensed under the MIT License.
-
 #pragma once
 
 #include "$safeitemname$.g.h"
@@ -9,12 +6,16 @@ namespace winrt::$rootnamespace$::implementation
 {
  struct $safeitemname$ : $safeitemname$T<$safeitemname$>
  {
- $safeitemname$();
+ $safeitemname$()
+ {
+ // Xaml objects should not call InitializeComponent during construction.
+ // See https:/microsoft/cppwinrt/tree/master/nuget#initializecomponent
+ }
 
  int32_t MyProperty();
  void MyProperty(int32_t value);
 
- void myButton_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
+ void myButton_Click(IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
  };
 }
 

diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.idl b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.idl
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation and Contributors.
-// Licensed under the MIT License.
-
 namespace $rootnamespace$
 {
  [default_interface]

diff --git a/...VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/WinUI.Neutral.CppWinRT.BlankPage.vstemplate b/...VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/WinUI.Neutral.CppWinRT.BlankPage.vstemplate
@@ -14,8 +14,8 @@
  <TargetPlatformName>Windows</TargetPlatformName>
  <LanguageTag>cpp</LanguageTag>
  <PlatformTag>windows</PlatformTag>
- <ProjectTypeTag>uwp</ProjectTypeTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent>
  <ProjectItem SubType="Designer" TargetFileName="$fileinputname$.xaml" ReplaceParameters="true">BlankPage.xaml</ProjectItem>

diff --git a/.../Neutral/CppWinRT/ResourceDictionary/WinUI.Neutral.CppWinRT.ResourceDictionary.vstemplate b/.../Neutral/CppWinRT/ResourceDictionary/WinUI.Neutral.CppWinRT.ResourceDictionary.vstemplate
@@ -14,8 +14,8 @@
  <TargetPlatformName>Windows</TargetPlatformName>
  <LanguageTag>cpp</LanguageTag>
  <PlatformTag>windows</PlatformTag>
- <ProjectTypeTag>uwp</ProjectTypeTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent>
  <ProjectItem OpenInEditor="true" ReplaceParameters="true" ItemType="Page" TargetFileName="$fileinputname$.xaml">ResourceDictionary.xaml</ProjectItem>

diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/Resw/WinUI.Neutral.CppWinRT.Resw.vstemplate b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/Resw/WinUI.Neutral.CppWinRT.Resw.vstemplate
@@ -14,8 +14,8 @@
  <TargetPlatformName>Windows</TargetPlatformName>
  <LanguageTag>cpp</LanguageTag>
  <PlatformTag>windows</PlatformTag>
- <ProjectTypeTag>uwp</ProjectTypeTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent>
  <ProjectItem ItemType="PRIResource">Resources.resw</ProjectItem>

diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.cpp b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.cpp
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation and Contributors.
-// Licensed under the MIT License.
-
 #include "pch.h"
 #include "$safeitemname$.h"
 #if __has_include("$safeitemname$.g.cpp")

diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.h b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.h
@@ -1,11 +1,5 @@
-// Copyright (c) Microsoft Corporation and Contributors.
-// Licensed under the MIT License.
-
 #pragma once
 
-#include "winrt/Microsoft.UI.Xaml.h"
-#include "winrt/Microsoft.UI.Xaml.Markup.h"
-#include "winrt/Microsoft.UI.Xaml.Controls.Primitives.h"
 #include "$safeitemname$.g.h"
 
 namespace winrt::$rootnamespace$::implementation

diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.idl b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.idl
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation and Contributors.
-// Licensed under the MIT License.
-
 namespace $rootnamespace$
 {
  [default_interface]

diff --git a/...ates/Neutral/CppWinRT/TemplatedControl/WinUI.Neutral.CppWinRT.TemplatedControl.vstemplate b/...ates/Neutral/CppWinRT/TemplatedControl/WinUI.Neutral.CppWinRT.TemplatedControl.vstemplate
@@ -14,8 +14,8 @@
  <TargetPlatformName>Windows</TargetPlatformName>
  <LanguageTag>cpp</LanguageTag>
  <PlatformTag>windows</PlatformTag>
- <ProjectTypeTag>uwp</ProjectTypeTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent>
  <ProjectItem SubType="Code" TargetFileName="$fileinputname$.cpp" ReplaceParameters="true">TemplatedControl.cpp</ProjectItem>

diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.cpp b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.cpp
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation and Contributors.
-// Licensed under the MIT License.
-
 #include "pch.h"
 #include "$safeitemname$.xaml.h"
 #if __has_include("$safeitemname$.g.cpp")
@@ -15,11 +12,6 @@ using namespace Microsoft::UI::Xaml;
 
 namespace winrt::$rootnamespace$::implementation
 {
- $safeitemname$::$safeitemname$()
- {
- InitializeComponent();
- }
-
  int32_t $safeitemname$::MyProperty()
  {
  throw hresult_not_implemented();

diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.h b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.h
@@ -1,23 +1,21 @@
-// Copyright (c) Microsoft Corporation and Contributors.
-// Licensed under the MIT License.
-
 #pragma once
 
-#include "winrt/Microsoft.UI.Xaml.h"
-#include "winrt/Microsoft.UI.Xaml.Markup.h"
-#include "winrt/Microsoft.UI.Xaml.Controls.Primitives.h"
 #include "$safeitemname$.g.h"
 
 namespace winrt::$rootnamespace$::implementation
 {
  struct $safeitemname$ : $safeitemname$T<$safeitemname$>
  {
- $safeitemname$();
+ $safeitemname$()
+ {
+ // Xaml objects should not call InitializeComponent during construction.
+ // See https:/microsoft/cppwinrt/tree/master/nuget#initializecomponent
+ }
 
  int32_t MyProperty();
  void MyProperty(int32_t value);
 
- void myButton_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
+ void myButton_Click(IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args);
  };
 }
 

diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.idl b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.idl
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation and Contributors.
-// Licensed under the MIT License.
-
 namespace $rootnamespace$
 {
  [default_interface]

diff --git a/.../ItemTemplates/Neutral/CppWinRT/UserControl/WinUI.Neutral.CppWinRT.UserControl.vstemplate b/.../ItemTemplates/Neutral/CppWinRT/UserControl/WinUI.Neutral.CppWinRT.UserControl.vstemplate
@@ -14,8 +14,8 @@
  <TargetPlatformName>Windows</TargetPlatformName>
  <LanguageTag>cpp</LanguageTag>
  <PlatformTag>windows</PlatformTag>
- <ProjectTypeTag>uwp</ProjectTypeTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent>
  <ProjectItem SubType="Designer" TargetFileName="$fileinputname$.xaml" ReplaceParameters="true">UserControl.xaml</ProjectItem>

diff --git a/...SIX/ProjectTemplates/Desktop/CSharp/ClassLibrary/WinUI.Desktop.Cs.ClassLibrary.vstemplate b/...SIX/ProjectTemplates/Desktop/CSharp/ClassLibrary/WinUI.Desktop.Cs.ClassLibrary.vstemplate
@@ -21,7 +21,7 @@
  <LanguageTag>XAML</LanguageTag>
  <PlatformTag>windows</PlatformTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
- <ProjectTypeTag>WinUI</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent PreferedSolutionConfiguration="Debug|AnyCPU">
  <CustomParameters>

diff --git a/...ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/WinUI.Desktop.Cs.BlankApp.vstemplate b/...ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/WinUI.Desktop.Cs.BlankApp.vstemplate
@@ -22,7 +22,7 @@
  <LanguageTag>XAML</LanguageTag>
  <PlatformTag>windows</PlatformTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
- <ProjectTypeTag>WinUI</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent PreferedSolutionConfiguration="Debug|x86">
  <Project File="ProjectTemplate.csproj" ReplaceParameters="true">

diff --git a/...X/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/WinUI.Desktop.Cs.WapProj.vstemplate b/...X/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/WinUI.Desktop.Cs.WapProj.vstemplate
@@ -21,7 +21,7 @@
  <LanguageTag>XAML</LanguageTag>
  <PlatformTag>windows</PlatformTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
- <ProjectTypeTag>WinUI</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent>
  <CustomParameters>

diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.vstemplate b/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.vstemplate
@@ -21,7 +21,7 @@
  <LanguageTag>XAML</LanguageTag>
  <PlatformTag>windows</PlatformTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
- <ProjectTypeTag>WinUI</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent PreferedSolutionConfiguration="Debug|x86">
  <CustomParameters>

diff --git a/...ktop/CSharp/SingleProjectPackagedApp/WinUI.Desktop.Cs.SingleProjectPackagedApp.vstemplate b/...ktop/CSharp/SingleProjectPackagedApp/WinUI.Desktop.Cs.SingleProjectPackagedApp.vstemplate
@@ -21,7 +21,7 @@
  <LanguageTag>XAML</LanguageTag>
  <PlatformTag>windows</PlatformTag>
  <ProjectTypeTag>desktop</ProjectTypeTag>
- <ProjectTypeTag>WinUI</ProjectTypeTag>
+ <ProjectTypeTag>winui</ProjectTypeTag>
  </TemplateData>
  <TemplateContent PreferedSolutionConfiguration="Debug|x86">
  <CustomParameters>