Remove wizard logic for .wapproj templates (Review #6606 first)#6608
Draft
lauren-ciha wants to merge 10 commits into
Draft
Remove wizard logic for .wapproj templates (Review #6606 first)#6608lauren-ciha wants to merge 10 commits into
lauren-ciha wants to merge 10 commits into
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR cleans up the Windows App SDK VSIX templates after the removal of the .wapproj-based “PackagedApp” templates by deleting now-obsolete template assets and simplifying the VSIX NuGet wizard implementation (removing solution-restore event handling, debouncing, and wait-dialog strings/UI).
Changes:
- Removes the
.wapproj-based PackagedApp template projects (C# + C++/WinRT) and all VSIX references to them (solution, manifests, project references). - Simplifies
NuGetPackageInstallerby removingOnSolutionRestoreFinished-based flow and wait dialog logic; package installation proceeds directly for VC++ projects. - Removes now-unused localized strings (1044/1045) and their generated
VSPackage.Designer.csaccessors for both C# and C++ extensions.
Reviewed changes
Copilot reviewed 72 out of 101 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| dev/Templates/VSIX/WindowsAppSDK.Extension.sln | Drops PackagedApp wrapper projects from the VSIX build solution. |
| dev/Templates/VSIX/Shared/WizardImplementation.cs | Removes solution-restore/wait-dialog logic from NuGet wizard; keeps direct install path. |
| dev/Templates/VSIX/Extension/Cs/Dev17/Standalone/source.extension.vsixmanifest | Removes PackagedApp project template asset from C# Standalone VSIX. |
| dev/Templates/VSIX/Extension/Cs/Dev17/LocalDev/source.extension.vsixmanifest | Removes PackagedApp project template asset from C# LocalDev VSIX. |
| dev/Templates/VSIX/Extension/Cs/Dev17/Component/source.extension.vsixmanifest | Removes PackagedApp project template asset from C# Component VSIX. |
| dev/Templates/VSIX/Extension/Cs/Common/VSPackage.resx | Removes wait-dialog string resources (1044/1045) for C# extension. |
| dev/Templates/VSIX/Extension/Cs/Common/VSPackage.Designer.cs | Removes generated accessors for deleted resources (1044/1045) for C# extension. |
| dev/Templates/VSIX/Extension/Cs/Common/zh-TW/VSPackage.zh-TW.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cs/Common/zh-CN/VSPackage.zh-CN.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cs/Common/tr-TR/VSPackage.tr-TR.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cs/Common/ru-RU/VSPackage.ru-RU.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cs/Common/pt-BR/VSPackage.pt-BR.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cs/Common/pl-PL/VSPackage.pl-PL.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cs/Common/ko-KR/VSPackage.ko-KR.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cs/Common/ja-JP/VSPackage.ja-JP.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cs/Common/it-IT/VSPackage.it-IT.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cs/Common/fr-FR/VSPackage.fr-FR.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cs/Common/es-ES/VSPackage.es-ES.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cs/Common/de-DE/VSPackage.de-DE.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cs/Common/cs-CZ/VSPackage.cs-CZ.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cpp/Dev17/WindowsAppSDK.Cpp.Extension.Dev17.csproj | Removes PackagedApp wrapper template project reference from C++ VSIX. |
| dev/Templates/VSIX/Extension/Cpp/Dev17/Standalone/source.extension.vsixmanifest | Removes PackagedApp project template asset and reflows formatting. |
| dev/Templates/VSIX/Extension/Cpp/Dev17/LocalDev/source.extension.vsixmanifest | Removes PackagedApp project template asset and reflows formatting. |
| dev/Templates/VSIX/Extension/Cpp/Dev17/Component/source.extension.vsixmanifest | Removes PackagedApp project template asset and reflows formatting. |
| dev/Templates/VSIX/Extension/Cpp/Common/VSPackage.resx | Removes wait-dialog string resources (1044/1045) for C++ extension. |
| dev/Templates/VSIX/Extension/Cpp/Common/VSPackage.Designer.cs | Removes generated accessors for deleted resources (1044/1045) for C++ extension. |
| dev/Templates/VSIX/Extension/Cpp/Common/zh-TW/VSPackage.zh-TW.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cpp/Common/zh-CN/VSPackage.zh-CN.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cpp/Common/tr-TR/VSPackage.tr-TR.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cpp/Common/ru-RU/VSPackage.ru-RU.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cpp/Common/pt-BR/VSPackage.pt-BR.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cpp/Common/pl-PL/VSPackage.pl-PL.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cpp/Common/ko-KR/VSPackage.ko-KR.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cpp/Common/ja-JP/VSPackage.ja-JP.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cpp/Common/it-IT/VSPackage.it-IT.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cpp/Common/fr-FR/VSPackage.fr-FR.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cpp/Common/es-ES/VSPackage.es-ES.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cpp/Common/de-DE/VSPackage.de-DE.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/VSIX/Extension/Cpp/Common/cs-CZ/VSPackage.cs-CZ.resx | Removes localized wait-dialog strings (1044/1045). |
| dev/Templates/templates.props | Removes old VsixOnlyProjectTemplate instance; documents reserved slot usage. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.vstemplate | Deletes deprecated .wapproj-based C# PackagedApp template entrypoint. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WinUI.Desktop.Cs.PackagedApp.csproj | Deletes deprecated C# PackagedApp template wrapper project. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/WinUI.Desktop.Cs.WapProj.vstemplate | Deletes deprecated C# WapProj sub-template. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/WapProjTemplate.wapproj | Deletes deprecated C# WapProj project file. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/WapProj/Package-managed.appxmanifest | Deletes deprecated C# WapProj appxmanifest. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/WinUI.Desktop.Cs.BlankApp.vstemplate | Deletes deprecated C# BlankApp sub-template under PackagedApp. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/Properties/PublishProfiles/win-x86.pubxml | Deletes deprecated publish profile asset. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/Properties/PublishProfiles/win-x64.pubxml | Deletes deprecated publish profile asset. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/Properties/PublishProfiles/win-arm64.pubxml | Deletes deprecated publish profile asset. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/ProjectTemplate.csproj | Deletes deprecated C# PackagedApp project template .csproj. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml.cs | Deletes deprecated C# template source file. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/MainWindow.xaml | Deletes deprecated C# template XAML. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml.cs | Deletes deprecated C# template source file. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/App.xaml | Deletes deprecated C# template XAML. |
| dev/Templates/Source/ProjectTemplates/Desktop/CSharp/PackagedApp/BlankApp/app.manifest | Deletes deprecated C# template app manifest. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.vstemplate | Deletes deprecated .wapproj-based C++/WinRT PackagedApp template entrypoint. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WinUI.Desktop.CppWinRT.PackagedApp.csproj | Deletes deprecated C++/WinRT PackagedApp template wrapper project. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/WinUI.Desktop.CppWinRT.WapProj.vstemplate | Deletes deprecated C++/WinRT WapProj sub-template. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/WapProjTemplate.wapproj | Deletes deprecated C++/WinRT WapProj project file. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/WapProj/Package-managed.appxmanifest | Deletes deprecated C++/WinRT WapProj appxmanifest. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/WinUI.Desktop.CppWinRT.BlankApp.vstemplate | Deletes deprecated C++/WinRT BlankApp sub-template under PackagedApp. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/readme.txt | Deletes deprecated template readme asset. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj.filters | Deletes deprecated C++/WinRT template filters file. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj | Deletes deprecated C++/WinRT template project file. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/pch.h | Deletes deprecated C++/WinRT template PCH header. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/pch.cpp | Deletes deprecated C++/WinRT template PCH source. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.xaml | Deletes deprecated C++/WinRT template XAML. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.idl | Deletes deprecated C++/WinRT template IDL. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.h | Deletes deprecated C++/WinRT template header. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/MainWindow.cpp | Deletes deprecated C++/WinRT template source. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/App.xaml | Deletes deprecated C++/WinRT template App XAML. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/app.manifest | Deletes deprecated C++/WinRT template app manifest. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/App.h | Deletes deprecated C++/WinRT template App header. |
| dev/Templates/Source/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/App.cpp | Deletes deprecated C++/WinRT template App source. |
Files not reviewed (2)
- dev/Templates/VSIX/Extension/Cpp/Common/VSPackage.Designer.cs: Generated file
- dev/Templates/VSIX/Extension/Cs/Common/VSPackage.Designer.cs: Generated file
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
After the removal of the wapproj templates (#6606), some sections of the VSIX
NuGetPackageInstallerwizard are no longer needed, namely:OnSolutionRestoreevent handlersOnSolutionRestoredebouncing logicValidation:
A microsoft employee must use /azp run to validate using the pipelines below.
WARNING:
Comments made by azure-pipelines bot maybe inaccurate.
Please see pipeline link to verify that the build is being ran.
For status checks on the main branch, please use TransportPackage-Foundation-PR
(https://microsoft.visualstudio.com/ProjectReunion/_build?definitionId=81063&_a=summary)
and run the build against your PR branch with the default parameters.