From 306c26252990dbc989831eb4ee45a284f93614d1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 27 May 2025 06:56:43 +0000 Subject: [PATCH 1/7] Initial plan for issue From 87c471c452309a0c3c6e86a099ca89f3b73ce3cb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 27 May 2025 07:02:01 +0000 Subject: [PATCH 2/7] Update core project templates to use file-scoped namespaces Co-authored-by: haonanttt <186026394+haonanttt@users.noreply.github.com> --- .../Desktop/CSharp/ClassLibrary/Class1.cs | 7 ++- .../CSharp/PackagedApp/BlankApp/App.xaml.cs | 43 +++++++++---------- .../PackagedApp/BlankApp/MainWindow.xaml.cs | 25 ++++++----- .../SingleProjectPackagedApp/App.xaml.cs | 43 +++++++++---------- .../MainWindow.xaml.cs | 25 ++++++----- 5 files changed, 69 insertions(+), 74 deletions(-) diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/ClassLibrary/Class1.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/ClassLibrary/Class1.cs index cebd31a8..b536dc97 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/ClassLibrary/Class1.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/ClassLibrary/Class1.cs @@ -7,9 +7,8 @@ // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace $safeprojectname$ +namespace $safeprojectname$; + +public class Class1 { - public class Class1 - { - } } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml.cs index b6488bd6..fa69af15 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml.cs @@ -19,32 +19,31 @@ // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace $safeprojectname$ +namespace $safeprojectname$; + +/// +/// Provides application-specific behavior to supplement the default Application class. +/// +public partial class App : Application { /// - /// Provides application-specific behavior to supplement the default Application class. + /// 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(). /// - public partial class App : Application + public App() { - /// - /// 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(). - /// - public App() - { - this.InitializeComponent(); - } - - /// - /// Invoked when the application is launched. - /// - /// Details about the launch request and process. - protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) - { - m_window = new MainWindow(); - m_window.Activate(); - } + this.InitializeComponent(); + } - private Window? m_window; + /// + /// Invoked when the application is launched. + /// + /// Details about the launch request and process. + protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) + { + m_window = new MainWindow(); + m_window.Activate(); } + + private Window? m_window; } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs index a3d1e49a..6c84db4c 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs @@ -16,21 +16,20 @@ // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace $safeprojectname$ +namespace $safeprojectname$; + +/// +/// An empty window that can be used on its own or navigated to within a Frame. +/// +public sealed partial class MainWindow : Window { - /// - /// An empty window that can be used on its own or navigated to within a Frame. - /// - public sealed partial class MainWindow : Window + public MainWindow() { - public MainWindow() - { - this.InitializeComponent(); - } + this.InitializeComponent(); + } - private void myButton_Click(object sender, RoutedEventArgs e) - { - myButton.Content = "Clicked"; - } + private void myButton_Click(object sender, RoutedEventArgs e) + { + myButton.Content = "Clicked"; } } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/App.xaml.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/App.xaml.cs index b6488bd6..fa69af15 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/App.xaml.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/App.xaml.cs @@ -19,32 +19,31 @@ // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace $safeprojectname$ +namespace $safeprojectname$; + +/// +/// Provides application-specific behavior to supplement the default Application class. +/// +public partial class App : Application { /// - /// Provides application-specific behavior to supplement the default Application class. + /// 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(). /// - public partial class App : Application + public App() { - /// - /// 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(). - /// - public App() - { - this.InitializeComponent(); - } - - /// - /// Invoked when the application is launched. - /// - /// Details about the launch request and process. - protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) - { - m_window = new MainWindow(); - m_window.Activate(); - } + this.InitializeComponent(); + } - private Window? m_window; + /// + /// Invoked when the application is launched. + /// + /// Details about the launch request and process. + protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) + { + m_window = new MainWindow(); + m_window.Activate(); } + + private Window? m_window; } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs index a3d1e49a..6c84db4c 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs @@ -16,21 +16,20 @@ // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace $safeprojectname$ +namespace $safeprojectname$; + +/// +/// An empty window that can be used on its own or navigated to within a Frame. +/// +public sealed partial class MainWindow : Window { - /// - /// An empty window that can be used on its own or navigated to within a Frame. - /// - public sealed partial class MainWindow : Window + public MainWindow() { - public MainWindow() - { - this.InitializeComponent(); - } + this.InitializeComponent(); + } - private void myButton_Click(object sender, RoutedEventArgs e) - { - myButton.Content = "Clicked"; - } + private void myButton_Click(object sender, RoutedEventArgs e) + { + myButton.Content = "Clicked"; } } From a4ee42e0e12cadcbbc4ca1bf93dcf66c4f44ab1e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 27 May 2025 07:03:47 +0000 Subject: [PATCH 3/7] Update test project templates to use file-scoped namespaces Co-authored-by: haonanttt <186026394+haonanttt@users.noreply.github.com> --- .../CSharp/BlankWindow/BlankWindow.xaml.cs | 17 +++--- .../CSharp/UnitTestApp/UnitTestApp.xaml.cs | 57 +++++++++---------- .../UnitTestApp/UnitTestAppWindow.xaml.cs | 11 ++-- .../Desktop/CSharp/UnitTestApp/UnitTests.cs | 29 +++++----- 4 files changed, 55 insertions(+), 59 deletions(-) diff --git a/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs b/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs index 1027c7b9..713c9c5e 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs +++ b/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs @@ -16,16 +16,15 @@ // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace $rootnamespace$ +namespace $rootnamespace$; + +/// +/// An empty window that can be used on its own or navigated to within a Frame. +/// +public sealed partial class $safeitemname$ : Window { - /// - /// An empty window that can be used on its own or navigated to within a Frame. - /// - public sealed partial class $safeitemname$ : Window + public $safeitemname$() { - public $safeitemname$() - { - this.InitializeComponent(); - } + this.InitializeComponent(); } } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestApp.xaml.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestApp.xaml.cs index 9c6071da..12fc7bdb 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestApp.xaml.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestApp.xaml.cs @@ -20,38 +20,37 @@ // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace $safeprojectname$ +namespace $safeprojectname$; + +/// +/// Provides application-specific behavior to supplement the default Application class. +/// +public partial class UnitTestApp : Application { /// - /// Provides application-specific behavior to supplement the default Application class. + /// 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(). + /// + public UnitTestApp() + { + this.InitializeComponent(); + } + + /// + /// Invoked when the application is launched. /// - public partial class UnitTestApp : Application + /// Details about the launch request and process. + protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) { - /// - /// 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(). - /// - public UnitTestApp() - { - this.InitializeComponent(); - } - - /// - /// Invoked when the application is launched. - /// - /// Details about the launch request and process. - protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) - { - Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI(); - - m_window = new UnitTestAppWindow(); - m_window.Activate(); - - UITestMethodAttribute.DispatcherQueue = m_window.DispatcherQueue; - - Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(Environment.CommandLine); - } - - private Window? m_window; + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI(); + + m_window = new UnitTestAppWindow(); + m_window.Activate(); + + UITestMethodAttribute.DispatcherQueue = m_window.DispatcherQueue; + + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(Environment.CommandLine); } + + private Window? m_window; } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs index 27eb17bf..ebc859ff 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs @@ -16,13 +16,12 @@ // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace $safeprojectname$ +namespace $safeprojectname$; + +public sealed partial class UnitTestAppWindow : Window { - public sealed partial class UnitTestAppWindow : Window + public UnitTestAppWindow() { - public UnitTestAppWindow() - { - this.InitializeComponent(); - } + this.InitializeComponent(); } } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTests.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTests.cs index eb6c4949..b0d8e08c 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTests.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTests.cs @@ -5,23 +5,22 @@ using System.Collections.Generic; using System.Linq; -namespace $safeprojectname$ +namespace $safeprojectname$; + +[TestClass] +public class UnitTest1 { - [TestClass] - public class UnitTest1 + [TestMethod] + public void TestMethod1() { - [TestMethod] - public void TestMethod1() - { - Assert.AreEqual(0, 0); - } + Assert.AreEqual(0, 0); + } - // Use the UITestMethod attribute for tests that need to run on the UI thread. - [UITestMethod] - public void TestMethod2() - { - var grid = new Grid(); - Assert.AreEqual(0, grid.MinWidth); - } + // Use the UITestMethod attribute for tests that need to run on the UI thread. + [UITestMethod] + public void TestMethod2() + { + var grid = new Grid(); + Assert.AreEqual(0, grid.MinWidth); } } From d8bbb34f91c0940736ef6e5d1748b23d26c014b0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 27 May 2025 07:05:30 +0000 Subject: [PATCH 4/7] Update neutral C# item templates to use file-scoped namespaces Co-authored-by: haonanttt <186026394+haonanttt@users.noreply.github.com> --- .../Neutral/CSharp/BlankPage/BlankPage.xaml.cs | 17 ++++++++--------- .../CSharp/TemplatedControl/CustomControl.cs | 11 +++++------ .../CSharp/UserControl/UserControl.xaml.cs | 11 +++++------ 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dev/VSIX/ItemTemplates/Neutral/CSharp/BlankPage/BlankPage.xaml.cs b/dev/VSIX/ItemTemplates/Neutral/CSharp/BlankPage/BlankPage.xaml.cs index 834364fa..d1ab3b29 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CSharp/BlankPage/BlankPage.xaml.cs +++ b/dev/VSIX/ItemTemplates/Neutral/CSharp/BlankPage/BlankPage.xaml.cs @@ -16,16 +16,15 @@ // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace $rootnamespace$ +namespace $rootnamespace$; + +/// +/// An empty page that can be used on its own or navigated to within a Frame. +/// +public sealed partial class $safeitemname$ : Page { - /// - /// An empty page that can be used on its own or navigated to within a Frame. - /// - public sealed partial class $safeitemname$ : Page + public $safeitemname$() { - public $safeitemname$() - { - this.InitializeComponent(); - } + this.InitializeComponent(); } } diff --git a/dev/VSIX/ItemTemplates/Neutral/CSharp/TemplatedControl/CustomControl.cs b/dev/VSIX/ItemTemplates/Neutral/CSharp/TemplatedControl/CustomControl.cs index 1f7ae5c7..4016a8d6 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CSharp/TemplatedControl/CustomControl.cs +++ b/dev/VSIX/ItemTemplates/Neutral/CSharp/TemplatedControl/CustomControl.cs @@ -12,13 +12,12 @@ // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace $rootnamespace$ +namespace $rootnamespace$; + +public sealed class $safeitemname$ : Control { - public sealed class $safeitemname$ : Control + public $safeitemname$() { - public $safeitemname$() - { - this.DefaultStyleKey = typeof($safeitemname$); - } + this.DefaultStyleKey = typeof($safeitemname$); } } diff --git a/dev/VSIX/ItemTemplates/Neutral/CSharp/UserControl/UserControl.xaml.cs b/dev/VSIX/ItemTemplates/Neutral/CSharp/UserControl/UserControl.xaml.cs index c12c5ffd..8879093c 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CSharp/UserControl/UserControl.xaml.cs +++ b/dev/VSIX/ItemTemplates/Neutral/CSharp/UserControl/UserControl.xaml.cs @@ -16,13 +16,12 @@ // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. -namespace $rootnamespace$ +namespace $rootnamespace$; + +public sealed partial class $safeitemname$ : UserControl { - public sealed partial class $safeitemname$ : UserControl + public $safeitemname$() { - public $safeitemname$() - { - this.InitializeComponent(); - } + this.InitializeComponent(); } } From 9084a17b01065ceb9e8b8850773dee6406273c3e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 27 May 2025 07:39:08 +0000 Subject: [PATCH 5/7] Remove button from C++ templates Co-authored-by: haonanttt <186026394+haonanttt@users.noreply.github.com> --- .../Desktop/CppWinRT/BlankWindow/BlankWindow.cpp | 5 ----- .../Desktop/CppWinRT/BlankWindow/BlankWindow.h | 2 -- .../Desktop/CppWinRT/BlankWindow/BlankWindow.xaml | 6 +++--- .../ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.cpp | 5 ----- .../ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.h | 2 -- .../ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.xaml | 6 +++--- .../Neutral/CppWinRT/UserControl/UserControl.cpp | 5 ----- .../Neutral/CppWinRT/UserControl/UserControl.h | 2 -- .../Neutral/CppWinRT/UserControl/UserControl.xaml | 6 +++--- 9 files changed, 9 insertions(+), 30 deletions(-) diff --git a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp index 71f96dbd..a097cc48 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp +++ b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp @@ -21,9 +21,4 @@ namespace winrt::$rootnamespace$::implementation { 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 8eff169b..84cdc038 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.h +++ b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.h @@ -14,8 +14,6 @@ namespace winrt::$rootnamespace$::implementation int32_t MyProperty(); void MyProperty(int32_t value); - - void myButton_Click(IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args); }; } diff --git a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.xaml b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.xaml index 6084af2c..3a8ac6e2 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.xaml +++ b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.xaml @@ -9,7 +9,7 @@ mc:Ignorable="d" Title="$itemname$"> - - - + + + diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.cpp b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.cpp index 71f96dbd..a097cc48 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.cpp +++ b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.cpp @@ -21,9 +21,4 @@ namespace winrt::$rootnamespace$::implementation { 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 8eff169b..84cdc038 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.h +++ b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.h @@ -14,8 +14,6 @@ namespace winrt::$rootnamespace$::implementation int32_t MyProperty(); void MyProperty(int32_t value); - - void myButton_Click(IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args); }; } diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.xaml b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/BlankPage/BlankPage.xaml index 6b7755e3..3646967b 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/UserControl/UserControl.cpp b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.cpp index 71f96dbd..a097cc48 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.cpp +++ b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.cpp @@ -21,9 +21,4 @@ namespace winrt::$rootnamespace$::implementation { 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/UserControl/UserControl.h b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.h index 8eff169b..84cdc038 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.h +++ b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.h @@ -14,8 +14,6 @@ namespace winrt::$rootnamespace$::implementation int32_t MyProperty(); void MyProperty(int32_t value); - - void myButton_Click(IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args); }; } diff --git a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.xaml b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.xaml index 64b205a7..85b00432 100644 --- a/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.xaml +++ b/dev/VSIX/ItemTemplates/Neutral/CppWinRT/UserControl/UserControl.xaml @@ -8,7 +8,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> - - - + + + From c492ed0c271ba97f21f1baf63a8163444394dfb9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 27 May 2025 07:49:06 +0000 Subject: [PATCH 6/7] Enable Mica backdrop for all window-level templates Co-authored-by: haonanttt <186026394+haonanttt@users.noreply.github.com> --- .../Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs | 4 ++++ .../Desktop/CppWinRT/BlankWindow/BlankWindow.cpp | 7 +++++++ .../Desktop/CppWinRT/BlankWindow/BlankWindow.h | 6 +----- .../Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs | 4 ++++ .../CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs | 4 ++++ .../Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs | 4 ++++ .../Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp | 7 +++++++ .../Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.h | 6 +----- .../CppWinRT/SingleProjectPackagedApp/MainWindow.cpp | 7 +++++++ .../Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.h | 6 +----- .../Desktop/CppWinRT/UnitTestApp/MainWindow.cpp | 4 +++- 11 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs b/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs index 713c9c5e..4ada34af 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs +++ b/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs @@ -11,6 +11,7 @@ using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Composition; using Microsoft.UI.Xaml.Navigation; // To learn more about WinUI, the WinUI project structure, @@ -26,5 +27,8 @@ public sealed partial class $safeitemname$ : Window public $safeitemname$() { this.InitializeComponent(); + + // Enable Mica backdrop + SystemBackdrop = new MicaBackdrop(); } } diff --git a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp index a097cc48..d290a524 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp +++ b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp @@ -6,12 +6,19 @@ using namespace winrt; using namespace Microsoft::UI::Xaml; +using namespace Microsoft::UI::Xaml::Media; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. namespace winrt::$rootnamespace$::implementation { + $safeitemname$::$safeitemname$() + { + // Enable Mica backdrop + SystemBackdrop(winrt::Microsoft::UI::Xaml::Media::MicaBackdrop()); + } + 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 index 84cdc038..d7d67cec 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.h +++ b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.h @@ -6,11 +6,7 @@ namespace winrt::$rootnamespace$::implementation { struct $safeitemname$ : $safeitemname$T<$safeitemname$> { - $safeitemname$() - { - // Xaml objects should not call InitializeComponent during construction. - // See https://github.com/microsoft/cppwinrt/tree/master/nuget#initializecomponent - } + $safeitemname$(); int32_t MyProperty(); void MyProperty(int32_t value); diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs index 6c84db4c..14628827 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs @@ -11,6 +11,7 @@ using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Composition; using Microsoft.UI.Xaml.Navigation; // To learn more about WinUI, the WinUI project structure, @@ -26,6 +27,9 @@ public sealed partial class MainWindow : Window public MainWindow() { this.InitializeComponent(); + + // Enable Mica backdrop + SystemBackdrop = new MicaBackdrop(); } private void myButton_Click(object sender, RoutedEventArgs e) diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs index 6c84db4c..14628827 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs @@ -11,6 +11,7 @@ using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Composition; using Microsoft.UI.Xaml.Navigation; // To learn more about WinUI, the WinUI project structure, @@ -26,6 +27,9 @@ public sealed partial class MainWindow : Window public MainWindow() { this.InitializeComponent(); + + // Enable Mica backdrop + SystemBackdrop = new MicaBackdrop(); } private void myButton_Click(object sender, RoutedEventArgs e) diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs index ebc859ff..367a9907 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs @@ -11,6 +11,7 @@ using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Composition; using Microsoft.UI.Xaml.Navigation; // To learn more about WinUI, the WinUI project structure, @@ -23,5 +24,8 @@ public sealed partial class UnitTestAppWindow : Window public UnitTestAppWindow() { this.InitializeComponent(); + + // Enable Mica backdrop + SystemBackdrop = new MicaBackdrop(); } } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp index d6d47e76..b46a36e8 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp @@ -6,12 +6,19 @@ using namespace winrt; using namespace Microsoft::UI::Xaml; +using namespace Microsoft::UI::Xaml::Media; // 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 { + MainWindow::MainWindow() + { + // Enable Mica backdrop + SystemBackdrop(winrt::Microsoft::UI::Xaml::Media::MicaBackdrop()); + } + int32_t MainWindow::MyProperty() { throw hresult_not_implemented(); diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.h b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.h index 1077d33b..258de21a 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.h +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.h @@ -6,11 +6,7 @@ namespace winrt::$safeprojectname$::implementation { struct MainWindow : MainWindowT { - MainWindow() - { - // Xaml objects should not call InitializeComponent during construction. - // See https://github.com/microsoft/cppwinrt/tree/master/nuget#initializecomponent - } + MainWindow(); int32_t MyProperty(); void MyProperty(int32_t value); diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp index d6d47e76..b46a36e8 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp @@ -6,12 +6,19 @@ using namespace winrt; using namespace Microsoft::UI::Xaml; +using namespace Microsoft::UI::Xaml::Media; // 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 { + MainWindow::MainWindow() + { + // Enable Mica backdrop + SystemBackdrop(winrt::Microsoft::UI::Xaml::Media::MicaBackdrop()); + } + int32_t MainWindow::MyProperty() { throw hresult_not_implemented(); diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.h b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.h index 1077d33b..258de21a 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.h +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.h @@ -6,11 +6,7 @@ namespace winrt::$safeprojectname$::implementation { struct MainWindow : MainWindowT { - MainWindow() - { - // Xaml objects should not call InitializeComponent during construction. - // See https://github.com/microsoft/cppwinrt/tree/master/nuget#initializecomponent - } + MainWindow(); int32_t MyProperty(); void MyProperty(int32_t value); diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/MainWindow.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/MainWindow.cpp index 975ebe78..11d42c78 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/MainWindow.cpp +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/MainWindow.cpp @@ -6,6 +6,7 @@ using namespace winrt; using namespace Microsoft::UI::Xaml; +using namespace Microsoft::UI::Xaml::Media; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -14,6 +15,7 @@ namespace winrt::$safeprojectname$::implementation { MainWindow::MainWindow() { - + // Enable Mica backdrop + SystemBackdrop(winrt::Microsoft::UI::Xaml::Media::MicaBackdrop()); } } From 8bdfa07b1fa77858e093f76f79cb1feeee80a115 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 27 May 2025 08:02:00 +0000 Subject: [PATCH 7/7] Update Mica backdrop to use XAML-based approach Co-authored-by: haonanttt <186026394+haonanttt@users.noreply.github.com> --- .../ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml | 4 ++++ .../Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs | 4 ---- .../Desktop/CppWinRT/BlankWindow/BlankWindow.cpp | 3 --- .../Desktop/CppWinRT/BlankWindow/BlankWindow.xaml | 4 ++++ .../Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml | 4 ++++ .../Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs | 4 ---- .../Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml | 4 ++++ .../CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs | 4 ---- .../Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml | 4 ++++ .../Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs | 4 ---- .../Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp | 3 --- .../Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.xaml | 4 ++++ .../Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp | 3 --- .../Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.xaml | 4 ++++ .../Desktop/CppWinRT/UnitTestApp/MainWindow.cpp | 3 --- .../Desktop/CppWinRT/UnitTestApp/MainWindow.xaml | 4 ++++ 16 files changed, 32 insertions(+), 28 deletions(-) diff --git a/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml b/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml index 3a8ac6e2..aeaeace7 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml +++ b/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml @@ -9,6 +9,10 @@ mc:Ignorable="d" Title="$itemname$"> + + + + diff --git a/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs b/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs index 4ada34af..713c9c5e 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs +++ b/dev/VSIX/ItemTemplates/Desktop/CSharp/BlankWindow/BlankWindow.xaml.cs @@ -11,7 +11,6 @@ using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Composition; using Microsoft.UI.Xaml.Navigation; // To learn more about WinUI, the WinUI project structure, @@ -27,8 +26,5 @@ public sealed partial class $safeitemname$ : Window public $safeitemname$() { this.InitializeComponent(); - - // Enable Mica backdrop - SystemBackdrop = new MicaBackdrop(); } } diff --git a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp index d290a524..f1d60aa7 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp +++ b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.cpp @@ -6,7 +6,6 @@ using namespace winrt; using namespace Microsoft::UI::Xaml; -using namespace Microsoft::UI::Xaml::Media; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -15,8 +14,6 @@ namespace winrt::$rootnamespace$::implementation { $safeitemname$::$safeitemname$() { - // Enable Mica backdrop - SystemBackdrop(winrt::Microsoft::UI::Xaml::Media::MicaBackdrop()); } int32_t $safeitemname$::MyProperty() diff --git a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.xaml b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.xaml index 3a8ac6e2..aeaeace7 100644 --- a/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.xaml +++ b/dev/VSIX/ItemTemplates/Desktop/CppWinRT/BlankWindow/BlankWindow.xaml @@ -9,6 +9,10 @@ mc:Ignorable="d" Title="$itemname$"> + + + + diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml b/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml index e8e18c68..5c658fca 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml @@ -9,6 +9,10 @@ mc:Ignorable="d" Title="$projectname$"> + + + + diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs index 14628827..6c84db4c 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs @@ -11,7 +11,6 @@ using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Composition; using Microsoft.UI.Xaml.Navigation; // To learn more about WinUI, the WinUI project structure, @@ -27,9 +26,6 @@ public sealed partial class MainWindow : Window public MainWindow() { this.InitializeComponent(); - - // Enable Mica backdrop - SystemBackdrop = new MicaBackdrop(); } private void myButton_Click(object sender, RoutedEventArgs e) diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml b/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml index e8e18c68..5c658fca 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml @@ -9,6 +9,10 @@ mc:Ignorable="d" Title="$projectname$"> + + + + diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs index 14628827..6c84db4c 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/SingleProjectPackagedApp/MainWindow.xaml.cs @@ -11,7 +11,6 @@ using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Composition; using Microsoft.UI.Xaml.Navigation; // To learn more about WinUI, the WinUI project structure, @@ -27,9 +26,6 @@ public sealed partial class MainWindow : Window public MainWindow() { this.InitializeComponent(); - - // Enable Mica backdrop - SystemBackdrop = new MicaBackdrop(); } private void myButton_Click(object sender, RoutedEventArgs e) diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml b/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml index 1aded3c2..4c0be8c7 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml @@ -9,6 +9,10 @@ mc:Ignorable="d" Title="$projectname$"> + + + + diff --git a/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs b/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs index 367a9907..ebc859ff 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs +++ b/dev/VSIX/ProjectTemplates/Desktop/CSharp/UnitTestApp/UnitTestAppWindow.xaml.cs @@ -11,7 +11,6 @@ using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Composition; using Microsoft.UI.Xaml.Navigation; // To learn more about WinUI, the WinUI project structure, @@ -24,8 +23,5 @@ public sealed partial class UnitTestAppWindow : Window public UnitTestAppWindow() { this.InitializeComponent(); - - // Enable Mica backdrop - SystemBackdrop = new MicaBackdrop(); } } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp index b46a36e8..895787c9 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp @@ -6,7 +6,6 @@ using namespace winrt; using namespace Microsoft::UI::Xaml; -using namespace Microsoft::UI::Xaml::Media; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -15,8 +14,6 @@ namespace winrt::$safeprojectname$::implementation { MainWindow::MainWindow() { - // Enable Mica backdrop - SystemBackdrop(winrt::Microsoft::UI::Xaml::Media::MicaBackdrop()); } int32_t MainWindow::MyProperty() diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.xaml b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.xaml index e8e18c68..5c658fca 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.xaml +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.xaml @@ -9,6 +9,10 @@ mc:Ignorable="d" Title="$projectname$"> + + + + diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp index b46a36e8..895787c9 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.cpp @@ -6,7 +6,6 @@ using namespace winrt; using namespace Microsoft::UI::Xaml; -using namespace Microsoft::UI::Xaml::Media; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -15,8 +14,6 @@ namespace winrt::$safeprojectname$::implementation { MainWindow::MainWindow() { - // Enable Mica backdrop - SystemBackdrop(winrt::Microsoft::UI::Xaml::Media::MicaBackdrop()); } int32_t MainWindow::MyProperty() diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.xaml b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.xaml index e8e18c68..5c658fca 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.xaml +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/MainWindow.xaml @@ -9,6 +9,10 @@ mc:Ignorable="d" Title="$projectname$"> + + + + diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/MainWindow.cpp b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/MainWindow.cpp index 11d42c78..de1d7ee8 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/MainWindow.cpp +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/MainWindow.cpp @@ -6,7 +6,6 @@ using namespace winrt; using namespace Microsoft::UI::Xaml; -using namespace Microsoft::UI::Xaml::Media; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -15,7 +14,5 @@ namespace winrt::$safeprojectname$::implementation { MainWindow::MainWindow() { - // Enable Mica backdrop - SystemBackdrop(winrt::Microsoft::UI::Xaml::Media::MicaBackdrop()); } } diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/MainWindow.xaml b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/MainWindow.xaml index 66eaa157..1f0126bd 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/MainWindow.xaml +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/MainWindow.xaml @@ -9,6 +9,10 @@ mc:Ignorable="d" Title="$projectname$"> + + + +