[release/1.4-stable] Various fixes for C++ project and item templates (#3745) #3754
Conversation
This file contains 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
This is a partial adoption of #3619 by @JaiganeshKumaran in order to expedite the merging of the changes from that PR which do not need additional time for discussion. The individual changes that were extracted from the aforementioned PR are as follows: - Removed usage of InitializeComponent as it's no longer recommended by C++/WinRT (see https://github.com/microsoft/cppwinrt/tree/master/nuget#initializecomponent for more details). - Removed Microsoft copyright notice. - Removed #include XAML headers in a template control header. This was in the C++/WinRT templates because a runtime component will not include XAML headers in pch.h, which is no longer the case with a WinUI 3 runtime component. - Made the WinUI 3 runtime component "desktop-only" as WinUI 3 cannot be used by UWP apps. This is a fix for #1780. (Note that unlike the original PR the source directory structure is not being changed in order to minimize potential merge conflicts.) - Removed App.idl because it's empty and not needed. - Indented App.xaml.cpp's content inside the implementation namespace, rather than `using namespace` for consistency with the rest of the code. Also removed `using namespace` for namespaces that aren't actually used (Controls and Navigation namespaces were needed for Frame navigation, which isn't performed in the WinUI 3 template. IInspectable is available as an alias in every WinRT implementation type, thus doesn't require prefixing it with Windows::Foundation). Additionally, this PR replaces `<ProjectTypeTag>uwp</ProjectTypeTag>` with `<ProjectTypeTag>WinUI</ProjectTypeTag>` (or just adds the latter if the former was not present at all) in the item templates. I don't believe this tag is surfaced anywhere in the Visual Studio UI but the consistency makes me happier. --------- Co-authored-by: Jaiganésh Kumaran <[email protected]> (cherry picked from commit 18ada2f)
evelynwu-msft
changed the title
|
/azp run |
|
Azure Pipelines could not run because the pipeline triggers exclude this branch/path. |
dmachaj
reviewed
Jul 21, 2023
| #pragma once | ||
| #include <windows.h> |
dmachaj
reviewed
Jul 21, 2023
| #include <winrt/Microsoft.UI.Xaml.Navigation.h> | ||
| #include <winrt/Microsoft.UI.Xaml.Shapes.h> | ||
| #include <winrt/Microsoft.UI.Dispatching.h> | ||
| #include <wil/cppwinrt_helpers.h> |
There was a problem hiding this comment.
No. That header file's sole purpose is to support async calls (WIL is where resume_foreground ended up landing). More generally, I recall there was resistance in the past to the project templates automatically opting in developers to using WIL which is why we limit our usage to that one header file. If the functionality hadn't ended up in WIL then we wouldn't even have a Nuget package reference to it in the first place.
dmachaj
reviewed
Jul 21, 2023
| #include <winrt/Microsoft.UI.Xaml.Navigation.h> | ||
| #include <winrt/Microsoft.UI.Xaml.Shapes.h> | ||
| #include <winrt/Microsoft.UI.Dispatching.h> | ||
| #include <wil/cppwinrt_helpers.h> |
evelynwu-msft
deleted the
user/evelynwu/cherrypick-cppwinrt-template-updates-onto-release-1.4-stable
branch
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.
This is a partial adoption of #3619 by @JaiganeshKumaran in order to expedite the merging of the changes from that PR which do not need additional time for discussion. The individual changes that were extracted from the aforementioned PR are as follows:
using namespacefor consistency with the rest of the code. Also removedusing namespacefor namespaces that aren't actually used (Controls and Navigation namespaces were needed for Frame navigation, which isn't performed in the WinUI 3 template. IInspectable is available as an alias in every WinRT implementation type, thus doesn't require prefixing it with Windows::Foundation).Additionally, this PR replaces
<ProjectTypeTag>uwp</ProjectTypeTag>with<ProjectTypeTag>WinUI</ProjectTypeTag>(or just adds the latter if the former was not present at all) in the item templates. I don't believe this tag is surfaced anywhere in the Visual Studio UI but the consistency makes me happier.Co-authored-by: Jaiganésh Kumaran [email protected]
(cherry picked from commit 18ada2f)