From b446e72da2312bc0dc34419cafeebbf14afdd0d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaigan=C3=A9sh=20Kumaran?= Date: Tue, 9 May 2023 20:25:38 +0530 Subject: [PATCH 1/7] Improved C++ project templates --- .../WindowsAppSDK.Cpp.Extension.Dev16.csproj | 6 +- .../WindowsAppSDK.Cpp.Extension.Dev17.csproj | 6 +- .../CppWinRT/BlankWindow/BlankWindow.cpp | 24 -- .../CppWinRT/BlankWindow/BlankWindow.h | 14 +- .../CppWinRT/BlankWindow/BlankWindow.idl | 4 - .../CppWinRT/BlankWindow/BlankWindow.xaml | 10 +- .../Neutral/CppWinRT/BlankPage/BlankPage.cpp | 24 -- .../Neutral/CppWinRT/BlankPage/BlankPage.h | 14 +- .../Neutral/CppWinRT/BlankPage/BlankPage.idl | 4 - .../Neutral/CppWinRT/BlankPage/BlankPage.xaml | 6 +- .../TemplatedControl/TemplatedControl.cpp | 17 +- .../TemplatedControl/TemplatedControl.h | 9 - .../TemplatedControl/TemplatedControl.idl | 4 - .../CppWinRT/UserControl/UserControl.h | 17 +- .../CppWinRT/UserControl/UserControl.idl | 4 - .../CppWinRT/UserControl/UserControl.xaml | 10 +- .../CppWinRT/SingleProjectPackagedApp/App.cpp | 56 +++-- .../CppWinRT/SingleProjectPackagedApp/App.h | 6 +- .../CppWinRT/SingleProjectPackagedApp/App.idl | 6 - .../SingleProjectPackagedApp/MainWindow.cpp | 22 +- .../SingleProjectPackagedApp/MainWindow.h | 14 +- .../SingleProjectPackagedApp/MainWindow.idl | 4 - ...p.CppWinRT.SingleProjectPackagedApp.csproj | 1 - .../CppWinRT/SingleProjectPackagedApp/pch.cpp | 3 - .../CppWinRT/SingleProjectPackagedApp/pch.h | 4 +- .../CppWinRT/RuntimeComponent/Class.cpp | 14 -- .../Neutral/CppWinRT/RuntimeComponent/Class.h | 6 - .../CppWinRT/RuntimeComponent/Class.idl | 4 - .../RuntimeComponent/ProjectTemplate.vcxproj | 2 +- ....Desktop.CppWinRT.RuntimeComponent.csproj} | 0 ...nUI.Desktop.CppWinRT.RuntimeComponent.ico} | Bin ...nUI.Desktop.CppWinRT.RuntimeComponent.png} | Bin ...ktop.CppWinRT.RuntimeComponent.vstemplate} | 10 +- .../Neutral/CppWinRT/RuntimeComponent/pch.cpp | 3 - .../Neutral/CppWinRT/RuntimeComponent/pch.h | 16 +- dev/VSIX/WindowsAppSDK.Extension.sln | 206 +++++++++++++++++- 36 files changed, 286 insertions(+), 264 deletions(-) delete mode 100644 dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.idl rename dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/{WinUI.Neutral.CppWinRT.RuntimeComponent.csproj => WinUI.Desktop.CppWinRT.RuntimeComponent.csproj} (100%) rename dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/{WinUI.Neutral.CppWinRT.RuntimeComponent.ico => WinUI.Desktop.CppWinRT.RuntimeComponent.ico} (100%) rename dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/{WinUI.Neutral.CppWinRT.RuntimeComponent.png => WinUI.Desktop.CppWinRT.RuntimeComponent.png} (100%) rename dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/{WinUI.Neutral.CppWinRT.RuntimeComponent.vstemplate => WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate} (94%) diff --git a/dev/VSIX/Extension/Cpp/Dev16/WindowsAppSDK.Cpp.Extension.Dev16.csproj b/dev/VSIX/Extension/Cpp/Dev16/WindowsAppSDK.Cpp.Extension.Dev16.csproj index 40ccbd05c1..4ba5ef099a 100644 --- a/dev/VSIX/Extension/Cpp/Dev16/WindowsAppSDK.Cpp.Extension.Dev16.csproj +++ b/dev/VSIX/Extension/Cpp/Dev16/WindowsAppSDK.Cpp.Extension.Dev16.csproj @@ -1,4 +1,4 @@ - + 2.0 @@ -129,9 +129,9 @@ false TemplateProjectOutputGroup%3b - + {FD33E535-127D-48AC-8788-0F61FA2A251C} - WinUI.Neutral.CppWinRT.RuntimeComponent + WinUI.Desktop.CppWinRT.RuntimeComponent ProjectTemplates false TemplateProjectOutputGroup%3b diff --git a/dev/VSIX/Extension/Cpp/Dev17/WindowsAppSDK.Cpp.Extension.Dev17.csproj b/dev/VSIX/Extension/Cpp/Dev17/WindowsAppSDK.Cpp.Extension.Dev17.csproj index b6b7843ac3..6e76be4888 100644 --- a/dev/VSIX/Extension/Cpp/Dev17/WindowsAppSDK.Cpp.Extension.Dev17.csproj +++ b/dev/VSIX/Extension/Cpp/Dev17/WindowsAppSDK.Cpp.Extension.Dev17.csproj @@ -1,4 +1,4 @@ - + 2.0 @@ -132,9 +132,9 @@ false TemplateProjectOutputGroup%3b - + {FD33E535-127D-48AC-8788-0F61FA2A251C} - WinUI.Neutral.CppWinRT.RuntimeComponent + WinUI.Desktop.CppWinRT.RuntimeComponent ProjectTemplates false TemplateProjectOutputGroup%3b diff --git a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp index b9465ed819..4580879576 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp +++ b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp @@ -1,11 +1,6 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - #include "pch.h" #include "$safeitemname$.xaml.h" -#if __has_include("$safeitemname$.g.cpp") #include "$safeitemname$.g.cpp" -#endif using namespace winrt; using namespace Microsoft::UI::Xaml; @@ -15,23 +10,4 @@ using namespace Microsoft::UI::Xaml; namespace winrt::$rootnamespace$::implementation { - $safeitemname$::$safeitemname$() - { - InitializeComponent(); - } - - int32_t $safeitemname$::MyProperty() - { - throw hresult_not_implemented(); - } - - void $safeitemname$::MyProperty(int32_t /* value */) - { - throw hresult_not_implemented(); - } - - void $safeitemname$::myButton_Click(IInspectable const&, RoutedEventArgs const&) - { - myButton().Content(box_value(L"Clicked")); - } } diff --git a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.h b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.h index 298749282d..abdb5701a0 100644 --- 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,11 @@ namespace winrt::$rootnamespace$::implementation { struct $safeitemname$ : $safeitemname$T<$safeitemname$> { - $safeitemname$(); - - int32_t MyProperty(); - void MyProperty(int32_t value); - - void myButton_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args); + $safeitemname$() + { + // Xaml objects should not call InitializeComponent during construction. + // See https://github.com/microsoft/cppwinrt/tree/master/nuget#initializecomponent + } }; } diff --git a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.idl b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.idl index f830b44f06..78de823e6d 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.idl +++ b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.idl @@ -1,12 +1,8 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - namespace $rootnamespace$ { [default_interface] runtimeclass $safeitemname$ : Microsoft.UI.Xaml.Window { $safeitemname$(); - Int32 MyProperty; } } diff --git a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.xaml b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.xaml index 06dba11402..f1fb4bdd49 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.xaml +++ b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.xaml @@ -1,14 +1,14 @@ - + - - - + + + diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.cpp b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.cpp index b9465ed819..4580879576 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.cpp +++ b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.cpp @@ -1,11 +1,6 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - #include "pch.h" #include "$safeitemname$.xaml.h" -#if __has_include("$safeitemname$.g.cpp") #include "$safeitemname$.g.cpp" -#endif using namespace winrt; using namespace Microsoft::UI::Xaml; @@ -15,23 +10,4 @@ using namespace Microsoft::UI::Xaml; namespace winrt::$rootnamespace$::implementation { - $safeitemname$::$safeitemname$() - { - InitializeComponent(); - } - - int32_t $safeitemname$::MyProperty() - { - throw hresult_not_implemented(); - } - - void $safeitemname$::MyProperty(int32_t /* value */) - { - throw hresult_not_implemented(); - } - - void $safeitemname$::myButton_Click(IInspectable const&, RoutedEventArgs const&) - { - myButton().Content(box_value(L"Clicked")); - } } diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.h b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.h index 298749282d..abdb5701a0 100644 --- 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,11 @@ namespace winrt::$rootnamespace$::implementation { struct $safeitemname$ : $safeitemname$T<$safeitemname$> { - $safeitemname$(); - - int32_t MyProperty(); - void MyProperty(int32_t value); - - void myButton_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args); + $safeitemname$() + { + // Xaml objects should not call InitializeComponent during construction. + // See https://github.com/microsoft/cppwinrt/tree/master/nuget#initializecomponent + } }; } diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.idl b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.idl index ee72b5f377..b63c4e6aba 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.idl +++ b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.idl @@ -1,12 +1,8 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - namespace $rootnamespace$ { [default_interface] runtimeclass $safeitemname$ : Microsoft.UI.Xaml.Controls.Page { $safeitemname$(); - Int32 MyProperty; } } diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.xaml b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.xaml index 6b7755e3c1..3646967ba6 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.xaml +++ b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.xaml @@ -8,7 +8,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> - - - + + + diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.cpp b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.cpp index f885007964..f5272cf861 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.cpp +++ b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.cpp @@ -1,11 +1,6 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - #include "pch.h" #include "$safeitemname$.h" -#if __has_include("$safeitemname$.g.cpp") #include "$safeitemname$.g.cpp" -#endif using namespace winrt; using namespace Microsoft::UI::Xaml; @@ -17,16 +12,6 @@ namespace winrt::$rootnamespace$::implementation { $safeitemname$::$safeitemname$() { - DefaultStyleKey(winrt::box_value(L"$rootnamespace$.$safeitemname$")); - } - - int32_t $safeitemname$::MyProperty() - { - throw hresult_not_implemented(); - } - - void $safeitemname$::MyProperty(int32_t /* value */) - { - throw hresult_not_implemented(); + DefaultStyleKey(winrt::box_value(xaml_typename())); } } diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.h b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.h index 5b2c7438a5..d60664dc45 100644 --- 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 @@ -13,9 +7,6 @@ namespace winrt::$rootnamespace$::implementation struct $safeitemname$ : $safeitemname$T<$safeitemname$> { $safeitemname$(); - - int32_t MyProperty(); - void MyProperty(int32_t value); }; } diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.idl b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.idl index 32b2c2cc02..7686d6c876 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.idl +++ b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/TemplatedControl/TemplatedControl.idl @@ -1,12 +1,8 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - namespace $rootnamespace$ { [default_interface] runtimeclass $safeitemname$ : Microsoft.UI.Xaml.Controls.Control { $safeitemname$(); - Int32 MyProperty; } } diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.h b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.h index 3ce4f4a724..abdb5701a0 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.h +++ b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.h @@ -1,23 +1,16 @@ -// 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$(); - - int32_t MyProperty(); - void MyProperty(int32_t value); - - void myButton_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args); + $safeitemname$() + { + // Xaml objects should not call InitializeComponent during construction. + // See https://github.com/microsoft/cppwinrt/tree/master/nuget#initializecomponent + } }; } diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.idl b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.idl index 1ce0f37546..31a8caa01d 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.idl +++ b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.idl @@ -1,12 +1,8 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - namespace $rootnamespace$ { [default_interface] runtimeclass $safeitemname$ : Microsoft.UI.Xaml.Controls.UserControl { $safeitemname$(); - Int32 MyProperty; } } diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.xaml b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.xaml index 64b205a7b8..c36f09f3b7 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.xaml +++ b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.xaml @@ -1,14 +1,14 @@ - + - - - + + + diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp index cd08294f06..cfa5121ae3 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp @@ -1,48 +1,42 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - #include "pch.h" - #include "App.xaml.h" #include "MainWindow.xaml.h" using namespace winrt; -using namespace Windows::Foundation; using namespace Microsoft::UI::Xaml; -using namespace Microsoft::UI::Xaml::Controls; -using namespace Microsoft::UI::Xaml::Navigation; -using namespace $safeprojectname$; -using namespace $safeprojectname$::implementation; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -/// -/// Initializes the singleton application object. This is the first line of authored code -/// executed, and as such is the logical equivalent of main() or WinMain(). -/// -App::App() +namespace $safeprojectname$::implementation { - InitializeComponent(); + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + App::App() + { + InitializeComponent(); #if defined _DEBUG && !defined DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION - UnhandledException([this](IInspectable const&, UnhandledExceptionEventArgs const& e) - { - if (IsDebuggerPresent()) + UnhandledException([this](IInspectable const&, UnhandledExceptionEventArgs const& e) { - auto errorMessage = e.Message(); - __debugbreak(); - } - }); + if (IsDebuggerPresent()) + { + auto errorMessage = e.Message(); + __debugbreak(); + } + }); #endif -} + } -/// -/// Invoked when the application is launched. -/// -/// Details about the launch request and process. -void App::OnLaunched(LaunchActivatedEventArgs const&) -{ - window = make(); - window.Activate(); + /// + /// Invoked when the application is launched. + /// + /// Details about the launch request and process. + void App::OnLaunched(LaunchActivatedEventArgs const&) + { + window = make(); + window.Activate(); + } } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.h b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.h index 5b835dda35..f811d0f001 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.h +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.h @@ -1,8 +1,4 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - #pragma once - #include "App.xaml.g.h" namespace winrt::$safeprojectname$::implementation @@ -14,6 +10,6 @@ namespace winrt::$safeprojectname$::implementation void OnLaunched(Microsoft::UI::Xaml::LaunchActivatedEventArgs const&); private: - winrt::Microsoft::UI::Xaml::Window window{ nullptr }; + winrt::Microsoft::UI::Xaml::Window m_window{ nullptr }; }; } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.idl b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.idl deleted file mode 100644 index 55ac0e3690..0000000000 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.idl +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - -namespace $safeprojectname$ -{ -} diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp index 746fe412aa..275e4a85e1 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp @@ -1,11 +1,6 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - #include "pch.h" #include "MainWindow.xaml.h" -#if __has_include("MainWindow.g.cpp") #include "MainWindow.g.cpp" -#endif using namespace winrt; using namespace Microsoft::UI::Xaml; @@ -15,23 +10,8 @@ using namespace Microsoft::UI::Xaml; namespace winrt::$safeprojectname$::implementation { - MainWindow::MainWindow() - { - InitializeComponent(); - } - - int32_t MainWindow::MyProperty() - { - throw hresult_not_implemented(); - } - - void MainWindow::MyProperty(int32_t /* value */) - { - throw hresult_not_implemented(); - } - void MainWindow::myButton_Click(IInspectable const&, RoutedEventArgs const&) { - myButton().Content(box_value(L"Clicked")); + myButton.Content(box_value(L"Clicked")); } } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.h b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.h index 6bc83fa80a..57431a82dd 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.h +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.h @@ -1,6 +1,3 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - #pragma once #include "MainWindow.g.h" @@ -9,12 +6,13 @@ namespace winrt::$safeprojectname$::implementation { struct MainWindow : MainWindowT { - MainWindow(); - - int32_t MyProperty(); - void MyProperty(int32_t value); + MainWindow() + { + // Xaml objects should not call InitializeComponent during construction. + // See https://github.com/microsoft/cppwinrt/tree/master/nuget#initializecomponent + } - 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& e); }; } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.idl b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.idl index 5d81f19d36..e795397469 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.idl +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.idl @@ -1,12 +1,8 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - namespace $safeprojectname$ { [default_interface] runtimeclass MainWindow : Microsoft.UI.Xaml.Window { MainWindow(); - Int32 MyProperty; } } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/WinUI.Desktop.CppWinRT.SingleProjectPackagedApp.csproj b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/WinUI.Desktop.CppWinRT.SingleProjectPackagedApp.csproj index 9166a5b2f3..f591427e4d 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/WinUI.Desktop.CppWinRT.SingleProjectPackagedApp.csproj +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/WinUI.Desktop.CppWinRT.SingleProjectPackagedApp.csproj @@ -56,7 +56,6 @@ - diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/pch.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/pch.cpp index 0850baca11..1d9f38c57d 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/pch.cpp +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/pch.cpp @@ -1,4 +1 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - #include "pch.h" diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/pch.h b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/pch.h index 170dd76c69..1533d96bb2 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/pch.h +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/pch.h @@ -1,6 +1,3 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - #pragma once #include #include @@ -14,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.cpp b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.cpp index 8b0049de60..fb75c9db2f 100644 --- a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.cpp +++ b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.cpp @@ -1,24 +1,10 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - #include "pch.h" #include "Class.h" -#if __has_include("Class.g.cpp") #include "Class.g.cpp" -#endif // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. namespace winrt::$safeprojectname$::implementation { - int32_t Class::MyProperty() - { - throw hresult_not_implemented(); - } - - void Class::MyProperty(int32_t /* value */) - { - throw hresult_not_implemented(); - } } diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.h b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.h index b74291f717..7de42eb881 100644 --- a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.h +++ b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.h @@ -1,6 +1,3 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - #pragma once #include "Class.g.h" @@ -10,9 +7,6 @@ namespace winrt::$safeprojectname$::implementation struct Class : ClassT { Class() = default; - - int32_t MyProperty(); - void MyProperty(int32_t value); }; } diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.idl b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.idl index 2d4c82c3a8..96464ea0b4 100644 --- a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.idl +++ b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.idl @@ -1,12 +1,8 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - namespace $safeprojectname$ { [default_interface] runtimeclass Class { Class(); - Int32 MyProperty; } } diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj index df8226c1fe..1c5ae504ca 100644 --- a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj +++ b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj @@ -9,7 +9,7 @@ $safeprojectname$ $currentuiculturename$ 16.0 - true + false Windows Store 10.0 $targetplatformversion$ diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Neutral.CppWinRT.RuntimeComponent.csproj b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.csproj similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Neutral.CppWinRT.RuntimeComponent.csproj rename to dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.csproj diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Neutral.CppWinRT.RuntimeComponent.ico b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.ico similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Neutral.CppWinRT.RuntimeComponent.ico rename to dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.ico diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Neutral.CppWinRT.RuntimeComponent.png b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.png similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Neutral.CppWinRT.RuntimeComponent.png rename to dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.png diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Neutral.CppWinRT.RuntimeComponent.vstemplate b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate similarity index 94% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Neutral.CppWinRT.RuntimeComponent.vstemplate rename to dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate index c7c3eb3dca..7ffb20ddca 100644 --- a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Neutral.CppWinRT.RuntimeComponent.vstemplate +++ b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate @@ -1,10 +1,10 @@ - + - WinUI.Neutral.CppWinRT.RuntimeComponent.ico - Microsoft.WinUI.Neutral.CppWinRT.RuntimeComponent + WinUI.Desktop.CppWinRT.RuntimeComponent.ico + Microsoft.WinUI.Desktopy.CppWinRT.RuntimeComponent VC true RuntimeComponent @@ -14,7 +14,7 @@ 2 Windows true - WinUI.Neutral.CppWinRT.RuntimeComponent.png + WinUI.Desktop.CppWinRT.RuntimeComponent.png blend true cpp @@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/pch.cpp b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/pch.cpp index 0850baca11..1d9f38c57d 100644 --- a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/pch.cpp +++ b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/pch.cpp @@ -1,4 +1 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - #include "pch.h" diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/pch.h b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/pch.h index 510ce87ab0..1533d96bb2 100644 --- a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/pch.h +++ b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/pch.h @@ -1,16 +1,26 @@ -// Copyright (c) Microsoft Corporation and Contributors. -// Licensed under the MIT License. - #pragma once +#include #include +#include +#include + +// Undefine GetCurrentTime macro to prevent +// conflict with Storyboard::GetCurrentTime +#undef GetCurrentTime + #include #include +#include +#include #include #include #include #include #include +#include #include +#include #include +#include #include #include diff --git a/dev/VSIX/WindowsAppSDK.Extension.sln b/dev/VSIX/WindowsAppSDK.Extension.sln index 902a2e6ccd..3dbdafccd4 100644 --- a/dev/VSIX/WindowsAppSDK.Extension.sln +++ b/dev/VSIX/WindowsAppSDK.Extension.sln @@ -66,11 +66,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.Desktop.Cs.PackagedAp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.Desktop.CppWinRT.PackagedApp", "ProjectTemplates\Desktop\CppWinRT\PackagedApp\WinUI.Desktop.CppWinRT.PackagedApp.csproj", "{80195619-D4CF-4287-BA59-08077486BE1C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Neutral", "Neutral", "{50DEEF87-BC2F-4B45-B97D-B83135F12786}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CppWinRT", "CppWinRT", "{4D266288-D49F-46D4-90E0-667E81D6A433}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.Neutral.CppWinRT.RuntimeComponent", "ProjectTemplates\Neutral\CppWinRT\RuntimeComponent\WinUI.Neutral.CppWinRT.RuntimeComponent.csproj", "{FD33E535-127D-48AC-8788-0F61FA2A251C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.Desktop.CppWinRT.RuntimeComponent", "ProjectTemplates\Neutral\CppWinRT\RuntimeComponent\WinUI.Desktop.CppWinRT.RuntimeComponent.csproj", "{FD33E535-127D-48AC-8788-0F61FA2A251C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.Desktop.Cs.SingleProjectPackagedApp", "ProjectTemplates\Desktop\CSharp\SingleProjectPackagedApp\WinUI.Desktop.Cs.SingleProjectPackagedApp.csproj", "{D9C038B7-6A62-4945-A030-4AC7597F53CA}" EndProject @@ -87,187 +83,383 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|arm64 = Debug|arm64 Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|arm64 = Release|arm64 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Debug|arm64.ActiveCfg = Debug|arm64 + {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Debug|arm64.Build.0 = Debug|arm64 {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Debug|x64.ActiveCfg = Debug|Any CPU {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Debug|x64.Build.0 = Debug|Any CPU + {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Debug|x86.ActiveCfg = Debug|x86 + {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Debug|x86.Build.0 = Debug|x86 {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Release|Any CPU.ActiveCfg = Release|Any CPU {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Release|Any CPU.Build.0 = Release|Any CPU + {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Release|arm64.ActiveCfg = Release|arm64 + {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Release|arm64.Build.0 = Release|arm64 {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Release|x64.ActiveCfg = Release|x64 {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Release|x64.Build.0 = Release|x64 + {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Release|x86.ActiveCfg = Release|x86 + {2D9BD73D-5A5E-4113-AEA9-53D059A79A41}.Release|x86.Build.0 = Release|x86 {F19716E6-41A1-4320-A819-288172CE161C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F19716E6-41A1-4320-A819-288172CE161C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F19716E6-41A1-4320-A819-288172CE161C}.Debug|arm64.ActiveCfg = Debug|arm64 + {F19716E6-41A1-4320-A819-288172CE161C}.Debug|arm64.Build.0 = Debug|arm64 {F19716E6-41A1-4320-A819-288172CE161C}.Debug|x64.ActiveCfg = Debug|Any CPU {F19716E6-41A1-4320-A819-288172CE161C}.Debug|x64.Build.0 = Debug|Any CPU + {F19716E6-41A1-4320-A819-288172CE161C}.Debug|x86.ActiveCfg = Debug|x86 + {F19716E6-41A1-4320-A819-288172CE161C}.Debug|x86.Build.0 = Debug|x86 {F19716E6-41A1-4320-A819-288172CE161C}.Release|Any CPU.ActiveCfg = Release|Any CPU {F19716E6-41A1-4320-A819-288172CE161C}.Release|Any CPU.Build.0 = Release|Any CPU + {F19716E6-41A1-4320-A819-288172CE161C}.Release|arm64.ActiveCfg = Release|arm64 + {F19716E6-41A1-4320-A819-288172CE161C}.Release|arm64.Build.0 = Release|arm64 {F19716E6-41A1-4320-A819-288172CE161C}.Release|x64.ActiveCfg = Release|x64 {F19716E6-41A1-4320-A819-288172CE161C}.Release|x64.Build.0 = Release|x64 + {F19716E6-41A1-4320-A819-288172CE161C}.Release|x86.ActiveCfg = Release|x86 + {F19716E6-41A1-4320-A819-288172CE161C}.Release|x86.Build.0 = Release|x86 {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Debug|arm64.ActiveCfg = Debug|arm64 + {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Debug|arm64.Build.0 = Debug|arm64 {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Debug|x64.ActiveCfg = Debug|Any CPU {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Debug|x64.Build.0 = Debug|Any CPU + {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Debug|x86.ActiveCfg = Debug|x86 + {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Debug|x86.Build.0 = Debug|x86 {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Release|Any CPU.Build.0 = Release|Any CPU + {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Release|arm64.ActiveCfg = Release|arm64 + {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Release|arm64.Build.0 = Release|arm64 {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Release|x64.ActiveCfg = Release|x64 {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Release|x64.Build.0 = Release|x64 + {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Release|x86.ActiveCfg = Release|x86 + {1E071372-7CB7-47BC-9BA2-8235F9BB09C8}.Release|x86.Build.0 = Release|x86 {99C19C7C-6472-44F6-89E2-389AB6534F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {99C19C7C-6472-44F6-89E2-389AB6534F42}.Debug|Any CPU.Build.0 = Debug|Any CPU + {99C19C7C-6472-44F6-89E2-389AB6534F42}.Debug|arm64.ActiveCfg = Debug|arm64 + {99C19C7C-6472-44F6-89E2-389AB6534F42}.Debug|arm64.Build.0 = Debug|arm64 {99C19C7C-6472-44F6-89E2-389AB6534F42}.Debug|x64.ActiveCfg = Debug|Any CPU {99C19C7C-6472-44F6-89E2-389AB6534F42}.Debug|x64.Build.0 = Debug|Any CPU + {99C19C7C-6472-44F6-89E2-389AB6534F42}.Debug|x86.ActiveCfg = Debug|x86 + {99C19C7C-6472-44F6-89E2-389AB6534F42}.Debug|x86.Build.0 = Debug|x86 {99C19C7C-6472-44F6-89E2-389AB6534F42}.Release|Any CPU.ActiveCfg = Release|Any CPU {99C19C7C-6472-44F6-89E2-389AB6534F42}.Release|Any CPU.Build.0 = Release|Any CPU + {99C19C7C-6472-44F6-89E2-389AB6534F42}.Release|arm64.ActiveCfg = Release|arm64 + {99C19C7C-6472-44F6-89E2-389AB6534F42}.Release|arm64.Build.0 = Release|arm64 {99C19C7C-6472-44F6-89E2-389AB6534F42}.Release|x64.ActiveCfg = Release|x64 {99C19C7C-6472-44F6-89E2-389AB6534F42}.Release|x64.Build.0 = Release|x64 + {99C19C7C-6472-44F6-89E2-389AB6534F42}.Release|x86.ActiveCfg = Release|x86 + {99C19C7C-6472-44F6-89E2-389AB6534F42}.Release|x86.Build.0 = Release|x86 {2C5873D8-E908-41F2-B861-80F95280FBCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2C5873D8-E908-41F2-B861-80F95280FBCA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2C5873D8-E908-41F2-B861-80F95280FBCA}.Debug|arm64.ActiveCfg = Debug|arm64 + {2C5873D8-E908-41F2-B861-80F95280FBCA}.Debug|arm64.Build.0 = Debug|arm64 {2C5873D8-E908-41F2-B861-80F95280FBCA}.Debug|x64.ActiveCfg = Debug|Any CPU {2C5873D8-E908-41F2-B861-80F95280FBCA}.Debug|x64.Build.0 = Debug|Any CPU + {2C5873D8-E908-41F2-B861-80F95280FBCA}.Debug|x86.ActiveCfg = Debug|x86 + {2C5873D8-E908-41F2-B861-80F95280FBCA}.Debug|x86.Build.0 = Debug|x86 {2C5873D8-E908-41F2-B861-80F95280FBCA}.Release|Any CPU.ActiveCfg = Release|Any CPU {2C5873D8-E908-41F2-B861-80F95280FBCA}.Release|Any CPU.Build.0 = Release|Any CPU + {2C5873D8-E908-41F2-B861-80F95280FBCA}.Release|arm64.ActiveCfg = Release|arm64 + {2C5873D8-E908-41F2-B861-80F95280FBCA}.Release|arm64.Build.0 = Release|arm64 {2C5873D8-E908-41F2-B861-80F95280FBCA}.Release|x64.ActiveCfg = Release|x64 {2C5873D8-E908-41F2-B861-80F95280FBCA}.Release|x64.Build.0 = Release|x64 + {2C5873D8-E908-41F2-B861-80F95280FBCA}.Release|x86.ActiveCfg = Release|x86 + {2C5873D8-E908-41F2-B861-80F95280FBCA}.Release|x86.Build.0 = Release|x86 {81221BE8-00A2-4841-B62C-9E751C298066}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {81221BE8-00A2-4841-B62C-9E751C298066}.Debug|Any CPU.Build.0 = Debug|Any CPU + {81221BE8-00A2-4841-B62C-9E751C298066}.Debug|arm64.ActiveCfg = Debug|arm64 + {81221BE8-00A2-4841-B62C-9E751C298066}.Debug|arm64.Build.0 = Debug|arm64 {81221BE8-00A2-4841-B62C-9E751C298066}.Debug|x64.ActiveCfg = Debug|Any CPU {81221BE8-00A2-4841-B62C-9E751C298066}.Debug|x64.Build.0 = Debug|Any CPU + {81221BE8-00A2-4841-B62C-9E751C298066}.Debug|x86.ActiveCfg = Debug|x86 + {81221BE8-00A2-4841-B62C-9E751C298066}.Debug|x86.Build.0 = Debug|x86 {81221BE8-00A2-4841-B62C-9E751C298066}.Release|Any CPU.ActiveCfg = Release|Any CPU {81221BE8-00A2-4841-B62C-9E751C298066}.Release|Any CPU.Build.0 = Release|Any CPU + {81221BE8-00A2-4841-B62C-9E751C298066}.Release|arm64.ActiveCfg = Release|arm64 + {81221BE8-00A2-4841-B62C-9E751C298066}.Release|arm64.Build.0 = Release|arm64 {81221BE8-00A2-4841-B62C-9E751C298066}.Release|x64.ActiveCfg = Release|x64 {81221BE8-00A2-4841-B62C-9E751C298066}.Release|x64.Build.0 = Release|x64 + {81221BE8-00A2-4841-B62C-9E751C298066}.Release|x86.ActiveCfg = Release|x86 + {81221BE8-00A2-4841-B62C-9E751C298066}.Release|x86.Build.0 = Release|x86 {761212D7-B5D2-4629-98C8-88F6A24982BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {761212D7-B5D2-4629-98C8-88F6A24982BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {761212D7-B5D2-4629-98C8-88F6A24982BB}.Debug|arm64.ActiveCfg = Debug|arm64 + {761212D7-B5D2-4629-98C8-88F6A24982BB}.Debug|arm64.Build.0 = Debug|arm64 {761212D7-B5D2-4629-98C8-88F6A24982BB}.Debug|x64.ActiveCfg = Debug|Any CPU {761212D7-B5D2-4629-98C8-88F6A24982BB}.Debug|x64.Build.0 = Debug|Any CPU + {761212D7-B5D2-4629-98C8-88F6A24982BB}.Debug|x86.ActiveCfg = Debug|x86 + {761212D7-B5D2-4629-98C8-88F6A24982BB}.Debug|x86.Build.0 = Debug|x86 {761212D7-B5D2-4629-98C8-88F6A24982BB}.Release|Any CPU.ActiveCfg = Release|Any CPU {761212D7-B5D2-4629-98C8-88F6A24982BB}.Release|Any CPU.Build.0 = Release|Any CPU + {761212D7-B5D2-4629-98C8-88F6A24982BB}.Release|arm64.ActiveCfg = Release|arm64 + {761212D7-B5D2-4629-98C8-88F6A24982BB}.Release|arm64.Build.0 = Release|arm64 {761212D7-B5D2-4629-98C8-88F6A24982BB}.Release|x64.ActiveCfg = Release|x64 {761212D7-B5D2-4629-98C8-88F6A24982BB}.Release|x64.Build.0 = Release|x64 + {761212D7-B5D2-4629-98C8-88F6A24982BB}.Release|x86.ActiveCfg = Release|x86 + {761212D7-B5D2-4629-98C8-88F6A24982BB}.Release|x86.Build.0 = Release|x86 {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Debug|arm64.ActiveCfg = Debug|arm64 + {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Debug|arm64.Build.0 = Debug|arm64 {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Debug|x64.ActiveCfg = Debug|Any CPU {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Debug|x64.Build.0 = Debug|Any CPU + {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Debug|x86.ActiveCfg = Debug|x86 + {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Debug|x86.Build.0 = Debug|x86 {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Release|Any CPU.ActiveCfg = Release|Any CPU {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Release|Any CPU.Build.0 = Release|Any CPU + {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Release|arm64.ActiveCfg = Release|arm64 + {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Release|arm64.Build.0 = Release|arm64 {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Release|x64.ActiveCfg = Release|x64 {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Release|x64.Build.0 = Release|x64 + {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Release|x86.ActiveCfg = Release|x86 + {9DE11F03-73A8-4DCA-88B3-1623A718DFD1}.Release|x86.Build.0 = Release|x86 {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Debug|arm64.ActiveCfg = Debug|arm64 + {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Debug|arm64.Build.0 = Debug|arm64 {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Debug|x64.ActiveCfg = Debug|Any CPU {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Debug|x64.Build.0 = Debug|Any CPU + {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Debug|x86.ActiveCfg = Debug|x86 + {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Debug|x86.Build.0 = Debug|x86 {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Release|Any CPU.ActiveCfg = Release|Any CPU {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Release|Any CPU.Build.0 = Release|Any CPU + {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Release|arm64.ActiveCfg = Release|arm64 + {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Release|arm64.Build.0 = Release|arm64 {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Release|x64.ActiveCfg = Release|x64 {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Release|x64.Build.0 = Release|x64 + {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Release|x86.ActiveCfg = Release|x86 + {3F3F0E7F-594F-4006-A3EF-5E5624EF147C}.Release|x86.Build.0 = Release|x86 {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Debug|arm64.ActiveCfg = Debug|arm64 + {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Debug|arm64.Build.0 = Debug|arm64 {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Debug|x64.ActiveCfg = Debug|Any CPU {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Debug|x64.Build.0 = Debug|Any CPU + {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Debug|x86.ActiveCfg = Debug|x86 + {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Debug|x86.Build.0 = Debug|x86 {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Release|Any CPU.ActiveCfg = Release|Any CPU {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Release|Any CPU.Build.0 = Release|Any CPU + {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Release|arm64.ActiveCfg = Release|arm64 + {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Release|arm64.Build.0 = Release|arm64 {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Release|x64.ActiveCfg = Release|x64 {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Release|x64.Build.0 = Release|x64 + {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Release|x86.ActiveCfg = Release|x86 + {C8DA9E71-2F7F-4E7C-8DC7-766FF0F67196}.Release|x86.Build.0 = Release|x86 {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Debug|arm64.ActiveCfg = Debug|arm64 + {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Debug|arm64.Build.0 = Debug|arm64 {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Debug|x64.ActiveCfg = Debug|Any CPU {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Debug|x64.Build.0 = Debug|Any CPU + {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Debug|x86.ActiveCfg = Debug|x86 + {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Debug|x86.Build.0 = Debug|x86 {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Release|Any CPU.ActiveCfg = Release|Any CPU {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Release|Any CPU.Build.0 = Release|Any CPU + {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Release|arm64.ActiveCfg = Release|arm64 + {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Release|arm64.Build.0 = Release|arm64 {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Release|x64.ActiveCfg = Release|x64 {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Release|x64.Build.0 = Release|x64 + {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Release|x86.ActiveCfg = Release|x86 + {30AB0000-148D-48BE-85DB-70D9F7BDFEC5}.Release|x86.Build.0 = Release|x86 {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Debug|arm64.ActiveCfg = Debug|arm64 + {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Debug|arm64.Build.0 = Debug|arm64 {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Debug|x64.ActiveCfg = Debug|Any CPU {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Debug|x64.Build.0 = Debug|Any CPU + {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Debug|x86.ActiveCfg = Debug|x86 + {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Debug|x86.Build.0 = Debug|x86 {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Release|Any CPU.ActiveCfg = Release|Any CPU {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Release|Any CPU.Build.0 = Release|Any CPU + {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Release|arm64.ActiveCfg = Release|arm64 + {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Release|arm64.Build.0 = Release|arm64 {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Release|x64.ActiveCfg = Release|x64 {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Release|x64.Build.0 = Release|x64 + {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Release|x86.ActiveCfg = Release|x86 + {17320A27-C039-4973-95AA-ACB3EFA1D47E}.Release|x86.Build.0 = Release|x86 {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Debug|arm64.ActiveCfg = Debug|arm64 + {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Debug|arm64.Build.0 = Debug|arm64 {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Debug|x64.ActiveCfg = Debug|Any CPU {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Debug|x64.Build.0 = Debug|Any CPU + {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Debug|x86.ActiveCfg = Debug|x86 + {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Debug|x86.Build.0 = Debug|x86 {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Release|Any CPU.ActiveCfg = Release|Any CPU {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Release|Any CPU.Build.0 = Release|Any CPU + {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Release|arm64.ActiveCfg = Release|arm64 + {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Release|arm64.Build.0 = Release|arm64 {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Release|x64.ActiveCfg = Release|x64 {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Release|x64.Build.0 = Release|x64 + {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Release|x86.ActiveCfg = Release|x86 + {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Release|x86.Build.0 = Release|x86 {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Debug|arm64.ActiveCfg = Debug|arm64 + {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Debug|arm64.Build.0 = Debug|arm64 {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Debug|x64.ActiveCfg = Debug|Any CPU {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Debug|x64.Build.0 = Debug|Any CPU + {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Debug|x86.ActiveCfg = Debug|x86 + {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Debug|x86.Build.0 = Debug|x86 {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Release|Any CPU.ActiveCfg = Release|Any CPU {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Release|Any CPU.Build.0 = Release|Any CPU + {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Release|arm64.ActiveCfg = Release|arm64 + {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Release|arm64.Build.0 = Release|arm64 {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Release|x64.ActiveCfg = Release|x64 {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Release|x64.Build.0 = Release|x64 + {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Release|x86.ActiveCfg = Release|x86 + {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Release|x86.Build.0 = Release|x86 {80195619-D4CF-4287-BA59-08077486BE1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {80195619-D4CF-4287-BA59-08077486BE1C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {80195619-D4CF-4287-BA59-08077486BE1C}.Debug|arm64.ActiveCfg = Debug|arm64 + {80195619-D4CF-4287-BA59-08077486BE1C}.Debug|arm64.Build.0 = Debug|arm64 {80195619-D4CF-4287-BA59-08077486BE1C}.Debug|x64.ActiveCfg = Debug|Any CPU {80195619-D4CF-4287-BA59-08077486BE1C}.Debug|x64.Build.0 = Debug|Any CPU + {80195619-D4CF-4287-BA59-08077486BE1C}.Debug|x86.ActiveCfg = Debug|x86 + {80195619-D4CF-4287-BA59-08077486BE1C}.Debug|x86.Build.0 = Debug|x86 {80195619-D4CF-4287-BA59-08077486BE1C}.Release|Any CPU.ActiveCfg = Release|Any CPU {80195619-D4CF-4287-BA59-08077486BE1C}.Release|Any CPU.Build.0 = Release|Any CPU + {80195619-D4CF-4287-BA59-08077486BE1C}.Release|arm64.ActiveCfg = Release|arm64 + {80195619-D4CF-4287-BA59-08077486BE1C}.Release|arm64.Build.0 = Release|arm64 {80195619-D4CF-4287-BA59-08077486BE1C}.Release|x64.ActiveCfg = Release|x64 {80195619-D4CF-4287-BA59-08077486BE1C}.Release|x64.Build.0 = Release|x64 + {80195619-D4CF-4287-BA59-08077486BE1C}.Release|x86.ActiveCfg = Release|x86 + {80195619-D4CF-4287-BA59-08077486BE1C}.Release|x86.Build.0 = Release|x86 {FD33E535-127D-48AC-8788-0F61FA2A251C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FD33E535-127D-48AC-8788-0F61FA2A251C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD33E535-127D-48AC-8788-0F61FA2A251C}.Debug|arm64.ActiveCfg = Debug|arm64 + {FD33E535-127D-48AC-8788-0F61FA2A251C}.Debug|arm64.Build.0 = Debug|arm64 {FD33E535-127D-48AC-8788-0F61FA2A251C}.Debug|x64.ActiveCfg = Debug|Any CPU {FD33E535-127D-48AC-8788-0F61FA2A251C}.Debug|x64.Build.0 = Debug|Any CPU + {FD33E535-127D-48AC-8788-0F61FA2A251C}.Debug|x86.ActiveCfg = Debug|x86 + {FD33E535-127D-48AC-8788-0F61FA2A251C}.Debug|x86.Build.0 = Debug|x86 {FD33E535-127D-48AC-8788-0F61FA2A251C}.Release|Any CPU.ActiveCfg = Release|Any CPU {FD33E535-127D-48AC-8788-0F61FA2A251C}.Release|Any CPU.Build.0 = Release|Any CPU + {FD33E535-127D-48AC-8788-0F61FA2A251C}.Release|arm64.ActiveCfg = Release|arm64 + {FD33E535-127D-48AC-8788-0F61FA2A251C}.Release|arm64.Build.0 = Release|arm64 {FD33E535-127D-48AC-8788-0F61FA2A251C}.Release|x64.ActiveCfg = Release|x64 {FD33E535-127D-48AC-8788-0F61FA2A251C}.Release|x64.Build.0 = Release|x64 + {FD33E535-127D-48AC-8788-0F61FA2A251C}.Release|x86.ActiveCfg = Release|x86 + {FD33E535-127D-48AC-8788-0F61FA2A251C}.Release|x86.Build.0 = Release|x86 {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Debug|arm64.ActiveCfg = Debug|arm64 + {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Debug|arm64.Build.0 = Debug|arm64 {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Debug|x64.ActiveCfg = Debug|Any CPU {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Debug|x64.Build.0 = Debug|Any CPU + {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Debug|x86.ActiveCfg = Debug|x86 + {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Debug|x86.Build.0 = Debug|x86 {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Release|Any CPU.ActiveCfg = Release|Any CPU {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Release|Any CPU.Build.0 = Release|Any CPU + {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Release|arm64.ActiveCfg = Release|arm64 + {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Release|arm64.Build.0 = Release|arm64 {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Release|x64.ActiveCfg = Release|Any CPU {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Release|x64.Build.0 = Release|Any CPU + {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Release|x86.ActiveCfg = Release|x86 + {D9C038B7-6A62-4945-A030-4AC7597F53CA}.Release|x86.Build.0 = Release|x86 {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Debug|arm64.ActiveCfg = Debug|arm64 + {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Debug|arm64.Build.0 = Debug|arm64 {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Debug|x64.ActiveCfg = Debug|Any CPU {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Debug|x64.Build.0 = Debug|Any CPU + {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Debug|x86.ActiveCfg = Debug|x86 + {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Debug|x86.Build.0 = Debug|x86 {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Release|Any CPU.ActiveCfg = Release|Any CPU {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Release|Any CPU.Build.0 = Release|Any CPU + {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Release|arm64.ActiveCfg = Release|arm64 + {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Release|arm64.Build.0 = Release|arm64 {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Release|x64.ActiveCfg = Release|Any CPU {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Release|x64.Build.0 = Release|Any CPU + {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Release|x86.ActiveCfg = Release|x86 + {E54D1AD4-E935-479D-8A69-FC073E4DB33D}.Release|x86.Build.0 = Release|x86 {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Debug|arm64.ActiveCfg = Debug|Any CPU + {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Debug|arm64.Build.0 = Debug|Any CPU + {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Debug|arm64.Deploy.0 = Debug|Any CPU {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Debug|x64.ActiveCfg = Debug|Any CPU {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Debug|x64.Build.0 = Debug|Any CPU + {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Debug|x86.ActiveCfg = Debug|Any CPU + {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Debug|x86.Build.0 = Debug|Any CPU + {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Debug|x86.Deploy.0 = Debug|Any CPU {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Release|Any CPU.ActiveCfg = Release|Any CPU {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Release|Any CPU.Build.0 = Release|Any CPU + {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Release|arm64.ActiveCfg = Release|Any CPU + {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Release|arm64.Build.0 = Release|Any CPU + {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Release|arm64.Deploy.0 = Release|Any CPU {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Release|x64.ActiveCfg = Release|Any CPU {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Release|x64.Build.0 = Release|Any CPU + {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Release|x86.ActiveCfg = Release|Any CPU + {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Release|x86.Build.0 = Release|Any CPU + {EBCE08A8-372E-47B8-88C4-24EEA650C44A}.Release|x86.Deploy.0 = Release|Any CPU {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Debug|arm64.ActiveCfg = Debug|Any CPU + {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Debug|arm64.Build.0 = Debug|Any CPU + {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Debug|arm64.Deploy.0 = Debug|Any CPU {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Debug|x64.ActiveCfg = Debug|Any CPU {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Debug|x64.Build.0 = Debug|Any CPU + {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Debug|x86.ActiveCfg = Debug|Any CPU + {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Debug|x86.Build.0 = Debug|Any CPU + {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Debug|x86.Deploy.0 = Debug|Any CPU {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Release|Any CPU.ActiveCfg = Release|Any CPU {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Release|Any CPU.Build.0 = Release|Any CPU + {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Release|arm64.ActiveCfg = Release|Any CPU + {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Release|arm64.Build.0 = Release|Any CPU + {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Release|arm64.Deploy.0 = Release|Any CPU {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Release|x64.ActiveCfg = Release|Any CPU {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Release|x64.Build.0 = Release|Any CPU + {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Release|x86.ActiveCfg = Release|Any CPU + {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Release|x86.Build.0 = Release|Any CPU + {E700DF09-42A9-4AC7-9855-400029FBFDBE}.Release|x86.Deploy.0 = Release|Any CPU {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Debug|arm64.ActiveCfg = Debug|Any CPU + {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Debug|arm64.Build.0 = Debug|Any CPU + {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Debug|arm64.Deploy.0 = Debug|Any CPU {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Debug|x64.ActiveCfg = Debug|Any CPU {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Debug|x64.Build.0 = Debug|Any CPU + {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Debug|x86.ActiveCfg = Debug|Any CPU + {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Debug|x86.Build.0 = Debug|Any CPU + {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Debug|x86.Deploy.0 = Debug|Any CPU {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Release|Any CPU.ActiveCfg = Release|Any CPU {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Release|Any CPU.Build.0 = Release|Any CPU + {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Release|arm64.ActiveCfg = Release|Any CPU + {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Release|arm64.Build.0 = Release|Any CPU + {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Release|arm64.Deploy.0 = Release|Any CPU {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Release|x64.ActiveCfg = Release|Any CPU {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Release|x64.Build.0 = Release|Any CPU + {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Release|x86.ActiveCfg = Release|Any CPU + {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Release|x86.Build.0 = Release|Any CPU + {7C5EAFA9-BDB7-4A2E-A9CF-2AE62352B75A}.Release|x86.Deploy.0 = Release|Any CPU {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Debug|arm64.ActiveCfg = Debug|Any CPU + {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Debug|arm64.Build.0 = Debug|Any CPU + {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Debug|arm64.Deploy.0 = Debug|Any CPU {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Debug|x64.ActiveCfg = Debug|Any CPU {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Debug|x64.Build.0 = Debug|Any CPU + {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Debug|x86.ActiveCfg = Debug|Any CPU + {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Debug|x86.Build.0 = Debug|Any CPU + {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Debug|x86.Deploy.0 = Debug|Any CPU {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Release|Any CPU.ActiveCfg = Release|Any CPU {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Release|Any CPU.Build.0 = Release|Any CPU + {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Release|arm64.ActiveCfg = Release|Any CPU + {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Release|arm64.Build.0 = Release|Any CPU + {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Release|arm64.Deploy.0 = Release|Any CPU {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Release|x64.ActiveCfg = Release|Any CPU {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Release|x64.Build.0 = Release|Any CPU + {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Release|x86.ActiveCfg = Release|Any CPU + {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Release|x86.Build.0 = Release|Any CPU + {85E88201-049C-4E42-AE85-DFEEFA7C533C}.Release|x86.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -297,9 +489,7 @@ Global {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F} = {EC44EE95-8EC9-4EE5-A8A6-E6BE2F32C843} {938DD23E-270E-488B-AC4C-CA68A545A8F2} = {EC44EE95-8EC9-4EE5-A8A6-E6BE2F32C843} {80195619-D4CF-4287-BA59-08077486BE1C} = {1A8A7481-2108-496B-802D-39F9C08D86F3} - {50DEEF87-BC2F-4B45-B97D-B83135F12786} = {34272930-CFC7-4E33-9DB9-88E82AE2C046} - {4D266288-D49F-46D4-90E0-667E81D6A433} = {50DEEF87-BC2F-4B45-B97D-B83135F12786} - {FD33E535-127D-48AC-8788-0F61FA2A251C} = {4D266288-D49F-46D4-90E0-667E81D6A433} + {FD33E535-127D-48AC-8788-0F61FA2A251C} = {1A8A7481-2108-496B-802D-39F9C08D86F3} {D9C038B7-6A62-4945-A030-4AC7597F53CA} = {EC44EE95-8EC9-4EE5-A8A6-E6BE2F32C843} {E54D1AD4-E935-479D-8A69-FC073E4DB33D} = {1A8A7481-2108-496B-802D-39F9C08D86F3} EndGlobalSection From d788da776bf9ead1d7b1cd96cbc8714cfa38bc08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaigan=C3=A9sh=20Kumaran?= Date: Wed, 10 May 2023 11:09:55 +0530 Subject: [PATCH 2/7] Move CppWinRT/RuntimeComponent to Desktop fom Neutral --- .../CppWinRT/RuntimeComponent/Class.cpp | 0 .../CppWinRT/RuntimeComponent/Class.h | 0 .../CppWinRT/RuntimeComponent/Class.idl | 0 .../RuntimeComponent/ProjectTemplate.vcxproj | 0 .../ProjectTemplate.vcxproj.filters | 0 .../CppWinRT/RuntimeComponent/RuntimeComponent.def | 0 .../WinUI.Desktop.CppWinRT.RuntimeComponent.csproj | 6 +++--- .../WinUI.Desktop.CppWinRT.RuntimeComponent.ico | Bin .../WinUI.Desktop.CppWinRT.RuntimeComponent.png | Bin ...nUI.Desktop.CppWinRT.RuntimeComponent.vstemplate | 0 .../CppWinRT/RuntimeComponent/pch.cpp | 0 .../CppWinRT/RuntimeComponent/pch.h | 0 .../CppWinRT/RuntimeComponent/readme.txt | 0 dev/VSIX/WindowsAppSDK.Extension.sln | 2 +- 14 files changed, 4 insertions(+), 4 deletions(-) rename dev/VSIX/ProjectTemplates/{Neutral => Desktop}/CppWinRT/RuntimeComponent/Class.cpp (100%) rename dev/VSIX/ProjectTemplates/{Neutral => Desktop}/CppWinRT/RuntimeComponent/Class.h (100%) rename dev/VSIX/ProjectTemplates/{Neutral => Desktop}/CppWinRT/RuntimeComponent/Class.idl (100%) rename dev/VSIX/ProjectTemplates/{Neutral => Desktop}/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj (100%) rename dev/VSIX/ProjectTemplates/{Neutral => Desktop}/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj.filters (100%) rename dev/VSIX/ProjectTemplates/{Neutral => Desktop}/CppWinRT/RuntimeComponent/RuntimeComponent.def (100%) rename dev/VSIX/ProjectTemplates/{Neutral => Desktop}/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.csproj (95%) rename dev/VSIX/ProjectTemplates/{Neutral => Desktop}/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.ico (100%) rename dev/VSIX/ProjectTemplates/{Neutral => Desktop}/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.png (100%) rename dev/VSIX/ProjectTemplates/{Neutral => Desktop}/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate (100%) rename dev/VSIX/ProjectTemplates/{Neutral => Desktop}/CppWinRT/RuntimeComponent/pch.cpp (100%) rename dev/VSIX/ProjectTemplates/{Neutral => Desktop}/CppWinRT/RuntimeComponent/pch.h (100%) rename dev/VSIX/ProjectTemplates/{Neutral => Desktop}/CppWinRT/RuntimeComponent/readme.txt (100%) diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/Class.cpp similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.cpp rename to dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/Class.cpp diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.h b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/Class.h similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.h rename to dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/Class.h diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.idl b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/Class.idl similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/Class.idl rename to dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/Class.idl diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj rename to dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj.filters b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj.filters similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj.filters rename to dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj.filters diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/RuntimeComponent.def b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/RuntimeComponent.def similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/RuntimeComponent.def rename to dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/RuntimeComponent.def diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.csproj b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.csproj similarity index 95% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.csproj rename to dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.csproj index 63cb4e679a..6e57f1c5fe 100644 --- a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.csproj +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.csproj @@ -63,9 +63,9 @@ - - - + + + diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.ico b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.ico similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.ico rename to dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.ico diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.png b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.png similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.png rename to dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.png diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate rename to dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/pch.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/pch.cpp similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/pch.cpp rename to dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/pch.cpp diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/pch.h b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/pch.h similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/pch.h rename to dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/pch.h diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/readme.txt b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/readme.txt similarity index 100% rename from dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/readme.txt rename to dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/readme.txt diff --git a/dev/VSIX/WindowsAppSDK.Extension.sln b/dev/VSIX/WindowsAppSDK.Extension.sln index 3dbdafccd4..2b20baa32e 100644 --- a/dev/VSIX/WindowsAppSDK.Extension.sln +++ b/dev/VSIX/WindowsAppSDK.Extension.sln @@ -66,7 +66,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.Desktop.Cs.PackagedAp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.Desktop.CppWinRT.PackagedApp", "ProjectTemplates\Desktop\CppWinRT\PackagedApp\WinUI.Desktop.CppWinRT.PackagedApp.csproj", "{80195619-D4CF-4287-BA59-08077486BE1C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.Desktop.CppWinRT.RuntimeComponent", "ProjectTemplates\Neutral\CppWinRT\RuntimeComponent\WinUI.Desktop.CppWinRT.RuntimeComponent.csproj", "{FD33E535-127D-48AC-8788-0F61FA2A251C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.Desktop.CppWinRT.RuntimeComponent", "ProjectTemplates\Desktop\CppWinRT\RuntimeComponent\WinUI.Desktop.CppWinRT.RuntimeComponent.csproj", "{FD33E535-127D-48AC-8788-0F61FA2A251C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.Desktop.Cs.SingleProjectPackagedApp", "ProjectTemplates\Desktop\CSharp\SingleProjectPackagedApp\WinUI.Desktop.Cs.SingleProjectPackagedApp.csproj", "{D9C038B7-6A62-4945-A030-4AC7597F53CA}" EndProject From 47274e9501173fe5a4f4461801db4a87bc0bb617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaigan=C3=A9sh=20Kumaran?= Date: Wed, 10 May 2023 11:11:09 +0530 Subject: [PATCH 3/7] Remove InitializeComponent from C++/WinRT App's constructor --- .../Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp index cfa5121ae3..50a5f6401c 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp @@ -16,7 +16,8 @@ namespace $safeprojectname$::implementation /// App::App() { - InitializeComponent(); + // Xaml objects should not call InitializeComponent during construction. + // See https://github.com/microsoft/cppwinrt/tree/master/nuget#initializecomponent #if defined _DEBUG && !defined DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION UnhandledException([this](IInspectable const&, UnhandledExceptionEventArgs const& e) From 541086af433743388201d69850b0cabbfcc0aabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaigan=C3=A9sh=20Kumaran?= Date: Wed, 10 May 2023 11:30:27 +0530 Subject: [PATCH 4/7] Avoid capturing this in the UnhandledException handler --- .../Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp index 50a5f6401c..221dcb1fad 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.cpp @@ -20,7 +20,7 @@ namespace $safeprojectname$::implementation // See https://github.com/microsoft/cppwinrt/tree/master/nuget#initializecomponent #if defined _DEBUG && !defined DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION - UnhandledException([this](IInspectable const&, UnhandledExceptionEventArgs const& e) + UnhandledException([](IInspectable const&, UnhandledExceptionEventArgs const& e) { if (IsDebuggerPresent()) { From bc09e3d875440072d62639791efcdd86921f242e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaigan=C3=A9sh=20Kumaran?= Date: Sun, 14 May 2023 20:11:46 +0530 Subject: [PATCH 5/7] Add a space between pragma once and include in App.h for consistency --- .../Desktop/CppWinRT/SingleProjectPackagedApp/App.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.h b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.h index f811d0f001..9e2b814253 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.h +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/App.h @@ -1,4 +1,5 @@ #pragma once + #include "App.xaml.g.h" namespace winrt::$safeprojectname$::implementation From 1a920cd471c6ddc83b4bfb209890846e69632126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaigan=C3=A9sh=20Kumaran?= Date: Sun, 14 May 2023 20:15:40 +0530 Subject: [PATCH 6/7] Revert removing __has_include check before including g.cpp --- .../ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp | 2 ++ .../Desktop/CppWinRT/RuntimeComponent/Class.cpp | 2 ++ .../Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp index 4580879576..20fa90c0c7 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp +++ b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp @@ -1,6 +1,8 @@ #include "pch.h" #include "$safeitemname$.xaml.h" +#if __has_include("$safeitemname$.g.cpp") #include "$safeitemname$.g.cpp" +#endif using namespace winrt; using namespace Microsoft::UI::Xaml; diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/Class.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/Class.cpp index fb75c9db2f..7286244444 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/Class.cpp +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/Class.cpp @@ -1,6 +1,8 @@ #include "pch.h" #include "Class.h" +#if __has_include("Class.g.cpp") #include "Class.g.cpp" +#endif // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp index 275e4a85e1..d4bdbf6fdb 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp @@ -1,6 +1,8 @@ #include "pch.h" #include "MainWindow.xaml.h" +#if __has_include("MainWindow.g.cpp") #include "MainWindow.g.cpp" +#endif using namespace winrt; using namespace Microsoft::UI::Xaml; From 24e2202731e5133a3acc6d79b40b6b73a6697f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaigan=C3=A9sh=20Kumaran?= Date: Wed, 19 Jul 2023 07:43:11 +0530 Subject: [PATCH 7/7] Fix typo: Desktopy -> Desktop --- .../WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate index 7ffb20ddca..d6e6ee1a27 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/RuntimeComponent/WinUI.Desktop.CppWinRT.RuntimeComponent.vstemplate @@ -4,7 +4,7 @@ WinUI.Desktop.CppWinRT.RuntimeComponent.ico - Microsoft.WinUI.Desktopy.CppWinRT.RuntimeComponent + Microsoft.WinUI.Desktop.CppWinRT.RuntimeComponent VC true RuntimeComponent