diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml deleted file mode 100644 index 65073698c1..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml.cs b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml.cs deleted file mode 100644 index f2a43695a2..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.ApplicationModel; -using Windows.ApplicationModel.Activation; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; -using Microsoft.UI.Xaml.Shapes; - -// To learn more about WinUI, the WinUI project structure, -// and more about our project templates, see: http://aka.ms/winui-project-info. - -namespace $safeprojectname$; - -/// -/// Provides application-specific behavior to supplement the default Application class. -/// -public partial class App : Application -{ - private Window? _window; - - /// - /// 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() - { - InitializeComponent(); - } - - /// - /// Invoked when the application is launched. - /// - /// Details about the launch request and process. - protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) - { - _window = new MainWindow(); - _window.Activate(); - } -} diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/AppIcon.ico b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/AppIcon.ico deleted file mode 100644 index 235dad2c56..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/AppIcon.ico and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml deleted file mode 100644 index 2dde673831..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs deleted file mode 100644 index 4b2e0e2eb5..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; - -// To learn more about WinUI, the WinUI project structure, -// and more about our project templates, see: http://aka.ms/winui-project-info. - -namespace $safeprojectname$; - -public sealed partial class MainWindow : Window -{ - public MainWindow() - { - InitializeComponent(); - - ExtendsContentIntoTitleBar = true; - SetTitleBar(AppTitleBar); - - AppWindow.SetIcon("AppIcon.ico"); - } -} diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/ProjectTemplate.csproj b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/ProjectTemplate.csproj deleted file mode 100644 index 335a7f49ba..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/ProjectTemplate.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - WinExe - $ext_DotNetVersion$-windows10.0.19041.0 - 10.0.17763.0 - $safeprojectname$ - app.manifest - x86;x64;ARM64 - win-x86;win-x64;win-arm64 - true - false - enable - - - - - - - - - - - - - - - - - - - False - True - False - True - - \ No newline at end of file diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/Properties/PublishProfiles/win-arm64.pubxml b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/Properties/PublishProfiles/win-arm64.pubxml deleted file mode 100644 index 8953cce984..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/Properties/PublishProfiles/win-arm64.pubxml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - FileSystem - ARM64 - win-arm64 - bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ - true - False - - \ No newline at end of file diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/Properties/PublishProfiles/win-x64.pubxml b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/Properties/PublishProfiles/win-x64.pubxml deleted file mode 100644 index cd995617c0..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/Properties/PublishProfiles/win-x64.pubxml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - FileSystem - x64 - win-x64 - bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ - true - False - - \ No newline at end of file diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/Properties/PublishProfiles/win-x86.pubxml b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/Properties/PublishProfiles/win-x86.pubxml deleted file mode 100644 index a70c69425f..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/Properties/PublishProfiles/win-x86.pubxml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - FileSystem - x86 - win-x86 - bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ - true - False - - \ No newline at end of file diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/WinUI.Desktop.Cs.BlankApp.ico b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/WinUI.Desktop.Cs.BlankApp.ico deleted file mode 100644 index 293c93c712..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/WinUI.Desktop.Cs.BlankApp.ico and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/WinUI.Desktop.Cs.BlankApp.png b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/WinUI.Desktop.Cs.BlankApp.png deleted file mode 100644 index 491faf7065..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/WinUI.Desktop.Cs.BlankApp.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/WinUI.Desktop.Cs.BlankApp.vstemplate b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/WinUI.Desktop.Cs.BlankApp.vstemplate deleted file mode 100644 index aeef45a43c..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/WinUI.Desktop.Cs.BlankApp.vstemplate +++ /dev/null @@ -1,40 +0,0 @@ - - - - true - - - WinUI.Desktop.Cs.BlankApp.ico - Microsoft.WinUI.Desktop.Cs.BlankApp - WinRT-Managed - CSharp - true - App - true - Enabled - true - 2 - Windows - true - WinUI.Desktop.Cs.BlankApp.png - true - csharp - XAML - windows - desktop - WinUI - - - - Properties\PublishProfiles\win-arm64.pubxml - Properties\PublishProfiles\win-x64.pubxml - Properties\PublishProfiles\win-x86.pubxml - app.manifest - App.xaml - App.xaml.cs - MainWindow.xaml - MainWindow.xaml.cs - AppIcon.ico - - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/app.manifest b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/app.manifest deleted file mode 100644 index 0f7e64319f..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/app.manifest +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - PerMonitorV2 - - - \ No newline at end of file diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/LockScreenLogo.scale-200.png b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/LockScreenLogo.scale-200.png deleted file mode 100644 index 33f889e106..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/LockScreenLogo.scale-200.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Package-managed.appxmanifest b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Package-managed.appxmanifest deleted file mode 100644 index 7314bbe587..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Package-managed.appxmanifest +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - $projectname$ - $XmlEscapedPublisher$ - Images\StoreLogo.png - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/SplashScreen.scale-200.png b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/SplashScreen.scale-200.png deleted file mode 100644 index 802c79d6d7..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/SplashScreen.scale-200.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Square150x150Logo.scale-200.png b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Square150x150Logo.scale-200.png deleted file mode 100644 index ddba42adbb..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Square44x44Logo.scale-200.png b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Square44x44Logo.scale-200.png deleted file mode 100644 index 9327dd748e..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Square44x44Logo.targetsize-24_altform-unplated.png b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index e51416a8e4..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Square44x44Logo.targetsize-48_altform-lightunplated.png b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Square44x44Logo.targetsize-48_altform-lightunplated.png deleted file mode 100644 index bf063eb4d6..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Square44x44Logo.targetsize-48_altform-lightunplated.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/StoreLogo.png b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/StoreLogo.png deleted file mode 100644 index be865f0c37..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/StoreLogo.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/WapProjTemplate.ico b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/WapProjTemplate.ico deleted file mode 100644 index de1185d77f..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/WapProjTemplate.ico and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/WapProjTemplate.wapproj b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/WapProjTemplate.wapproj deleted file mode 100644 index 4f99481659..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/WapProjTemplate.wapproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - 15.0 - - - - - Debug - x86 - - - Release - x86 - - - Debug - x64 - - - Release - x64 - - - Debug - ARM64 - - - Release - ARM64 - - - - - $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ - $ext_projectname$\ - false - - - - - - $guid1$ - $targetplatformversion$ - $targetplatformminversion$ - $ext_DotNetVersion$-windows$(TargetPlatformVersion);$(AssetTargetFallback) - $currentuiculturename$ - $if$($includeKeyFile$==true) - $projectname$_TemporaryKey.pfx - $endif$ - false - - - - - Designer - - $if$($includeKeyFile$==true) - - $endif$ - - - - - - - - - - - - - - - - True - Properties\PublishProfiles\win-$(Platform).pubxml - - - - - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Wide310x150Logo.scale-200.png b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Wide310x150Logo.scale-200.png deleted file mode 100644 index 314d297f20..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/WinUI.Desktop.Cs.WapProj.vstemplate b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/WinUI.Desktop.Cs.WapProj.vstemplate deleted file mode 100644 index 5520e98b34..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/WinUI.Desktop.Cs.WapProj.vstemplate +++ /dev/null @@ -1,58 +0,0 @@ - - - - true - - - WapProjTemplate.ico - CSharp - WinUI.Desktop.Cs.WapProj - WapProj - true - WapProjTemplate - true - Enabled - true - true - true - 0 - Windows - csharp - XAML - windows - desktop - WinUI - - - - - - - - Package-managed.appxmanifest - SplashScreen.scale-200.png - LockScreenLogo.scale-200.png - Square150x150Logo.scale-200.png - Square44x44Logo.scale-200.png - Square44x44Logo.targetsize-24_altform-unplated.png - Square44x44Logo.targetsize-48_altform-lightunplated.png - StoreLogo.png - Wide310x150Logo.scale-200.png - - - - Microsoft.VisualStudio.Universal.TemplateWizards, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Microsoft.VisualStudio.Universal.TemplateWizards.PlatformVersion.Wizard - - - - Microsoft.VisualStudio.WinRT.TemplateWizards, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Microsoft.VisualStudio.WinRT.TemplateWizards.UpdatePublisherInManifestWizard - - - 10.0.17763.0 - true - true - true - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.csproj b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.csproj deleted file mode 100644 index b27444729e..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.csproj +++ /dev/null @@ -1,70 +0,0 @@ - - - - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - Debug - AnyCPU - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {938DD23E-270E-488B-AC4C-CA68A545A8F2} - Library - Properties - WinUI.Desktop.Cs.PackagedApp - WinUI.Desktop.Cs.PackagedApp - v4.7.2 - 512 - false - false - false - false - false - false - false - false - false - false - SHA256 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.ico b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.ico deleted file mode 100644 index 293c93c712..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.ico and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.png b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.png deleted file mode 100644 index 491faf7065..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.vstemplate b/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.vstemplate deleted file mode 100644 index 0f22e1f822..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.vstemplate +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - WinUI.Desktop.Cs.PackagedApp.ico - Microsoft.WinUI.Desktop.Cs.PackagedApp - WinRT-Managed - CSharp - false - App - true - Enabled - true - 2 - Windows - true - WinUI.Desktop.Cs.PackagedApp.png - true - csharp - XAML - windows - desktop - WinUI - - - - - - - WapProj\WinUI.Desktop.Cs.WapProj.vstemplate - BlankApp\WinUI.Desktop.Cs.BlankApp.vstemplate - - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/App.cpp b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/App.cpp deleted file mode 100644 index 47f77e36cf..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/App.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "pch.h" -#include "App.xaml.h" -#include "MainWindow.xaml.h" - -using namespace winrt; -using namespace Microsoft::UI::Xaml; - -// 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 -{ - /// - /// 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() - { - // 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([](IInspectable const&, UnhandledExceptionEventArgs const& e) - { - if (IsDebuggerPresent()) - { - auto errorMessage = e.Message(); - __debugbreak(); - } - }); -#endif - } - - /// - /// Invoked when the application is launched. - /// - /// Details about the launch request and process. - void App::OnLaunched([[maybe_unused]] LaunchActivatedEventArgs const& e) - { - window = make(); - window.Activate(); - } -} diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/App.h b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/App.h deleted file mode 100644 index 20431336d7..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/App.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "App.xaml.g.h" - -namespace winrt::$safeprojectname$::implementation -{ - struct App : AppT - { - App(); - - void OnLaunched(Microsoft::UI::Xaml::LaunchActivatedEventArgs const&); - - private: - winrt::Microsoft::UI::Xaml::Window window{ nullptr }; - }; -} diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/App.xaml b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/App.xaml deleted file mode 100644 index 65073698c1..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/App.xaml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp deleted file mode 100644 index ac57bc1467..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#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; - -// 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 MainWindow::MyProperty() - { - throw hresult_not_implemented(); - } - - void MainWindow::MyProperty(int32_t /* value */) - { - throw hresult_not_implemented(); - } -} diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.h b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.h deleted file mode 100644 index 83adcadb70..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "MainWindow.g.h" - -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 - } - - int32_t MyProperty(); - void MyProperty(int32_t value); - }; -} - -namespace winrt::$safeprojectname$::factory_implementation -{ - struct MainWindow : MainWindowT - { - }; -} diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.idl b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.idl deleted file mode 100644 index 0e0ce71ae6..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.idl +++ /dev/null @@ -1,9 +0,0 @@ -namespace $safeprojectname$ -{ - [default_interface] - runtimeclass MainWindow : Microsoft.UI.Xaml.Window - { - MainWindow(); - Int32 MyProperty; - } -} diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.xaml b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.xaml deleted file mode 100644 index 2ebf43d7bc..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.xaml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj deleted file mode 100644 index edd56ca8a5..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj +++ /dev/null @@ -1,143 +0,0 @@ - - - - true - true - true - {$guid1$} - $projectname$ - $safeprojectname$ - - $(RootNamespace) - $currentuiculturename$ - 16.0 - false - false - Windows Store - 10.0 - 10.0 - 10.0.17763.0 - true - false - - - - - Debug - Win32 - - - Debug - x64 - - - Debug - ARM64 - - - Release - Win32 - - - Release - x64 - - - Release - ARM64 - - - - Application - v145 - v143 - Unicode - true - - - true - true - - - false - true - false - - - - - - - - - - - Use - pch.h - $(IntDir)pch.pch - Level4 - stdcpp20 - stdcpp17 - %(AdditionalOptions) /bigobj - - - - - _DEBUG;%(PreprocessorDefinitions) - - - - - NDEBUG;%(PreprocessorDefinitions) - - - true - true - - - - - - - - - App.xaml - - - MainWindow.xaml - - - - - - - - - Create - - - App.xaml - - - MainWindow.xaml - - - - - - Code - MainWindow.xaml - - - - - false - - - - - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj.filters b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj.filters deleted file mode 100644 index 95cd21e016..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - Generated Files - - - - - - - - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - - - {e48dc53e-40b1-40cb-970a-f89935452892} - - - - - - \ No newline at end of file diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/WinUI.Desktop.CppWinRT.BlankApp.ico b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/WinUI.Desktop.CppWinRT.BlankApp.ico deleted file mode 100644 index a84fcbf877..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/WinUI.Desktop.CppWinRT.BlankApp.ico and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/WinUI.Desktop.CppWinRT.BlankApp.png b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/WinUI.Desktop.CppWinRT.BlankApp.png deleted file mode 100644 index 9108ea1fdb..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/WinUI.Desktop.CppWinRT.BlankApp.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/WinUI.Desktop.CppWinRT.BlankApp.vstemplate b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/WinUI.Desktop.CppWinRT.BlankApp.vstemplate deleted file mode 100644 index 6148773810..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/WinUI.Desktop.CppWinRT.BlankApp.vstemplate +++ /dev/null @@ -1,53 +0,0 @@ - - - - true - - - WinUI.Desktop.CppWinRT.BlankApp.ico - Microsoft.WinUI.Desktop.CppWinRT.BlankApp - VC - true - App - true - Enabled - true - 2 - Windows - true - WinUI.Desktop.CppWinRT.BlankApp.png - true - cpp - XAML - windows - desktop - WinUI - - - - ProjectTemplate.vcxproj.filters - pch.cpp - pch.h - app.manifest - App.xaml - App.cpp - App.h - MainWindow.xaml - MainWindow.idl - MainWindow.cpp - MainWindow.h - readme.txt - - - - - - - NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - NuGet.VisualStudio.TemplateWizard - - - WindowsAppSDK.Cpp.Extension.Dev17, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - WindowsAppSDK.TemplateUtilities.NuGetPackageInstaller - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/app.manifest b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/app.manifest deleted file mode 100644 index 0f7e64319f..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/app.manifest +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - PerMonitorV2 - - - \ No newline at end of file diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/pch.cpp b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/pch.cpp deleted file mode 100644 index 1d9f38c57d..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/pch.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "pch.h" diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/pch.h b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/pch.h deleted file mode 100644 index 6d06556701..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/pch.h +++ /dev/null @@ -1,25 +0,0 @@ -#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 diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/readme.txt b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/readme.txt deleted file mode 100644 index a7ab9b1f7f..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/readme.txt +++ /dev/null @@ -1,27 +0,0 @@ -======================================================================== - $projectname$ Project Overview -======================================================================== - -This project demonstrates how to get started writing WinUI3 apps directly -with standard C++, using the Windows App SDK and C++/WinRT packages and -XAML compiler support to generate implementation headers from interface -(IDL) files. These headers can then be used to implement the local -Windows Runtime classes referenced in the app's XAML pages. - -Steps: -1. Create an interface (IDL) file to define any local Windows Runtime - classes referenced in the app's XAML pages. -2. Build the project once to generate implementation templates under - the "Generated Files" folder, as well as skeleton class definitions - under "Generated Files\sources". -3. Use the skeleton class definitions for reference to implement your - Windows Runtime classes. - -======================================================================== -Learn more about Windows App SDK here: -https://docs.microsoft.com/windows/apps/windows-app-sdk/ -Learn more about WinUI3 here: -https://docs.microsoft.com/windows/apps/winui/winui3/ -Learn more about C++/WinRT here: -http://aka.ms/cppwinrt/ -======================================================================== diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/LockScreenLogo.scale-200.png b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/LockScreenLogo.scale-200.png deleted file mode 100644 index 33f889e106..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/LockScreenLogo.scale-200.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Package-managed.appxmanifest b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Package-managed.appxmanifest deleted file mode 100644 index 7314bbe587..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Package-managed.appxmanifest +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - $projectname$ - $XmlEscapedPublisher$ - Images\StoreLogo.png - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/SplashScreen.scale-200.png b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/SplashScreen.scale-200.png deleted file mode 100644 index 802c79d6d7..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/SplashScreen.scale-200.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Square150x150Logo.scale-200.png b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Square150x150Logo.scale-200.png deleted file mode 100644 index ddba42adbb..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Square44x44Logo.scale-200.png b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Square44x44Logo.scale-200.png deleted file mode 100644 index 9327dd748e..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Square44x44Logo.targetsize-24_altform-unplated.png b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index e51416a8e4..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Square44x44Logo.targetsize-48_altform-lightunplated.png b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Square44x44Logo.targetsize-48_altform-lightunplated.png deleted file mode 100644 index bf063eb4d6..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Square44x44Logo.targetsize-48_altform-lightunplated.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/StoreLogo.png b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/StoreLogo.png deleted file mode 100644 index be865f0c37..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/StoreLogo.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/WapProjTemplate.ico b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/WapProjTemplate.ico deleted file mode 100644 index de1185d77f..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/WapProjTemplate.ico and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/WapProjTemplate.wapproj b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/WapProjTemplate.wapproj deleted file mode 100644 index de6d40d79d..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/WapProjTemplate.wapproj +++ /dev/null @@ -1,83 +0,0 @@ - - - - - 15.0 - - - - - Debug - x86 - - - Release - x86 - - - Debug - x64 - - - Release - x64 - - - Debug - ARM64 - - - Release - ARM64 - - - - - $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ - NativeOnly - NativeOnly - false - - - - - - $guid1$ - $targetplatformversion$ - $targetplatformminversion$ - $currentuiculturename$ - $if$($includeKeyFile$==true) - $projectname$_TemporaryKey.pfx - $endif$ - false - - - - - Designer - - $if$($includeKeyFile$==true) - - $endif$ - - - - - - - - - - - - - - - - True - - - - - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Wide310x150Logo.scale-200.png b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Wide310x150Logo.scale-200.png deleted file mode 100644 index 314d297f20..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/WinUI.Desktop.CppWinRT.WapProj.vstemplate b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/WinUI.Desktop.CppWinRT.WapProj.vstemplate deleted file mode 100644 index 1e8db89c9d..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/WinUI.Desktop.CppWinRT.WapProj.vstemplate +++ /dev/null @@ -1,59 +0,0 @@ - - - - true - - - WapProjTemplate.ico - VC - WinUI.Desktop.CppWinRT.WapProj - WapProj - true - WapProjTemplate - true - Enabled - true - true - true - 0 - Windows - cpp - XAML - windows - desktop - WinUI - - - - Package-managed.appxmanifest - SplashScreen.scale-200.png - LockScreenLogo.scale-200.png - Square150x150Logo.scale-200.png - Square44x44Logo.scale-200.png - Square44x44Logo.targetsize-24_altform-unplated.png - Square44x44Logo.targetsize-48_altform-lightunplated.png - StoreLogo.png - Wide310x150Logo.scale-200.png - - - - - - - Microsoft.VisualStudio.Universal.TemplateWizards, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Microsoft.VisualStudio.Universal.TemplateWizards.PlatformVersion.Wizard - - - - Microsoft.VisualStudio.WinRT.TemplateWizards, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Microsoft.VisualStudio.WinRT.TemplateWizards.UpdatePublisherInManifestWizard - - - WindowsAppSDK.Cpp.Extension.Dev17, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - WindowsAppSDK.TemplateUtilities.NuGetPackageInstaller - - - 10.0.17763.0 - true - - diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.csproj b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.csproj deleted file mode 100644 index 3b69eb29ee..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.csproj +++ /dev/null @@ -1,64 +0,0 @@ - - - - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - Debug - AnyCPU - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {80195619-D4CF-4287-BA59-08077486BE1C} - Library - Properties - WinUI.Desktop.CppWinRT.PackagedApp - WinUI.Desktop.CppWinRT.PackagedApp - v4.7.2 - 512 - false - false - false - false - false - false - false - false - false - false - SHA256 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.ico b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.ico deleted file mode 100644 index a84fcbf877..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.ico and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.png b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.png deleted file mode 100644 index 9108ea1fdb..0000000000 Binary files a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.png and /dev/null differ diff --git a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.vstemplate b/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.vstemplate deleted file mode 100644 index 08c4b03884..0000000000 --- a/dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.vstemplate +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - WinUI.Desktop.CppWinRT.PackagedApp.ico - Microsoft.WinUI.Desktop.CppWinRT.PackagedApp - VC - false - App - true - Enabled - true - 2 - Windows - true - WinUI.Desktop.CppWinRT.PackagedApp.png - true - cpp - XAML - windows - desktop - WinUI - - - - WapProj\WinUI.Desktop.CppWinRT.WapProj.vstemplate - BlankApp\WinUI.Desktop.CppWinRT.BlankApp.vstemplate - - - diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/VSPackage.Designer.cs b/dev/Templates/VSIX/Extension/Cpp/Common/VSPackage.Designer.cs index 751ef7436c..8f0e7e75dd 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/VSPackage.Designer.cs +++ b/dev/Templates/VSIX/Extension/Cpp/Common/VSPackage.Designer.cs @@ -369,24 +369,6 @@ internal static string _1043 { } } - /// - /// Looks up a localized string similar to Installing NuGet packages into project.... - /// - internal static string _1044 { - get { - return ResourceManager.GetString("1044", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Operation in progress.... - /// - internal static string _1045 { - get { - return ResourceManager.GetString("1045", resourceCulture); - } - } - /// /// Looks up a localized string similar to Missing Package Reference(s). /// diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/VSPackage.resx b/dev/Templates/VSIX/Extension/Cpp/Common/VSPackage.resx index 826705f735..118f285346 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/VSPackage.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/VSPackage.resx @@ -219,12 +219,6 @@ A project template that creates MSIX packages containing WinUI applications for side-loading or distribution via the Microsoft Store. - - Installing NuGet packages into project... - - - Operation in progress... - Missing Package Reference(s) diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/cs-CZ/VSPackage.cs-CZ.resx b/dev/Templates/VSIX/Extension/Cpp/Common/cs-CZ/VSPackage.cs-CZ.resx index cfb16c1813..48cc8346f2 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/cs-CZ/VSPackage.cs-CZ.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/cs-CZ/VSPackage.cs-CZ.resx @@ -219,12 +219,6 @@ Šablona projektu, která vytváří balíčky MSIX obsahující aplikace WinUI pro instalaci bokem nebo distribuci prostřednictvím Microsoft Store - - Instalují se balíčky NuGet do projektu... - - - Probíhá operace... - Chybějící odkaz(y) na balíček diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/de-DE/VSPackage.de-DE.resx b/dev/Templates/VSIX/Extension/Cpp/Common/de-DE/VSPackage.de-DE.resx index 52bc9004cd..7cf5eb0209 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/de-DE/VSPackage.de-DE.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/de-DE/VSPackage.de-DE.resx @@ -219,12 +219,6 @@ Eine Projektvorlage, die MSIX-Pakete mit WinUI-Anwendungen zum Querladen oder Verteilen über den Microsoft Store erstellt. - - NuGet-Pakete werden in das Projekt installiert... - - - Wird ausgeführt... - Fehlende Paketverweise diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/es-ES/VSPackage.es-ES.resx b/dev/Templates/VSIX/Extension/Cpp/Common/es-ES/VSPackage.es-ES.resx index 232fb37956..f32fc95a9a 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/es-ES/VSPackage.es-ES.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/es-ES/VSPackage.es-ES.resx @@ -219,12 +219,6 @@ Plantilla de proyecto que crea paquetes MSIX que contienen aplicaciones WinUI para la carga o distribución de prueba mediante el Microsoft Store. - - Instalando paquetes NuGet en el proyecto... - - - Operación en progreso... - Faltan referencias de paquete diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/fr-FR/VSPackage.fr-FR.resx b/dev/Templates/VSIX/Extension/Cpp/Common/fr-FR/VSPackage.fr-FR.resx index 72e9ec893e..2383e1316f 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/fr-FR/VSPackage.fr-FR.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/fr-FR/VSPackage.fr-FR.resx @@ -219,12 +219,6 @@ Modèle de projet qui crée des packages MSIX contenant des applications WinUI pour le chargement indépendant ou la distribution via le Microsoft Store. - - Installation des packages NuGet dans le projet... - - - Opération en cours... - Référence(s) de package manquante(s) diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/it-IT/VSPackage.it-IT.resx b/dev/Templates/VSIX/Extension/Cpp/Common/it-IT/VSPackage.it-IT.resx index 0a408934cc..5b90c0e735 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/it-IT/VSPackage.it-IT.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/it-IT/VSPackage.it-IT.resx @@ -219,12 +219,6 @@ Modello di progetto che crea pacchetti MSIX contenenti applicazioni WinUI per il sideload o la distribuzione tramite il Microsoft Store. - - Installazione dei pacchetti NuGet nel progetto... - - - Operazione in corso... - Riferimenti ai pacchetti mancanti diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/ja-JP/VSPackage.ja-JP.resx b/dev/Templates/VSIX/Extension/Cpp/Common/ja-JP/VSPackage.ja-JP.resx index 09e5a09938..ba1a3ed17d 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/ja-JP/VSPackage.ja-JP.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/ja-JP/VSPackage.ja-JP.resx @@ -219,12 +219,6 @@ Microsoft Storeを使用してサイドローディングまたはディストリビューションを行う WinUI アプリケーションを含む MSIX パッケージを作成するプロジェクト テンプレートです。 - - NuGet パッケージをプロジェクトにインストールしています... - - - 操作は実行中です... - パッケージ参照がありません diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/ko-KR/VSPackage.ko-KR.resx b/dev/Templates/VSIX/Extension/Cpp/Common/ko-KR/VSPackage.ko-KR.resx index 75967f706f..08af20c530 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/ko-KR/VSPackage.ko-KR.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/ko-KR/VSPackage.ko-KR.resx @@ -219,12 +219,6 @@ Microsoft Store 통해 테스트용 로드 또는 배포를 위한 WinUI 애플리케이션이 포함된 MSIX 패키지를 만드는 프로젝트 템플릿입니다. - - 프로젝트에 NuGet 패키지를 설치하는 중입니다... - - - 작업이 진행 중입니다. - 누락된 패키지 참조 diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/pl-PL/VSPackage.pl-PL.resx b/dev/Templates/VSIX/Extension/Cpp/Common/pl-PL/VSPackage.pl-PL.resx index 3d54fc8438..a148936b58 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/pl-PL/VSPackage.pl-PL.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/pl-PL/VSPackage.pl-PL.resx @@ -219,12 +219,6 @@ Szablon projektu, który tworzy pakiety MSIX zawierające aplikacje WinUI na potrzeby ładowania bezpośredniego lub dystrybucji za pośrednictwem Microsoft Store. - - Trwa instalowanie pakietów NuGet w projekcie... - - - Operacja w toku... - Brak odwołań do pakietu diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/pt-BR/VSPackage.pt-BR.resx b/dev/Templates/VSIX/Extension/Cpp/Common/pt-BR/VSPackage.pt-BR.resx index b347a9af3b..82ecbe80ca 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/pt-BR/VSPackage.pt-BR.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/pt-BR/VSPackage.pt-BR.resx @@ -219,12 +219,6 @@ Um modelo de projeto que cria pacotes MSIX contendo aplicativos WinUI para side loading ou distribuição por meio do Microsoft Store. - - Instalando pacotes NuGet no projeto... - - - Operação em andamento... - Referências de Pacote Ausentes diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/ru-RU/VSPackage.ru-RU.resx b/dev/Templates/VSIX/Extension/Cpp/Common/ru-RU/VSPackage.ru-RU.resx index bb769c5b80..1a9aeaf4cf 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/ru-RU/VSPackage.ru-RU.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/ru-RU/VSPackage.ru-RU.resx @@ -219,12 +219,6 @@ Шаблон проекта, который создает пакеты MSIX, содержащие приложения WinUI для загрузки неопубликованного приложения или распространения через Microsoft Store. - - Установка пакетов NuGet в проект... - - - Операция выполняется... - Отсутствуют ссылки на пакеты diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/tr-TR/VSPackage.tr-TR.resx b/dev/Templates/VSIX/Extension/Cpp/Common/tr-TR/VSPackage.tr-TR.resx index 98f6631c76..e033876f52 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/tr-TR/VSPackage.tr-TR.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/tr-TR/VSPackage.tr-TR.resx @@ -219,12 +219,6 @@ Takım projesi aracılığıyla dışarıdan yükleme veya dağıtım için WinUI uygulamaları içeren MSIX paketleri Microsoft Store. - - Projeye NuGet paketleri yükleniyor... - - - İşlem sürüyor... - Eksik Paket Başvuruları diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/zh-CN/VSPackage.zh-CN.resx b/dev/Templates/VSIX/Extension/Cpp/Common/zh-CN/VSPackage.zh-CN.resx index 80a04ea0a4..137a5f1006 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/zh-CN/VSPackage.zh-CN.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/zh-CN/VSPackage.zh-CN.resx @@ -219,12 +219,6 @@ 一个项目模板，用于创建 MSIX 包，其中包含用于通过Microsoft Store旁加载或分发的 WinUI 应用程序。 - - 正在将 NuGet 包安装到项目中... - - - 操作在进行中... - 缺少包引用 diff --git a/dev/Templates/VSIX/Extension/Cpp/Common/zh-TW/VSPackage.zh-TW.resx b/dev/Templates/VSIX/Extension/Cpp/Common/zh-TW/VSPackage.zh-TW.resx index a00e090ccd..36daadd15b 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Common/zh-TW/VSPackage.zh-TW.resx +++ b/dev/Templates/VSIX/Extension/Cpp/Common/zh-TW/VSPackage.zh-TW.resx @@ -219,12 +219,6 @@ 此項目範本會建立 MSIX 套件，其中包含 WinUI 應用程式以透過Microsoft Store側載或散發。 - - 正在將 NuGet 套件安裝到專案中... - - - 操作進行中... - 缺少套件參考 diff --git a/dev/Templates/VSIX/Extension/Cpp/Dev17/Component/source.extension.vsixmanifest b/dev/Templates/VSIX/Extension/Cpp/Dev17/Component/source.extension.vsixmanifest index ab7ff03c70..4b761fdfd6 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Dev17/Component/source.extension.vsixmanifest +++ b/dev/Templates/VSIX/Extension/Cpp/Dev17/Component/source.extension.vsixmanifest @@ -1,56 +1,55 @@ - - - - - Windows App SDK C++ VS Templates - The Microsoft Windows App SDK Visual Studio extension adds C++ project and item templates to support building Windows apps and components in VS 2022-2026. - https://github.com/microsoft/WindowsAppSDK/ - LICENSE - https://github.com/microsoft/WindowsAppSDK/ - https://github.com/microsoft/WindowsAppSDK/releases - WindowsAppSDK.png - WindowsAppSDK.png - WindowsAppSDK, WinAppSDK, WinUI, XAML, C++, C++/WinRT - false - - - - amd64 - - - amd64 - - - amd64 - - - arm64 - - - arm64 - - - arm64 - - - - - - - NuGet Package Manager - http://docs.microsoft.com/nuget/ - - - - - - - - - - - - - - + + + + + Windows App SDK C++ VS Templates + The Microsoft Windows App SDK Visual Studio extension adds C++ project and item templates to support building Windows apps and components in VS 2022-2026. + https://github.com/microsoft/WindowsAppSDK/ + LICENSE + https://github.com/microsoft/WindowsAppSDK/ + https://github.com/microsoft/WindowsAppSDK/releases + WindowsAppSDK.png + WindowsAppSDK.png + WindowsAppSDK, WinAppSDK, WinUI, XAML, C++, C++/WinRT + false + + + + amd64 + + + amd64 + + + amd64 + + + arm64 + + + arm64 + + + arm64 + + + + + + + NuGet Package Manager + http://docs.microsoft.com/nuget/ + + + + + + + + + + + + + \ No newline at end of file diff --git a/dev/Templates/VSIX/Extension/Cpp/Dev17/LocalDev/source.extension.vsixmanifest b/dev/Templates/VSIX/Extension/Cpp/Dev17/LocalDev/source.extension.vsixmanifest index 49c4398a9c..16c7f6f1ce 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Dev17/LocalDev/source.extension.vsixmanifest +++ b/dev/Templates/VSIX/Extension/Cpp/Dev17/LocalDev/source.extension.vsixmanifest @@ -1,66 +1,65 @@ - - - - - - Windows App SDK C++ VS Templates (LocalDev) - [LocalDev build] The Microsoft Windows App SDK Visual Studio extension adds C++ project and item templates to support building Windows apps and components in VS 2022-2026. This is a per-user dev-loop build that shadows any workload-shipped copy on the same machine. - https://github.com/microsoft/WindowsAppSDK/ - LICENSE - https://github.com/microsoft/WindowsAppSDK/ - https://github.com/microsoft/WindowsAppSDK/releases - WindowsAppSDK.png - WindowsAppSDK.png - WindowsAppSDK, WinAppSDK, WinUI, XAML, C++, C++/WinRT - - - - amd64 - - - amd64 - - - amd64 - - - arm64 - - - arm64 - - - arm64 - - - - - - - - - NuGet Package Manager - http://docs.microsoft.com/nuget/ - - - - - - - - - - - - - - - + + + + + + Windows App SDK C++ VS Templates (LocalDev) + [LocalDev build] The Microsoft Windows App SDK Visual Studio extension adds C++ project and item templates to support building Windows apps and components in VS 2022-2026. This is a per-user dev-loop build that shadows any workload-shipped copy on the same machine. + https://github.com/microsoft/WindowsAppSDK/ + LICENSE + https://github.com/microsoft/WindowsAppSDK/ + https://github.com/microsoft/WindowsAppSDK/releases + WindowsAppSDK.png + WindowsAppSDK.png + WindowsAppSDK, WinAppSDK, WinUI, XAML, C++, C++/WinRT + + + + amd64 + + + amd64 + + + amd64 + + + arm64 + + + arm64 + + + arm64 + + + + + + + + + NuGet Package Manager + http://docs.microsoft.com/nuget/ + + + + + + + + + + + + + + diff --git a/dev/Templates/VSIX/Extension/Cpp/Dev17/Standalone/source.extension.vsixmanifest b/dev/Templates/VSIX/Extension/Cpp/Dev17/Standalone/source.extension.vsixmanifest index a8857237a5..0c3e7d6bcb 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Dev17/Standalone/source.extension.vsixmanifest +++ b/dev/Templates/VSIX/Extension/Cpp/Dev17/Standalone/source.extension.vsixmanifest @@ -1,57 +1,56 @@ - - - - - Windows App SDK C++ VS Templates - The Microsoft Windows App SDK Visual Studio extension adds C++ project and item templates to support building Windows apps and components in VS 2022-2026. - https://github.com/microsoft/WindowsAppSDK/ - LICENSE - https://github.com/microsoft/WindowsAppSDK/ - https://github.com/microsoft/WindowsAppSDK/releases - WindowsAppSDK.png - WindowsAppSDK.png - WindowsAppSDK, WinAppSDK, WinUI, XAML, C++, C++/WinRT - - - - amd64 - - - amd64 - - - amd64 - - - arm64 - - - arm64 - - - arm64 - - - - - - - - - NuGet Package Manager - http://docs.microsoft.com/nuget/ - - - - - - - - - - - - - - - + + + + + Windows App SDK C++ VS Templates + The Microsoft Windows App SDK Visual Studio extension adds C++ project and item templates to support building Windows apps and components in VS 2022-2026. + https://github.com/microsoft/WindowsAppSDK/ + LICENSE + https://github.com/microsoft/WindowsAppSDK/ + https://github.com/microsoft/WindowsAppSDK/releases + WindowsAppSDK.png + WindowsAppSDK.png + WindowsAppSDK, WinAppSDK, WinUI, XAML, C++, C++/WinRT + + + + amd64 + + + amd64 + + + amd64 + + + arm64 + + + arm64 + + + arm64 + + + + + + + + + NuGet Package Manager + http://docs.microsoft.com/nuget/ + + + + + + + + + + + + + + diff --git a/dev/Templates/VSIX/Extension/Cpp/Dev17/WindowsAppSDK.Cpp.Extension.Dev17.csproj b/dev/Templates/VSIX/Extension/Cpp/Dev17/WindowsAppSDK.Cpp.Extension.Dev17.csproj index 688c0f484e..8e50ca549f 100644 --- a/dev/Templates/VSIX/Extension/Cpp/Dev17/WindowsAppSDK.Cpp.Extension.Dev17.csproj +++ b/dev/Templates/VSIX/Extension/Cpp/Dev17/WindowsAppSDK.Cpp.Extension.Dev17.csproj @@ -138,13 +138,6 @@ false TemplateProjectOutputGroup%3b - - {80195619-D4CF-4287-BA59-08077486BE1C} - WinUI.Desktop.CppWinRT.PackagedApp - ProjectTemplates - false - TemplateProjectOutputGroup%3b - {FD33E535-127D-48AC-8788-0F61FA2A251C} WinUI.Neutral.CppWinRT.RuntimeComponent diff --git a/dev/Templates/VSIX/Extension/Cs/Common/VSPackage.Designer.cs b/dev/Templates/VSIX/Extension/Cs/Common/VSPackage.Designer.cs index 545d4e3a50..23cec063e5 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/VSPackage.Designer.cs +++ b/dev/Templates/VSIX/Extension/Cs/Common/VSPackage.Designer.cs @@ -369,24 +369,6 @@ internal static string _1043 { } } - /// - /// Looks up a localized string similar to Installing NuGet packages into project.... - /// - internal static string _1044 { - get { - return ResourceManager.GetString("1044", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Operation in progress.... - /// - internal static string _1045 { - get { - return ResourceManager.GetString("1045", resourceCulture); - } - } - /// /// Looks up a localized string similar to Missing Package Reference(s). /// diff --git a/dev/Templates/VSIX/Extension/Cs/Common/VSPackage.resx b/dev/Templates/VSIX/Extension/Cs/Common/VSPackage.resx index 9fa8cce5f3..f51d0d389c 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/VSPackage.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/VSPackage.resx @@ -219,12 +219,6 @@ A project template that creates MSIX packages containing WinUI applications for side-loading or distribution via the Microsoft Store. - - Installing NuGet packages into project... - - - Operation in progress... - Missing Package Reference(s) diff --git a/dev/Templates/VSIX/Extension/Cs/Common/cs-CZ/VSPackage.cs-CZ.resx b/dev/Templates/VSIX/Extension/Cs/Common/cs-CZ/VSPackage.cs-CZ.resx index b8e88879e9..9d13c59b90 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/cs-CZ/VSPackage.cs-CZ.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/cs-CZ/VSPackage.cs-CZ.resx @@ -219,12 +219,6 @@ Šablona projektu, která vytváří balíčky MSIX obsahující aplikace WinUI pro instalaci bokem nebo distribuci prostřednictvím Microsoft Store - - Instalují se balíčky NuGet do projektu... - - - Probíhá operace... - Chybějící odkaz(y) na balíček diff --git a/dev/Templates/VSIX/Extension/Cs/Common/de-DE/VSPackage.de-DE.resx b/dev/Templates/VSIX/Extension/Cs/Common/de-DE/VSPackage.de-DE.resx index 2650972cf6..3527f6e537 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/de-DE/VSPackage.de-DE.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/de-DE/VSPackage.de-DE.resx @@ -219,12 +219,6 @@ Eine Projektvorlage, die MSIX-Pakete mit WinUI-Anwendungen zum Querladen oder Verteilen über den Microsoft Store erstellt. - - NuGet-Pakete werden in das Projekt installiert... - - - Wird ausgeführt... - Fehlende Paketverweise diff --git a/dev/Templates/VSIX/Extension/Cs/Common/es-ES/VSPackage.es-ES.resx b/dev/Templates/VSIX/Extension/Cs/Common/es-ES/VSPackage.es-ES.resx index 5572342df6..ba1f511b1f 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/es-ES/VSPackage.es-ES.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/es-ES/VSPackage.es-ES.resx @@ -219,12 +219,6 @@ Plantilla de proyecto que crea paquetes MSIX que contienen aplicaciones WinUI para la carga o distribución de prueba mediante el Microsoft Store. - - Instalando paquetes NuGet en el proyecto... - - - Operación en progreso... - Faltan referencias de paquete diff --git a/dev/Templates/VSIX/Extension/Cs/Common/fr-FR/VSPackage.fr-FR.resx b/dev/Templates/VSIX/Extension/Cs/Common/fr-FR/VSPackage.fr-FR.resx index aca5826922..2d617e8fc7 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/fr-FR/VSPackage.fr-FR.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/fr-FR/VSPackage.fr-FR.resx @@ -219,12 +219,6 @@ Modèle de projet qui crée des packages MSIX contenant des applications WinUI pour le chargement indépendant ou la distribution via le Microsoft Store. - - Installation des packages NuGet dans le projet... - - - Opération en cours... - Référence(s) de package manquante(s) diff --git a/dev/Templates/VSIX/Extension/Cs/Common/it-IT/VSPackage.it-IT.resx b/dev/Templates/VSIX/Extension/Cs/Common/it-IT/VSPackage.it-IT.resx index 05b083d07c..61536c5d09 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/it-IT/VSPackage.it-IT.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/it-IT/VSPackage.it-IT.resx @@ -219,12 +219,6 @@ Modello di progetto che crea pacchetti MSIX contenenti applicazioni WinUI per il sideload o la distribuzione tramite il Microsoft Store. - - Installazione dei pacchetti NuGet nel progetto... - - - Operazione in corso... - Riferimenti ai pacchetti mancanti diff --git a/dev/Templates/VSIX/Extension/Cs/Common/ja-JP/VSPackage.ja-JP.resx b/dev/Templates/VSIX/Extension/Cs/Common/ja-JP/VSPackage.ja-JP.resx index d9581eade4..0ec23bdb55 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/ja-JP/VSPackage.ja-JP.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/ja-JP/VSPackage.ja-JP.resx @@ -219,12 +219,6 @@ Microsoft Storeを使用してサイドローディングまたはディストリビューションを行う WinUI アプリケーションを含む MSIX パッケージを作成するプロジェクト テンプレートです。 - - NuGet パッケージをプロジェクトにインストールしています... - - - 操作は実行中です... - パッケージ参照がありません diff --git a/dev/Templates/VSIX/Extension/Cs/Common/ko-KR/VSPackage.ko-KR.resx b/dev/Templates/VSIX/Extension/Cs/Common/ko-KR/VSPackage.ko-KR.resx index 257d36a74d..70b22b0288 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/ko-KR/VSPackage.ko-KR.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/ko-KR/VSPackage.ko-KR.resx @@ -219,12 +219,6 @@ Microsoft Store 통해 테스트용 로드 또는 배포를 위한 WinUI 애플리케이션이 포함된 MSIX 패키지를 만드는 프로젝트 템플릿입니다. - - 프로젝트에 NuGet 패키지를 설치하는 중입니다... - - - 작업이 진행 중입니다. - 누락된 패키지 참조 diff --git a/dev/Templates/VSIX/Extension/Cs/Common/pl-PL/VSPackage.pl-PL.resx b/dev/Templates/VSIX/Extension/Cs/Common/pl-PL/VSPackage.pl-PL.resx index 39eb8bf2c8..93b0e06f85 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/pl-PL/VSPackage.pl-PL.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/pl-PL/VSPackage.pl-PL.resx @@ -219,12 +219,6 @@ Szablon projektu, który tworzy pakiety MSIX zawierające aplikacje WinUI na potrzeby ładowania bezpośredniego lub dystrybucji za pośrednictwem Microsoft Store. - - Trwa instalowanie pakietów NuGet w projekcie... - - - Operacja w toku... - Brak odwołań do pakietu diff --git a/dev/Templates/VSIX/Extension/Cs/Common/pt-BR/VSPackage.pt-BR.resx b/dev/Templates/VSIX/Extension/Cs/Common/pt-BR/VSPackage.pt-BR.resx index 2a557f4ca9..4fde2b5b85 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/pt-BR/VSPackage.pt-BR.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/pt-BR/VSPackage.pt-BR.resx @@ -219,12 +219,6 @@ Um modelo de projeto que cria pacotes MSIX contendo aplicativos WinUI para side loading ou distribuição por meio do Microsoft Store. - - Instalando pacotes NuGet no projeto... - - - Operação em andamento... - Referências de Pacote Ausentes diff --git a/dev/Templates/VSIX/Extension/Cs/Common/ru-RU/VSPackage.ru-RU.resx b/dev/Templates/VSIX/Extension/Cs/Common/ru-RU/VSPackage.ru-RU.resx index a39f53d54f..73f803acc7 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/ru-RU/VSPackage.ru-RU.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/ru-RU/VSPackage.ru-RU.resx @@ -219,12 +219,6 @@ Шаблон проекта, который создает пакеты MSIX, содержащие приложения WinUI для загрузки неопубликованного приложения или распространения через Microsoft Store. - - Установка пакетов NuGet в проект... - - - Операция выполняется... - Отсутствуют ссылки на пакеты diff --git a/dev/Templates/VSIX/Extension/Cs/Common/tr-TR/VSPackage.tr-TR.resx b/dev/Templates/VSIX/Extension/Cs/Common/tr-TR/VSPackage.tr-TR.resx index a6c4fb6500..8d8964ca8a 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/tr-TR/VSPackage.tr-TR.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/tr-TR/VSPackage.tr-TR.resx @@ -219,12 +219,6 @@ Takım projesi aracılığıyla dışarıdan yükleme veya dağıtım için WinUI uygulamaları içeren MSIX paketleri Microsoft Store. - - Projeye NuGet paketleri yükleniyor... - - - İşlem sürüyor... - Eksik Paket Başvuruları diff --git a/dev/Templates/VSIX/Extension/Cs/Common/zh-CN/VSPackage.zh-CN.resx b/dev/Templates/VSIX/Extension/Cs/Common/zh-CN/VSPackage.zh-CN.resx index 986b3455a2..cd72c64b16 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/zh-CN/VSPackage.zh-CN.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/zh-CN/VSPackage.zh-CN.resx @@ -219,12 +219,6 @@ 一个项目模板，用于创建 MSIX 包，其中包含用于通过Microsoft Store旁加载或分发的 WinUI 应用程序。 - - 正在将 NuGet 包安装到项目中... - - - 操作在进行中... - 缺少包引用 diff --git a/dev/Templates/VSIX/Extension/Cs/Common/zh-TW/VSPackage.zh-TW.resx b/dev/Templates/VSIX/Extension/Cs/Common/zh-TW/VSPackage.zh-TW.resx index 0aa7a4efee..8dee404d82 100644 --- a/dev/Templates/VSIX/Extension/Cs/Common/zh-TW/VSPackage.zh-TW.resx +++ b/dev/Templates/VSIX/Extension/Cs/Common/zh-TW/VSPackage.zh-TW.resx @@ -219,12 +219,6 @@ 此項目範本會建立 MSIX 套件，其中包含 WinUI 應用程式以透過Microsoft Store側載或散發。 - - 正在將 NuGet 套件安裝到專案中... - - - 操作進行中... - 缺少套件參考 diff --git a/dev/Templates/VSIX/Extension/Cs/Dev17/Component/source.extension.vsixmanifest b/dev/Templates/VSIX/Extension/Cs/Dev17/Component/source.extension.vsixmanifest index 910c32e29d..94c74e4f73 100644 --- a/dev/Templates/VSIX/Extension/Cs/Dev17/Component/source.extension.vsixmanifest +++ b/dev/Templates/VSIX/Extension/Cs/Dev17/Component/source.extension.vsixmanifest @@ -1,4 +1,4 @@ - + @@ -53,7 +53,6 @@ - diff --git a/dev/Templates/VSIX/Extension/Cs/Dev17/LocalDev/source.extension.vsixmanifest b/dev/Templates/VSIX/Extension/Cs/Dev17/LocalDev/source.extension.vsixmanifest index 46e5715002..e4e1872091 100644 --- a/dev/Templates/VSIX/Extension/Cs/Dev17/LocalDev/source.extension.vsixmanifest +++ b/dev/Templates/VSIX/Extension/Cs/Dev17/LocalDev/source.extension.vsixmanifest @@ -97,7 +97,6 @@ - diff --git a/dev/Templates/VSIX/Extension/Cs/Dev17/Standalone/source.extension.vsixmanifest b/dev/Templates/VSIX/Extension/Cs/Dev17/Standalone/source.extension.vsixmanifest index 7b967fe8a1..d715c48064 100644 --- a/dev/Templates/VSIX/Extension/Cs/Dev17/Standalone/source.extension.vsixmanifest +++ b/dev/Templates/VSIX/Extension/Cs/Dev17/Standalone/source.extension.vsixmanifest @@ -53,7 +53,6 @@ - diff --git a/dev/Templates/VSIX/Shared/WizardImplementation.cs b/dev/Templates/VSIX/Shared/WizardImplementation.cs index 9efc116f77..65897e132e 100644 --- a/dev/Templates/VSIX/Shared/WizardImplementation.cs +++ b/dev/Templates/VSIX/Shared/WizardImplementation.cs @@ -40,8 +40,6 @@ public partial class NuGetPackageInstaller : IWizard private Project _project; private IComponentModel _componentModel; private IEnumerable _nuGetPackages; - private IVsNuGetProjectUpdateEvents _nugetProjectUpdateEvents; - private IVsThreadedWaitDialog2 _waitDialog; private Dictionary _failedPackageExceptions = new Dictionary(); public void RunStarted(object automationObject, Dictionary replacementsDictionary, WizardRunKind runKind, object[] customParams) @@ -54,20 +52,6 @@ public void RunStarted(object automationObject, Dictionary repla System.Diagnostics.Debug.WriteLine("Warning: Could not obtain IComponentModel service."); } - _waitDialog = ServiceProvider.GlobalProvider.GetService(typeof(SVsThreadedWaitDialog)) as IVsThreadedWaitDialog2; - if (_waitDialog == null) - { - System.Diagnostics.Debug.WriteLine("Warning: Could not obtain IVsThreadedWaitDialog2 service."); - } - - if (_componentModel != null) - { - _nugetProjectUpdateEvents = _componentModel.GetService(); - if (_nugetProjectUpdateEvents != null) - { - _nugetProjectUpdateEvents.SolutionRestoreFinished += OnSolutionRestoreFinished; - } - } // Assuming package list is passed via a custom parameter in the .vstemplate file if (replacementsDictionary.TryGetValue("$NuGetPackages$", out string packages)) { @@ -94,33 +78,12 @@ private async Task InstallNuGetPackagesAsync() await ThreadHelper.JoinableTaskFactory.RunAsync(async () => { await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(); - int canceled = 0; // Initialize as not canceled - - // Start the package installation task but do not await it here - var installationTask = StartInstallationAsync(); - - // Start the threaded wait dialog - if (_waitDialog != null) - { - _waitDialog.StartWaitDialog(null, Resources._1044, null, null, Resources._1045, 0, false, true); - } - // Now await the installation task to complete - await installationTask; + // Install the packages, then persist the generated project(s). + await StartInstallationAsync(); - // Once the installation is complete, end the wait dialog - if (_waitDialog != null) - { - _waitDialog.EndWaitDialog(out canceled); - } - - // If _waitDialog is null, canceled remains 0 (not canceled) - // Check if the process was canceled before proceeding - if (canceled == 0) // If not canceled, finalize the process - { - await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(); - SaveAllProjects(); - } + await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(); + SaveAllProjects(); }); } @@ -144,7 +107,7 @@ private async Task StartInstallationAsync() if (_project == null) { await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(); - LogError("Project reference is null. Likely a ProjectGroup vstemplate."); + LogError("Project reference is null; skipping NuGet package installation."); return; } @@ -229,52 +192,6 @@ private void SaveAllProjects() } } - private void OnSolutionRestoreFinished(IReadOnlyList projects) - { - ThreadHelper.JoinableTaskFactory.Run(async delegate - { - // Accessing _project requires the main thread - await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(); - - if (_project == null) - { - return; - } - - // Normally, either InstallNuGetPackagesAsync is called from ProjectFinishedGenerating - // for VC++ projects (C++ templates) or from here for C# and wapproj projects. In the - // C++ wapproj template, InstallNuGetPackagesAsync() was called twice for the vcxproj, - // once from each location. This caused the NuGet install API to throw an - // InvalidOperationException because the package was already installed. - // This check prevents the double installation attempt. - Guid _projectGuid = GetProjectGuid(_project); - if (_projectGuid.Equals(SolutionVCProjectGuid)) - { - if (_failedPackageExceptions.Count > 0) - { - var errorMessage = CreateErrorMessage(ErrorMessageFormat.InfoBar); - LogError(errorMessage); - _ = DisplayInfoBarAsync(errorMessage); - return; - } - return; - } - else - { - // Debouncing prevents multiple rapid executions of 'InstallNuGetPackageAsync' - // during solution restore. - if (_nugetProjectUpdateEvents == null) - { - return; - } - _nugetProjectUpdateEvents.SolutionRestoreFinished -= OnSolutionRestoreFinished; - var joinableTaskFactory = new JoinableTaskFactory(ThreadHelper.JoinableTaskContext); - - _ = joinableTaskFactory.RunAsync(InstallNuGetPackagesAsync); - } - }); - } - private string CreateErrorMessage(ErrorMessageFormat format) { ThreadHelper.ThrowIfNotOnUIThread(); diff --git a/dev/Templates/VSIX/WindowsAppSDK.Extension.sln b/dev/Templates/VSIX/WindowsAppSDK.Extension.sln index 4b5f35d0ea..af79d4b3c6 100644 --- a/dev/Templates/VSIX/WindowsAppSDK.Extension.sln +++ b/dev/Templates/VSIX/WindowsAppSDK.Extension.sln @@ -64,10 +64,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp", "CSharp", "{EC44EE EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.Desktop.Cs.ClassLibrary", "..\Source\ProjectTemplates\Desktop\CSharp\ClassLibrary\WinUI.Desktop.Cs.ClassLibrary.csproj", "{33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.Desktop.Cs.PackagedApp", "..\Source\ProjectTemplates\Desktop\CSharp\PackagedApp\WinUI.Desktop.Cs.PackagedApp.csproj", "{938DD23E-270E-488B-AC4C-CA68A545A8F2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUI.Desktop.CppWinRT.PackagedApp", "..\Source\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}" @@ -163,14 +159,6 @@ Global {33783A04-0CB4-4CE5-A9FE-82E2E7E06D1F}.Debug|Any CPU.Build.0 = Debug|Any CPU {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 - {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}.Release|Any CPU.ActiveCfg = Release|Any CPU - {938DD23E-270E-488B-AC4C-CA68A545A8F2}.Release|Any CPU.Build.0 = Release|Any CPU - {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}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80195619-D4CF-4287-BA59-08077486BE1C}.Release|Any CPU.Build.0 = Release|Any CPU {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}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -243,8 +231,6 @@ Global {17320A27-C039-4973-95AA-ACB3EFA1D47E} = {46667165-BDC3-4FC2-9BC3-E4B1AEB1E05B} {EC44EE95-8EC9-4EE5-A8A6-E6BE2F32C843} = {F27A31A1-917C-4E75-B2A5-EEC55B287150} {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} diff --git a/dev/Templates/templates.props b/dev/Templates/templates.props index 640ff68352..34fad3ad03 100644 --- a/dev/Templates/templates.props +++ b/dev/Templates/templates.props @@ -15,7 +15,7 @@ ProjectTemplate yes yes ItemTemplate yes yes single-file 'Add New Item' templates (Page, UserControl, ...) - VsixOnlyProjectTemplate no yes e.g. .wapproj-based packaging not usable from the CLI + VsixOnlyProjectTemplate no yes (framework slot; no instances today) DotnetNewOnlyProjectTemplate yes no (framework slot; no instances today) VsixOnlyItemTemplate no yes (framework slot; no instances today) @@ -104,14 +104,17 @@ - - WinUI.Desktop.Cs.PackagedApp - $(MSBuildThisFileDirectory)Source\ProjectTemplates\Desktop\CSharp\PackagedApp -