From 461167dcdd756f9b9e4e59984dd96019c567e709 Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Mon, 21 Aug 2023 20:43:58 -0500 Subject: [PATCH 01/23] Added C++/WinRT blank app code --- .../ProjectTemplates/BlankApp/App.cpp | 118 ++++++++++++ .../ProjectTemplates/BlankApp/App.h | 13 ++ .../ProjectTemplates/BlankApp/App.idl | 3 + .../ProjectTemplates/BlankApp/App.xaml | 7 + .../BlankApp/BlankApp.vcxproj | 168 ++++++++++++++++++ .../BlankApp/BlankApp.vcxproj.filters | 63 +++++++ .../ProjectTemplates/BlankApp/LICENSE | 22 +++ .../BlankApp/LockScreenLogo.scale-200.png | Bin 0 -> 1430 bytes .../ProjectTemplates/BlankApp/MainPage.cpp | 24 +++ .../ProjectTemplates/BlankApp/MainPage.h | 27 +++ .../ProjectTemplates/BlankApp/MainPage.idl | 9 + .../ProjectTemplates/BlankApp/MainPage.xaml | 13 ++ .../BlankApp/Package.appxmanifest | 32 ++++ .../BlankApp/PropertySheet.props | 16 ++ .../BlankApp/SplashScreen.scale-200.png | Bin 0 -> 7700 bytes .../BlankApp/Square150x150Logo.scale-200.png | Bin 0 -> 2937 bytes .../BlankApp/Square44x44Logo.scale-200.png | Bin 0 -> 1647 bytes ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 1255 bytes .../ProjectTemplates/BlankApp/StoreLogo.png | Bin 0 -> 1451 bytes .../BlankApp/Wide310x150Logo.scale-200.png | Bin 0 -> 3204 bytes .../BlankApp/cppwinrt_BlankApp.vstemplate | 58 ++++++ .../ProjectTemplates/BlankApp/pch.cpp | 1 + .../ProjectTemplates/BlankApp/pch.h | 15 ++ .../ProjectTemplates/BlankApp/readme.txt | 23 +++ 24 files changed, 612 insertions(+) create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.cpp create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.h create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.idl create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.xaml create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/LICENSE create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/LockScreenLogo.scale-200.png create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.cpp create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.h create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.idl create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.xaml create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Package.appxmanifest create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/PropertySheet.props create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/SplashScreen.scale-200.png create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square150x150Logo.scale-200.png create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square44x44Logo.scale-200.png create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square44x44Logo.targetsize-24_altform-unplated.png create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/StoreLogo.png create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Wide310x150Logo.scale-200.png create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/pch.cpp create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/pch.h create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/readme.txt diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.cpp b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.cpp new file mode 100644 index 0000000..2f3132d --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.cpp @@ -0,0 +1,118 @@ +#include "pch.h" + +#include "App.h" +#include "MainPage.h" + +using namespace winrt; +using namespace Windows::ApplicationModel; +using namespace Windows::ApplicationModel::Activation; +using namespace Windows::Foundation; +using namespace Windows::UI::Xaml; +using namespace Windows::UI::Xaml::Controls; +using namespace Windows::UI::Xaml::Navigation; +using namespace $safeprojectname$; +using namespace $safeprojectname$::implementation; + +/// +/// Creates 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() +{ + Suspending({ this, &App::OnSuspending }); + +#if defined _DEBUG && !defined DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION + UnhandledException([this](IInspectable const&, UnhandledExceptionEventArgs const& e) + { + if (IsDebuggerPresent()) + { + auto errorMessage = e.Message(); + __debugbreak(); + } + }); +#endif +} + +/// +/// Invoked when the application is launched normally by the end user. Other entry points +/// will be used such as when the application is launched to open a specific file. +/// +/// Details about the launch request and process. +void App::OnLaunched(LaunchActivatedEventArgs const& e) +{ + Frame rootFrame{ nullptr }; + auto content = Window::Current().Content(); + if (content) + { + rootFrame = content.try_as(); + } + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (rootFrame == nullptr) + { + // Create a Frame to act as the navigation context and associate it with + // a SuspensionManager key + rootFrame = Frame(); + + rootFrame.NavigationFailed({ this, &App::OnNavigationFailed }); + + if (e.PreviousExecutionState() == ApplicationExecutionState::Terminated) + { + // Restore the saved session state only when appropriate, scheduling the + // final launch steps after the restore is complete + } + + if (e.PrelaunchActivated() == false) + { + if (rootFrame.Content() == nullptr) + { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a navigation + // parameter + rootFrame.Navigate(xaml_typename<$safeprojectname$::MainPage>(), box_value(e.Arguments())); + } + // Place the frame in the current Window + Window::Current().Content(rootFrame); + // Ensure the current window is active + Window::Current().Activate(); + } + } + else + { + if (e.PrelaunchActivated() == false) + { + if (rootFrame.Content() == nullptr) + { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a navigation + // parameter + rootFrame.Navigate(xaml_typename<$safeprojectname$::MainPage>(), box_value(e.Arguments())); + } + // Ensure the current window is active + Window::Current().Activate(); + } + } +} + +/// +/// Invoked when application execution is being suspended. Application state is saved +/// without knowing whether the application will be terminated or resumed with the contents +/// of memory still intact. +/// +/// The source of the suspend request. +/// Details about the suspend request. +void App::OnSuspending([[maybe_unused]] IInspectable const& sender, [[maybe_unused]] SuspendingEventArgs const& e) +{ + // Save application state and stop any background activity +} + +/// +/// Invoked when Navigation to a certain page fails +/// +/// The Frame which failed navigation +/// Details about the navigation failure +void App::OnNavigationFailed(IInspectable const&, NavigationFailedEventArgs const& e) +{ + throw hresult_error(E_FAIL, hstring(L"Failed to load Page ") + e.SourcePageType().Name); +} \ No newline at end of file diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.h b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.h new file mode 100644 index 0000000..b7fe65e --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.h @@ -0,0 +1,13 @@ +#pragma once +#include "App.xaml.g.h" + +namespace winrt::$safeprojectname$::implementation +{ + struct App : AppT + { + App(); + void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs const&); + void OnSuspending(IInspectable const&, Windows::ApplicationModel::SuspendingEventArgs const&); + void OnNavigationFailed(IInspectable const&, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs const&); + }; +} diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.idl b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.idl new file mode 100644 index 0000000..02ebf5f --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.idl @@ -0,0 +1,3 @@ +namespace $safeprojectname$ +{ +} diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.xaml b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.xaml new file mode 100644 index 0000000..95c703a --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.xaml @@ -0,0 +1,7 @@ + + + diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj new file mode 100644 index 0000000..af2b419 --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj @@ -0,0 +1,168 @@ + + + + true + true + true + true + {$guid1$} + $projectname$ + $safeprojectname$ + en-US + 15.0 + true + Windows Store + 10.0 + $targetplatformversion$ + 10.0.17134.0 + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + Application + v143 + v142 + v141 + v140 + Unicode + + + true + true + + + false + true + false + + + + + + + + + + + + + + Use + pch.h + $(IntDir)pch.pch + Level4 + %(AdditionalOptions) /bigobj + WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions) + + + false + + + + + _DEBUG;%(PreprocessorDefinitions) + + + + + NDEBUG;%(PreprocessorDefinitions) + + + true + true + + + + + + App.xaml + + + MainPage.xaml + + + + + Designer + + + Designer + + + + + Designer + + + + + + + + + + + + + + Create + + + App.xaml + + + MainPage.xaml + + + + + + App.xaml + + + MainPage.xaml + + + + + + false + + + + + + diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters new file mode 100644 index 0000000..178fb4e --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + Generated Files + + + + + + + + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + + + + + + {e48dc53e-40b1-40cb-970a-f89935452892} + + + + + + + + + \ No newline at end of file diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/LICENSE b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/LICENSE new file mode 100644 index 0000000..c4dc89d --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/LICENSE @@ -0,0 +1,22 @@ + MIT License + + Copyright (c) YourOrdinaryCat. + Copyright (c) Microsoft Corporation. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE \ No newline at end of file diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/LockScreenLogo.scale-200.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/LockScreenLogo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..735f57adb5dfc01886d137b4e493d7e97cf13af3 GIT binary patch literal 1430 zcmaJ>TTC2P7~aKltDttVHYH6u8Io4i*}3fO&d$gd*bA_<3j~&e7%8(eXJLfhS!M@! zKrliY>>6yT4+Kr95$!DoD(Qn-5TP|{V_KS`k~E6(LGS@#`v$hQo&^^BKsw3HIsZBT z_y6C2n`lK@apunKojRQ^(_P}Mgewt$(^BBKCTZ;*xa?J3wQ7~@S0lUvbcLeq1Bg4o zH-bvQi|wt~L7q$~a-gDFP!{&TQfc3fX*6=uHv* zT&1&U(-)L%Xp^djI2?~eBF2cxC@YOP$+9d?P&h?lPy-9M2UT9fg5jKm1t$m#iWE{M zIf%q9@;fyT?0UP>tcw-bLkz;s2LlKl2qeP0w zECS7Ate+Awk|KQ+DOk;fl}Xsy4o^CY=pwq%QAAKKl628_yNPsK>?A>%D8fQG6IgdJ ztnxttBz#NI_a@fk7SU`WtrpsfZsNs9^0(2a z@C3#YO3>k~w7?2hipBf{#b6`}Xw1hlG$yi?;1dDs7k~xDAw@jiI*+tc;t2Lflg&bM)0!Y;0_@=w%`LW^8DsYpS#-bLOklX9r?Ei}TScw|4DbpW%+7 zFgAI)f51s}{y-eWb|vrU-Ya!GuYKP)J7z#*V_k^Xo>4!1Yqj*m)x&0L^tg3GJbVAJ zJ-Pl$R=NAabouV=^z_t;^K*0AvFs!vYU>_<|I^#c?>>CR<(T?=%{;U=aI*SbZADLH z&(f2wz_Y0??Tf|g;?|1Znw6}6U43Q#qNRwv1vp9uFn1)V#*4p&%$mP9x&15^OaBiDS(XppT|z^>;B{PLVEbS3IFYV yGvCsSX*m literal 0 HcmV?d00001 diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.cpp b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.cpp new file mode 100644 index 0000000..af94324 --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.cpp @@ -0,0 +1,24 @@ +#include "pch.h" +#include "MainPage.h" +#include "MainPage.g.cpp" + +using namespace winrt; +using namespace Windows::UI::Xaml; + +namespace winrt::$safeprojectname$::implementation +{ + int32_t MainPage::MyProperty() + { + throw hresult_not_implemented(); + } + + void MainPage::MyProperty(int32_t /* value */) + { + throw hresult_not_implemented(); + } + + void MainPage::ClickHandler(IInspectable const&, RoutedEventArgs const&) + { + myButton().Content(box_value(L"Clicked")); + } +} diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.h b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.h new file mode 100644 index 0000000..92e0a68 --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.h @@ -0,0 +1,27 @@ +#pragma once + +#include "MainPage.g.h" + +namespace winrt::$safeprojectname$::implementation +{ + struct MainPage : MainPageT + { + MainPage() + { + // 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); + + void ClickHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args); + }; +} + +namespace winrt::$safeprojectname$::factory_implementation +{ + struct MainPage : MainPageT + { + }; +} diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.idl b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.idl new file mode 100644 index 0000000..c382ebf --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.idl @@ -0,0 +1,9 @@ +namespace $safeprojectname$ +{ + [default_interface] + runtimeclass MainPage : Windows.UI.Xaml.Controls.Page + { + MainPage(); + Int32 MyProperty; + } +} diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.xaml b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.xaml new file mode 100644 index 0000000..f58acc5 --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.xaml @@ -0,0 +1,13 @@ + + + + + + diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Package.appxmanifest b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Package.appxmanifest new file mode 100644 index 0000000..b447558 --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Package.appxmanifest @@ -0,0 +1,32 @@ + + + + + + $projectname$ + $XmlEscapedPublisher$ + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/PropertySheet.props b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/PropertySheet.props new file mode 100644 index 0000000..e34141b --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/PropertySheet.props @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/SplashScreen.scale-200.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/SplashScreen.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..023e7f1feda78d5100569825acedfd213a0d84e9 GIT binary patch literal 7700 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 literal 0 HcmV?d00001 diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square150x150Logo.scale-200.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..af49fec1a5484db1d52a7f9b5ec90a27c7030186 GIT binary patch literal 2937 zcma)84OCO-8BSud5)jwMLRVKgX(S?$n?Ld|vrsm<$CF7)&zTbyy1FE5bU`Q17MRv`9ue$;R(@8kR;#vJ*IM0>cJIAOte!d7oRgdH zd%ySjdB6L9=gX^A6)VzH7p2l@v~3zJAMw|DFy#^)F@@F*`mqUn=Il>l)8_+ab;nOW{%+iPx z+s{Eu|&pIs)Z7{La9~?xKfyl z#43?gjEL15d4WbOZo#SiP%>DB^+BcnJ=7dHEe;r#G=tuw|ka z%q@}##Uh7;tc%L_64m(kHtw74ty%BJMb)_1)#S0j`)F8_1jF7vScpsnH=0V19bO8y zR`0SjIdCUo&=>JwMQF8KHA<{ODHTiQh}0^@5QRmCA?gOH6_H3K^-_sNB^RrdNuK-R zOO*vOrKCVvDwgUck`kF(E7j{I#iiN;b*ZdCt4m@HPA`EuEqGGf4%!K<;(=I=&Vyrw z%TwcWtxa}8mCZ%Cyf&ActJ6_$ox5z6-D!0-dvnRx6t7y3d+h6QYpKWO;8OdnvERo7 zuEf>ih5`wqY)~o@OeVt-wM?Q!>QzdGRj!bz6fzYrfw$hZfAKzr2-M+D+R>}~oT574c;_3zquHcElqKIsryILt3g8n3jcMb+j?i?-L3FpZJ z2WRVBRdDPc+G5aaYg#5hpE+6nQ|(VSoxT3|biF;BUq#==-27Xi=gihDPYP$7?=9cP zYKE$jeQ|3~_L0VG-(F~2ZPyD0=k{J4Q~h(t__{-mz_w8{JDY9{`1ouzz!Vr5!ECdE z6U~O1k8c}24V7~zzXWTV-Pe4)y}wQJS&q%H5`Fo_f_JvIU489aCX$;P`u#!I-=^4ijC2{&9!O&h>mi?9oYD=GC#%)6{GzN6nQYw+Fal50!#x^asjBBR50i`+mho*ttoqV)ubM2KD9S~k7+FR4>{29?6 z{!l6kDdyTN0YJ9LgkPWeXm|gyi@zM3?0@{&pXT12w|78&W-q!RRF)&iLCEZVH<|fR zN0fr2^t8H(>L?>K#>^+jWROLral(Qy-xoBq1U7A&DV||wClb)Otd9?(gZ|8znMF}D zf<1haWz^s0qgecz;RFGt0C-B4g`jNGHsFU+;{<%t65v^sjk^h$lmWn#B0#_)9ij&d z-~lc`A)YYExi^7sBuPM^Y|wA2g*5?`K?#7tzELQYNxGo$UB$4J8RJp1k(8Jj+~hMT zlN~>M@KTTh^--8y3PK_NZ@AC!{PT=CziBzGd+wTJ^@icH!Bd}%)g8V)%K?|c&WTUk zy}qv1C%(fjRoZ4ozC3{O%@5?)XzH35zHns$pgU*Q?fj4v?fp1Qbm+j;3l;9jam9Da zXVcKjPlQ73x78QPu|Ffm6x?`~e3oD=gl=4kYK?={kD5j~QCXU)`HSdduNNENzA*2$ zOm3PzF!lN5e*06-f1Uot67wY#{o-S1!KZ7E=!~7ynnk9_iJR#kFoNbAOT#^2Gd17F zMmvU6>lndZQGd|ax9kUoXXO+$N?|j@6qpsF&_j7YXvwo_C{JpmLw5&#e6k>atv%es z5)7r*Wvv_JkUpT}M!_o!nVlEk1Zbl=a*2hQ*<|%*K1Glj^FcF`6kTzGQ3lz~2tCc@ z&x|tj;aH&1&9HwcJBcT`;{?a+pnej;M1HO(6Z{#J!cZA04hnFl;NXA+&`=7bjW_^o zfC40u3LMG?NdPtwGl>Tq6u}*QG)}-y;)lu-_>ee3kibW(69n0$0Zy!}9rQz%*v1iO zT9_H>99yIrSPYVy6^);rR}7Yo=J_T@hi+qhTZXnVWyf;JDYm5#eYLTxr*?kiNn!+Y zQ+LUkBafNJ#rH#C(?d5^;gw9o#%daEI{mA*LHPIHPU`#|H$hD zwm>0&+kahQ)E#%~k>&5@&#Vg82H?s%71=)(soi@174pi9--2{w{1$}Sz4zGn3Du&x bht0Iza^2ykEt4(epJ78uh5nDlX8(TxzDYwP literal 0 HcmV?d00001 diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square44x44Logo.scale-200.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..ce342a2ec8a61291ba76c54604aea7e9d20af11b GIT binary patch literal 1647 zcmaJ?eM}Q)7(e+G1Q(|`V9JhTI2>MkceK4;p;PR&$Pi?ejk3YQ_3o`S&|W_dsOZ8# zWPTt69g`t$ab`0cj-Y0yiBSOqmd)tG7G(}M5aP0_%&9TijB#&)I{zSE^4@#z^FF`l z`8{8`o%wlL(UI|y2!cdsuVamHH~H86F!*-15em4)NqUpCQM5?aoC_eCf@lV4wvF2a zjDQn1JBL69f&@2M3rvzJcfE!eZ8FZUBlFlC5RD)it33{mF9#B82AiyQE%w)`vlwa> zv{<1sm&kSKK$&%2jSFn7$t&P%%6Ue>R=EAnG8N7fqynWG8L3p!4801a;8{+nliO(qd(jNJ_?+9W3#hLIDLoT6~3fx9=`CC-D}-AMrpEO7HK zt3$GicGPc?GmDjy7K2P@La;eu4!$zWCZ`ym{Z$b zu-O6RM&K4JT|BIZB`E-gxqG%FzanI#+2FFmqHqXG7yxWB=w55RGOM)$xMb(>kSNR z2w=1AZi%z=AmG~yea~XaXJR!v7vLn(RUnELfiB1|6D84ICOS}^Zo2AdN}<&*h}G_u z{xZ!(%>tLT3J3<5XhWy-tg+6)0nmUUENLW8TWA{R6bgVd3X;anYFZ^IRis*_P-C-r z;i>%1^eL3UI2-{w8nuFFcs0e~7J{O2k^~Ce%+Ly4U?|=!0LH=t6()xi<^I-rs+9sF z*q{E-CxZbGPeu#a;XJwE;9S1?#R&uns>^0G3p`hEUF*v`M?@h%T%J%RChmD|EVydq zmHWh*_=S%emRC*mhxaVLzT@>Z2SX0u9v*DIJ@WC^kLVdlGV6LpK$KIrlJqc zpJ921)+3JJdTx|<`G&kXpKkjGJv=76R`yYIQ{#c-`%+`#V(7}Q;&@6U8!Td1`d;?N z_9mnI#?AA}4J!r)LN4!E-@H5eXauuB7TOawS>Y|{-P?NNx-lq+z1W-+y(;39P&&LP zL{N80?&=C*qKmdA^moMZRuPcD!B<*mq$ch=0Cnlitw#txRWhb3%TQvPqjkC`F69G4b! ze7z9MZ#+;_#l?H37UqUhDFb^l&s2{oM$3I0o^Q!yx;;V)QmCMo)Tb_ui|mit8MS?U zm##6$sZZ1$@|s%?l@>4Z<*Q}sRBSKMhb4I{e5LdEhsHIHTe8Bod5c>6QtT>$XgUBz z6MK`kO$=jmt@FqggOhJ5j~e@ygRbG;<{Vu)*+nn9aQeo0;$#j;|MS=S$&L?BeV25z xs3B`@=#`5TF{^6(A1rvdY@|-RtQ|iS5{tyX+wH?;n8E)G$kykv-D^wh{{!TZT%7;_ literal 0 HcmV?d00001 diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square44x44Logo.targetsize-24_altform-unplated.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c02ce97e0a802b85f6021e822c89f8bf57d5cd GIT binary patch literal 1255 zcmaJ>TWs4@7*5+{G#S+&C!qC#> zf>5N3P6jO*Cz>ug*(_DmW=)kea&m$gZ^+nyiF`;j%w@}y8)>p*SH}C`m?DXeieF2U zyQHecc_L%Gh!7GMt+hG06y;+|p4>m~}PjA}rKViGiEnn7G0ZO<>G|7q;2?NwGCM3s?eued6%hd$B+ z*kQJ{#~$S=DFE(%=E+UkmlEI*%3llUf~8Ja9YU1Vui0IbGBkW_gHB%Rd&!!ioX zs40O?i9I{};kle7GMvE7(rk`la=gTI)47=>%?q@^iL-nUo3}h4S}N-KHn8t5mVP8w z&bSErwp+37 zNJJ8?a|{r5Q3R0Z5s-LB1WHOwYC@7pCHWND#cL1cZ?{kJ368_*(UDWUDyb<}0y@o# zfMF016iMWPCb6obAxT$JlB6(2DrlXDTB&!0`!m??4F(qWMhjVZo?JXQmz`1*58Z=& zcDmB|S-E@j?BoFGix0flckqdS4jsPNzhfWyWIM98GxcLs89C(~dw%$_t;JjX-SD}E zfiGV;{8Q%8r}w9x>EEigW81>`kvnU@pK)4+xk9@+bNj9L!AAZ@SZ@q|)&BmY3+HZx zul~BeG4|}-;L%cHViQGQX?^zFfO0&#cHwel=d`lH9sJ-@Sl@n*(8J2>%Ac`IxyY?Q z{=GhWvC#gu-~Ia7*n{=+;qM?Ul_wy1+u7ho;=`>EwP^g~R@{unBds`!#@}tluZQpS zm)M~nYEifJWJGx?_6DcTy>#uh%>!H9=hb^(v`=m3F1{L>db=<5_tm+_&knAQ2EU$s Mu9UqpbNZeC0BbUo^Z)<= literal 0 HcmV?d00001 diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/StoreLogo.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/StoreLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..7385b56c0e4d3c6b0efe3324aa1194157d837826 GIT binary patch literal 1451 zcmaJ>eN5D57_Z|bH;{0+1#mbl)eTU3{h)Wf7EZV?;HD@XL@{B`Ui%(2aMxQ~xdXSv z5nzWi(LW)U2=Vc-cY@s7nPt{i0hc6!7xN4NNHI#EQl>YNBy8l4%x9gr_W-j zEZMQmmTIy(>;lblRfh`dIyTgc9W5d!VP$L4(kKrN1c5G~(O_#xG zAJCNTstD^5SeXFB+&$h=ToJP2H>xr$iqPs-#O*;4(!Fjw25-!gEb*)mU}=)J;Iu>w zxK(5XoD0wrPSKQ~rbL^Cw6O_03*l*}i=ydbu7adJ6y;%@tjFeXIXT+ms30pmbOP%Q zX}S;+LBh8Tea~TSkHzvX6$rYb)+n&{kSbIqh|c7hmlxmwSiq5iVhU#iEQ<>a18|O^Sln-8t&+t`*{qBWo5M?wFM(JuimAOb5!K#D}XbslM@#1ZVz_;!9U zpfEpLAOz=0g@bd6Xj_ILi-x^!M}73h^o@}hM$1jflTs|Yuj9AL@A3<-?MV4!^4q`e z)fO@A;{9K^?W?DbnesnPr6kK>$zaKo&;FhFd(GYFCIU^T+OIMb%Tqo+P%oq(IdX7S zf6+HLO?7o0m+p>~Tp5UrXWh!UH!wZ5kv!E`_w)PTpI(#Iw{AS`gH4^b(bm^ZCq^FZ zY9DD7bH}rq9mg88+KgA$Zp!iWncuU2n1AuIa@=sWvUR-s`Qb{R*kk(SPU^`$6BXz8 zn#7yaFOIK%qGxyi`dYtm#&qqox0$h=pNi#u=M8zUG@bpiZ=3sT=1}Trr}39cC)H|v zbL?W)=&s4zrh)7>L(|cc%$1#!zfL?HjpeP%T+x_a+jZ16b^iKOHxFEX$7d|8${H-* zIrOJ5w&i$>*D>AKaIoYg`;{L@jM((Kt?$N$5OnuPqVvq**Nm}(f0wwOF%iX_Pba;V z;m@wxX&NcV3?<1+u?A{y_DIj7#m3Af1rCE)o`D&Y3}0%7E;iX1yMDiS)sh0wKi!36 zL!Wmq?P^Ku&rK~HJd97KkLTRl>ScGFYZNlYytWnhmuu|)L&ND8_PmkayQb{HOY640 bno1(wj@u8DCVuFR|31B*4ek@pZJqxCDDe1x literal 0 HcmV?d00001 diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Wide310x150Logo.scale-200.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..288995b397fdbef1fb7e85afd71445d5de1952c5 GIT binary patch literal 3204 zcmbVPeQXow8NYmBd90>}0NP?GhXW~VaeThm=a0tV#EwJMI!)6M3}|c4_Bl3=Kd>G0 z(GHx1wl<7(tP?FsOQkTilSo*iIvF%uArExJ73~P zSv1xEy!U(Wd4A9D`FQV@W3@F^qJ@PEF$@z`Z!*BbFsS(^?B zyiAzJ+q})bkgiQHWqEb*jJD-coHYr1^iocg)l!Qa{Xqs-l~6J}p-|##ZHYofskQ3$ zI0;xzXyhazBeXhIsg5A=%ufo@f)1yy&ScKS0;HF^!r_2UE^lpZEom(+@duma3awTv zCrCL-%D_SvYWIcdHkmI}#50(fkUi)Qgx!80ju>g1za^}ff>JI8Z@^-iCiaCgg@TgF z+vtE?Q9{VQUX&MW9SYYmGcxA14%N2@7FwBTD4N<(2{nWgV8$e3?-F=L^&FrtWn~(U_Q~~^uYiyeY6-KoTnfh9AWz@ zIKje0)u!_Lw)E}G!#kEfwKVdNt(UAf9*f>tEL_(=xco-T%jTi@7YlC3hs2ik%Le0H ztj}RTeCF(5mwvi3_56>-yB?l;J>-1%!9~=fs|QcNG3J~a@JCu`4SB460s0ZO+##4fFUSGLcj_ja^fL4&BKALfb#$6$O?>P@qx2Agl^x0i&ugt zsy5Pyu=()`7HRMG3IB7F1@`_ z+-!J%#i6e^U$e#+C%Q>_qVRzWRsG^W_n+@OcX@vzI&z;mzHNb!GQ?LWA(wtpqHqTM z1OFw_{Zn?fD)p)`c`kOgv{de=v@suGRqY{N^U7gI1VF3*F=obwaXI6ob5__Yn zVTguS!%(NI09J8x#AO_aW!9W7k*UvB;IWDFC3srwftr{kHj%g)fvnAm;&h_dnl~

MY- zf+K}sCe8qU6Ujs`3ua{U0Of$R_gVQBuUA za0v=mu#vIOqiiAZOr&h*$WyOw&k-xr$;G4Ixa!#TJNr>95(h>l%)PUy4p+^SgR(uR zta%k*?ny-+nAr8spEk1fo{J4i!b^Fia`N{_F6@zidA2ZTTrjl#^5Z-2KfB@Cu}l9s z(*|Z2jc?p~vn2f)3y9i*7zJV1L{$?|&q)4oaT;uXi6>1GkRXVTOzAz(RHEmr=eFIi z`}<>-Q?K0GN8!IYxeP1XKXO+jsJbp~o^);Bc;%b7Flpe7;1`Ny@3r7ZR;?R)aJt8C ziNlEC<@3f_lIV4TwV}&e;D!Ee5_|e#g0LUh=5vmYWYm7&2h*M>QPKvGh9-)wfMMW3 z8J9b%1k7dzPzO0_NGQy92BZ^FR6R~6;^6?lqO;-QUP4BY%cG%3vEhbm#>4vIhPBh3 z-+pZGjh$x%Hp{?=FHsMp0&wNPlj00us{&`1ZOZTqs8%4X&xH=UDr*xyBW(Zp&Em94 zf)ZSfn#yg0N)>!1kWdkqJ^S*z0FF5|fj&qcE#Na|%OY0$uO>!&hP+1ywfD_WXk@4J(?MBftK7>$Nvqh@tDuarN%PrTLQ2Uzysx>UV=V zk^RrDSvdQ?0;=hY67EgII-f4`t=+i*yS=Y~!XlqIy_4x&%+OdfbKOFPXS2X5%4R{N z$SQMX^AK6(fA + + + + VC + 1000 + microsoft.Windows.CppWinRT.BlankApp + true + BlankApp + true + Enabled + true + cppwinrt.ico + cppwinrt.png + + + + BlankApp.vcxproj.filters + pch.cpp + pch.h + App.xaml + App.idl + App.cpp + App.h + MainPage.xaml + MainPage.idl + MainPage.cpp + MainPage.h + Package.appxmanifest + LockScreenLogo.scale-200.png + SplashScreen.scale-200.png + Square150x150Logo.scale-200.png + Square44x44Logo.scale-200.png + Square44x44Logo.targetsize-24_altform-unplated.png + StoreLogo.png + Wide310x150Logo.scale-200.png + PropertySheet.props + readme.txt + + + + Microsoft.VisualStudio.WinRT.TemplateWizards, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Microsoft.VisualStudio.WinRT.TemplateWizards.CreateProjectCertificate.Wizard + + + Microsoft.VisualStudio.Universal.TemplateWizards, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Microsoft.VisualStudio.Universal.TemplateWizards.PlatformVersion.Wizard + + + NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + NuGet.VisualStudio.TemplateWizard + + + + + + + \ No newline at end of file diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/pch.cpp b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/pch.cpp new file mode 100644 index 0000000..bcb5590 --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/pch.cpp @@ -0,0 +1 @@ +#include "pch.h" diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/pch.h b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/pch.h new file mode 100644 index 0000000..b559e36 --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/pch.h @@ -0,0 +1,15 @@ +#pragma once +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/readme.txt b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/readme.txt new file mode 100644 index 0000000..8698c54 --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/readme.txt @@ -0,0 +1,23 @@ +======================================================================== + C++/WinRT $projectname$ Project Overview +======================================================================== + +This project demonstrates how to get started writing XAML apps directly +with standard C++, using the C++/WinRT SDK component 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 C++/WinRT here: +http://aka.ms/cppwinrt/ +======================================================================== From c5c93de75481367ea1bf65594a30df88015c83ac Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Mon, 21 Aug 2023 20:48:04 -0500 Subject: [PATCH 02/23] Moved assets to their own folder --- .../{ => Assets}/LockScreenLogo.scale-200.png | Bin .../{ => Assets}/SplashScreen.scale-200.png | Bin .../{ => Assets}/Square150x150Logo.scale-200.png | Bin .../{ => Assets}/Square44x44Logo.scale-200.png | Bin ...re44x44Logo.targetsize-24_altform-unplated.png | Bin .../BlankApp/{ => Assets}/StoreLogo.png | Bin .../{ => Assets}/Wide310x150Logo.scale-200.png | Bin .../BlankApp/cppwinrt_BlankApp.vstemplate | 14 +++++++------- 8 files changed, 7 insertions(+), 7 deletions(-) rename templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/{ => Assets}/LockScreenLogo.scale-200.png (100%) rename templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/{ => Assets}/SplashScreen.scale-200.png (100%) rename templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/{ => Assets}/Square150x150Logo.scale-200.png (100%) rename templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/{ => Assets}/Square44x44Logo.scale-200.png (100%) rename templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/{ => Assets}/Square44x44Logo.targetsize-24_altform-unplated.png (100%) rename templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/{ => Assets}/StoreLogo.png (100%) rename templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/{ => Assets}/Wide310x150Logo.scale-200.png (100%) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/LockScreenLogo.scale-200.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/LockScreenLogo.scale-200.png similarity index 100% rename from templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/LockScreenLogo.scale-200.png rename to templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/LockScreenLogo.scale-200.png diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/SplashScreen.scale-200.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/SplashScreen.scale-200.png similarity index 100% rename from templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/SplashScreen.scale-200.png rename to templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/SplashScreen.scale-200.png diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square150x150Logo.scale-200.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/Square150x150Logo.scale-200.png similarity index 100% rename from templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square150x150Logo.scale-200.png rename to templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/Square150x150Logo.scale-200.png diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square44x44Logo.scale-200.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/Square44x44Logo.scale-200.png similarity index 100% rename from templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square44x44Logo.scale-200.png rename to templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/Square44x44Logo.scale-200.png diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square44x44Logo.targetsize-24_altform-unplated.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Square44x44Logo.targetsize-24_altform-unplated.png rename to templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/StoreLogo.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/StoreLogo.png similarity index 100% rename from templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/StoreLogo.png rename to templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/StoreLogo.png diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Wide310x150Logo.scale-200.png b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/Wide310x150Logo.scale-200.png similarity index 100% rename from templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Wide310x150Logo.scale-200.png rename to templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Assets/Wide310x150Logo.scale-200.png diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate index 9fb9bec..c6b3f1a 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate @@ -27,13 +27,13 @@ MainPage.cpp MainPage.h Package.appxmanifest - LockScreenLogo.scale-200.png - SplashScreen.scale-200.png - Square150x150Logo.scale-200.png - Square44x44Logo.scale-200.png - Square44x44Logo.targetsize-24_altform-unplated.png - StoreLogo.png - Wide310x150Logo.scale-200.png + Assets\LockScreenLogo.scale-200.png + Assets\SplashScreen.scale-200.png + Assets\Square150x150Logo.scale-200.png + Assets\Square44x44Logo.scale-200.png + Assets\Square44x44Logo.targetsize-24_altform-unplated.png + Assets\StoreLogo.png + Assets\Wide310x150Logo.scale-200.png PropertySheet.props readme.txt From 55d82c21d3d7aae32f9eb533a818df2a6b6a81cf Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Mon, 21 Aug 2023 20:53:12 -0500 Subject: [PATCH 03/23] Cleaned up package manifest, enabled optional splash screen by default --- .../BlankApp/Package.appxmanifest | 77 +++++++++++-------- 1 file changed, 47 insertions(+), 30 deletions(-) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Package.appxmanifest b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Package.appxmanifest index b447558..2ccc6dc 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Package.appxmanifest +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Package.appxmanifest @@ -1,32 +1,49 @@  - - - - - $projectname$ - $XmlEscapedPublisher$ - Assets\StoreLogo.png - - - - - - - - - - - - - - - - - - - + + + + + + + $projectname$ + $XmlEscapedPublisher$ + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From d03d8d82c92ebb040ac8cdb50e4e2540be83b46f Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Mon, 21 Aug 2023 21:07:23 -0500 Subject: [PATCH 04/23] Cleaned up implementation of App class --- .../ProjectTemplates/BlankApp/App.cpp | 136 ++++-------------- .../ProjectTemplates/BlankApp/App.h | 23 +-- .../ProjectTemplates/BlankApp/App.idl | 3 - .../BlankApp/BlankApp.vcxproj | 3 - .../BlankApp/BlankApp.vcxproj.filters | 1 - .../BlankApp/cppwinrt_BlankApp.vstemplate | 1 - 6 files changed, 40 insertions(+), 127 deletions(-) delete mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.idl diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.cpp b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.cpp index 2f3132d..c180196 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.cpp +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.cpp @@ -1,118 +1,34 @@ #include "pch.h" - #include "App.h" -#include "MainPage.h" -using namespace winrt; -using namespace Windows::ApplicationModel; -using namespace Windows::ApplicationModel::Activation; -using namespace Windows::Foundation; -using namespace Windows::UI::Xaml; -using namespace Windows::UI::Xaml::Controls; -using namespace Windows::UI::Xaml::Navigation; -using namespace $safeprojectname$; -using namespace $safeprojectname$::implementation; +#include "Views/MainPage.h" -///

-/// Creates 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() -{ - Suspending({ this, &App::OnSuspending }); +namespace wamc = winrt::Windows::ApplicationModel::Core; +namespace wama = winrt::Windows::ApplicationModel::Activation; +namespace wux = winrt::Windows::UI::Xaml; +namespace winrt::$safeprojectname$::implementation { + App::App() { #if defined _DEBUG && !defined DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION - UnhandledException([this](IInspectable const&, UnhandledExceptionEventArgs const& e) - { - if (IsDebuggerPresent()) - { - auto errorMessage = e.Message(); - __debugbreak(); - } - }); + UnhandledException([this](const IInspectable&, const wux::UnhandledExceptionEventArgs& e) + { + if (IsDebuggerPresent()) { + const auto errorMessage = e.Message(); + __debugbreak(); + } + } + ); #endif + } + + void App::OnLaunched(const wama::LaunchActivatedEventArgs& args) const { + const auto window = wux::Window::Current(); + if (!window.Content()) + window.Content(winrt::make()); + + if (!args.PrelaunchActivated()) { + window.Activate(); + wamc::CoreApplication::EnablePrelaunch(true); + } + } } - -/// -/// Invoked when the application is launched normally by the end user. Other entry points -/// will be used such as when the application is launched to open a specific file. -/// -/// Details about the launch request and process. -void App::OnLaunched(LaunchActivatedEventArgs const& e) -{ - Frame rootFrame{ nullptr }; - auto content = Window::Current().Content(); - if (content) - { - rootFrame = content.try_as(); - } - - // Do not repeat app initialization when the Window already has content, - // just ensure that the window is active - if (rootFrame == nullptr) - { - // Create a Frame to act as the navigation context and associate it with - // a SuspensionManager key - rootFrame = Frame(); - - rootFrame.NavigationFailed({ this, &App::OnNavigationFailed }); - - if (e.PreviousExecutionState() == ApplicationExecutionState::Terminated) - { - // Restore the saved session state only when appropriate, scheduling the - // final launch steps after the restore is complete - } - - if (e.PrelaunchActivated() == false) - { - if (rootFrame.Content() == nullptr) - { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a navigation - // parameter - rootFrame.Navigate(xaml_typename<$safeprojectname$::MainPage>(), box_value(e.Arguments())); - } - // Place the frame in the current Window - Window::Current().Content(rootFrame); - // Ensure the current window is active - Window::Current().Activate(); - } - } - else - { - if (e.PrelaunchActivated() == false) - { - if (rootFrame.Content() == nullptr) - { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a navigation - // parameter - rootFrame.Navigate(xaml_typename<$safeprojectname$::MainPage>(), box_value(e.Arguments())); - } - // Ensure the current window is active - Window::Current().Activate(); - } - } -} - -/// -/// Invoked when application execution is being suspended. Application state is saved -/// without knowing whether the application will be terminated or resumed with the contents -/// of memory still intact. -/// -/// The source of the suspend request. -/// Details about the suspend request. -void App::OnSuspending([[maybe_unused]] IInspectable const& sender, [[maybe_unused]] SuspendingEventArgs const& e) -{ - // Save application state and stop any background activity -} - -/// -/// Invoked when Navigation to a certain page fails -/// -/// The Frame which failed navigation -/// Details about the navigation failure -void App::OnNavigationFailed(IInspectable const&, NavigationFailedEventArgs const& e) -{ - throw hresult_error(E_FAIL, hstring(L"Failed to load Page ") + e.SourcePageType().Name); -} \ No newline at end of file diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.h b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.h index b7fe65e..3c3eace 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.h +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.h @@ -1,13 +1,18 @@ #pragma once #include "App.xaml.g.h" -namespace winrt::$safeprojectname$::implementation -{ - struct App : AppT - { - App(); - void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs const&); - void OnSuspending(IInspectable const&, Windows::ApplicationModel::SuspendingEventArgs const&); - void OnNavigationFailed(IInspectable const&, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs const&); - }; +namespace winrt::$safeprojectname$::implementation { + struct App : AppT { + /** + * @brief Creates the singleton application object. + */ + App(); + + /** + * @brief Invoked when the application is launched normally by the end user. + * + * @param args Details about the launch request and process. + */ + void OnLaunched(const Windows::ApplicationModel::Activation::LaunchActivatedEventArgs&) const; + }; } diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.idl b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.idl deleted file mode 100644 index 02ebf5f..0000000 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.idl +++ /dev/null @@ -1,3 +0,0 @@ -namespace $safeprojectname$ -{ -} diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj index af2b419..33f2612 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj @@ -149,9 +149,6 @@ - - App.xaml - MainPage.xaml diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters index 178fb4e..6466228 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters @@ -7,7 +7,6 @@ - diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate index c6b3f1a..24cd510 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate @@ -19,7 +19,6 @@ pch.cpp pch.h App.xaml - App.idl App.cpp App.h MainPage.xaml From 42b6e5728c174df640b38b4aeb72da840d3f9aad Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Mon, 21 Aug 2023 21:12:47 -0500 Subject: [PATCH 05/23] Moved MainPage to dedicated folder --- .../ProjectTemplates/BlankApp/BlankApp.vcxproj | 14 +++++++------- .../BlankApp/BlankApp.vcxproj.filters | 8 ++++---- .../BlankApp/{ => Views}/MainPage.cpp | 0 .../BlankApp/{ => Views}/MainPage.h | 0 .../BlankApp/{ => Views}/MainPage.idl | 0 .../BlankApp/{ => Views}/MainPage.xaml | 0 .../BlankApp/cppwinrt_BlankApp.vstemplate | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) rename templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/{ => Views}/MainPage.cpp (100%) rename templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/{ => Views}/MainPage.h (100%) rename templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/{ => Views}/MainPage.idl (100%) rename templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/{ => Views}/MainPage.xaml (100%) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj index 33f2612..a9c08e5 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj @@ -110,15 +110,15 @@ App.xaml - - MainPage.xaml + + Views\MainPage.xaml Designer - + Designer @@ -143,14 +143,14 @@ App.xaml - - MainPage.xaml + + Views\MainPage.xaml - - MainPage.xaml + + Views\MainPage.xaml diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters index 6466228..c63fab3 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters @@ -4,15 +4,15 @@ - + - + - + Generated Files @@ -20,7 +20,7 @@ - + diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.cpp b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.cpp similarity index 100% rename from templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.cpp rename to templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.cpp diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.h b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.h similarity index 100% rename from templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.h rename to templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.h diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.idl b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.idl similarity index 100% rename from templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.idl rename to templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.idl diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.xaml b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml similarity index 100% rename from templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/MainPage.xaml rename to templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate index 24cd510..24602a7 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate @@ -21,10 +21,10 @@ App.xaml App.cpp App.h - MainPage.xaml - MainPage.idl - MainPage.cpp - MainPage.h + Views\MainPage.xaml + Views\MainPage.idl + Views\MainPage.cpp + Views\MainPage.h Package.appxmanifest Assets\LockScreenLogo.scale-200.png Assets\SplashScreen.scale-200.png From 96d15dceb3a0cb821ba7056b48551044cce940c8 Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Mon, 21 Aug 2023 21:21:50 -0500 Subject: [PATCH 06/23] Improved default landing page --- .../BlankApp/Views/MainPage.cpp | 29 +++++++-------- .../BlankApp/Views/MainPage.h | 36 +++++++++---------- .../BlankApp/Views/MainPage.idl | 15 ++++---- .../BlankApp/Views/MainPage.xaml | 5 ++- 4 files changed, 38 insertions(+), 47 deletions(-) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.cpp b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.cpp index af94324..8d83d33 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.cpp +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.cpp @@ -1,24 +1,19 @@ #include "pch.h" #include "MainPage.h" -#include "MainPage.g.cpp" +#include "Views/MainPage.g.cpp" -using namespace winrt; -using namespace Windows::UI::Xaml; +namespace wux = winrt::Windows::UI::Xaml; -namespace winrt::$safeprojectname$::implementation -{ - int32_t MainPage::MyProperty() - { - throw hresult_not_implemented(); - } +namespace winrt::$safeprojectname$::Views::implementation { + int32_t MainPage::MyProperty() const { + throw hresult_not_implemented(); + } - void MainPage::MyProperty(int32_t /* value */) - { - throw hresult_not_implemented(); - } + void MainPage::MyProperty(int32_t /* value */) { + throw hresult_not_implemented(); + } - void MainPage::ClickHandler(IInspectable const&, RoutedEventArgs const&) - { - myButton().Content(box_value(L"Clicked")); - } + void MainPage::ClickHandler(const IInspectable&, const wux::RoutedEventArgs&) { + MyButton().Content(winrt::box_value(L"Clicked")); + } } diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.h b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.h index 92e0a68..bc22522 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.h +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.h @@ -1,27 +1,25 @@ #pragma once -#include "MainPage.g.h" +#include "Views/MainPage.g.h" -namespace winrt::$safeprojectname$::implementation -{ - struct MainPage : MainPageT - { - MainPage() - { - // Xaml objects should not call InitializeComponent during construction. - // See https://github.com/microsoft/cppwinrt/tree/master/nuget#initializecomponent - } +namespace winrt::$safeprojectname$::Views::implementation { + /** + * @brief Shown to the user when the app is launched normally. + */ + struct MainPage : MainPageT { + MainPage() { + // 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); + int32_t MyProperty() const; + void MyProperty(int32_t value); - void ClickHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args); - }; + void ClickHandler(const Windows::Foundation::IInspectable&, const Windows::UI::Xaml::RoutedEventArgs&); + }; } -namespace winrt::$safeprojectname$::factory_implementation -{ - struct MainPage : MainPageT - { - }; +namespace winrt::$safeprojectname$::Views::factory_implementation { + struct MainPage : MainPageT { + }; } diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.idl b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.idl index c382ebf..e8da479 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.idl +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.idl @@ -1,9 +1,8 @@ -namespace $safeprojectname$ -{ - [default_interface] - runtimeclass MainPage : Windows.UI.Xaml.Controls.Page - { - MainPage(); - Int32 MyProperty; - } +namespace $safeprojectname$.Views { + [default_interface] + runtimeclass MainPage : Windows.UI.Xaml.Controls.UserControl { + MainPage(); + + Int32 MyProperty; + } } diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml index f58acc5..0303db5 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml @@ -1,13 +1,12 @@  - + From d7fdf25ae82a46d1020d2b242067ec01c3b48be8 Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Mon, 21 Aug 2023 21:47:38 -0500 Subject: [PATCH 07/23] Adjusted template to use a single IDL file for views --- .../BlankApp/BlankApp.vcxproj | 20 +++++++------- .../BlankApp/BlankApp.vcxproj.filters | 27 ++++++++++--------- .../Views/{MainPage.idl => Views.idl} | 0 .../BlankApp/cppwinrt_BlankApp.vstemplate | 2 +- 4 files changed, 26 insertions(+), 23 deletions(-) rename templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/{MainPage.idl => Views.idl} (100%) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj index a9c08e5..d2b8689 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj @@ -112,15 +112,13 @@ Views\MainPage.xaml + Code Designer - - Designer - @@ -143,15 +141,11 @@ App.xaml + Views\MainPage.xaml + Code - - - - - Views\MainPage.xaml - @@ -159,6 +153,14 @@ false + + + Designer + + + + + diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters index c63fab3..d629843 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters @@ -3,24 +3,12 @@ - - - - - - - - - - Generated Files - + - - @@ -52,6 +40,9 @@ {e48dc53e-40b1-40cb-970a-f89935452892} + + {1b3d3152-68ee-45ff-aedd-fcf101422473} + @@ -59,4 +50,14 @@ + + + Views + + + + + Views + + \ No newline at end of file diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.idl b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/Views.idl similarity index 100% rename from templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.idl rename to templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/Views.idl diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate index 24602a7..6289eba 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate @@ -22,9 +22,9 @@ App.cpp App.h Views\MainPage.xaml - Views\MainPage.idl Views\MainPage.cpp Views\MainPage.h + Views\Views.idl Package.appxmanifest Assets\LockScreenLogo.scale-200.png Assets\SplashScreen.scale-200.png From 2cdd231fb5259163b1acf007b276e3d3540ec37c Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Mon, 21 Aug 2023 22:31:08 -0500 Subject: [PATCH 08/23] Renamed vstemplate file, added SimpleKit branding --- .../BlankApp/BlankApp.vstemplate | 53 ++++++++++++++++ .../BlankApp/TemplateIcon.ico | Bin 0 -> 51262 bytes .../BlankApp/cppwinrt_BlankApp.vstemplate | 57 ------------------ 3 files changed, 53 insertions(+), 57 deletions(-) create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/TemplateIcon.ico delete mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate new file mode 100644 index 0000000..4ebd912 --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate @@ -0,0 +1,53 @@ + + + SimpleKit - Blank App + A template to create a UWP XAML application. + VC + cpp + windows + uwp + 1000 + true + SimpleKit.TestApp + true + Enabled + true + TemplateIcon.ico + + + + BlankApp.vcxproj.filters + pch.cpp + pch.h + App.xaml + App.cpp + App.h + Views\MainPage.xaml + Views\MainPage.cpp + Views\MainPage.h + Views\Views.idl + Package.appxmanifest + Assets\LockScreenLogo.scale-200.png + Assets\SplashScreen.scale-200.png + Assets\Square150x150Logo.scale-200.png + Assets\Square44x44Logo.scale-200.png + Assets\Square44x44Logo.targetsize-24_altform-unplated.png + Assets\StoreLogo.png + Assets\Wide310x150Logo.scale-200.png + PropertySheet.props + readme.txt + + + + Microsoft.VisualStudio.WinRT.TemplateWizards, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Microsoft.VisualStudio.WinRT.TemplateWizards.CreateProjectCertificate.Wizard + + + Microsoft.VisualStudio.Universal.TemplateWizards, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Microsoft.VisualStudio.Universal.TemplateWizards.PlatformVersion.Wizard + + + NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + NuGet.VisualStudio.TemplateWizard + + \ No newline at end of file diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/TemplateIcon.ico b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/TemplateIcon.ico new file mode 100644 index 0000000000000000000000000000000000000000..54364ed4f96b288e327a9381dc0c9d771f8b85c4 GIT binary patch literal 51262 zcmeI4U2fA*5JsI4sQ8oM1+fGk8}E(ZCpLowf`zaP9$7}Yi63g@IfL%)ZDN#Drd9fl z{mu2sc}p;K7Ss{*Vn_FpTqEK7=}0Hvq%T=s2?64a?6k72GeGLeccX25Sz`; zNCh}Nt#y`H#yuSVt#(w|R zNCi^VNhco(=LCowaVDL7^6F-Z8*wI`d?cI`Aa2B&bn?lon@2zoJl7i3Fice8*wI`eDdmMi5qbyoqYNc{yvUj zd>h9gXg#EdCPy(WTEsrDYtVX#GwI~hYn=eUa0uWRk=8>x`EXtNPn{|M!#j+)uln=} z_o4jd-`-=?w>0NTCm-j3PJp-(XVS?huU?a-`w-`k^XC%gPu%CbtCw*+d9kYs@ZtN? zcINZ5p5_M48PdsTUh8g;<)6KiUH)y|Mck;*NhhDSRYiN*|Mvg92b}*08u7)qTuiGj zzGY*tzyJ6j#d+`DJ|=GRpRNeeByT%&Z<){U2``O5y)TvCM?lx*TAlp2kDrGz{`y@N zp-B;`ZtePMd-5mFq>~TTt<}k&xK+U~8CPwL19|H~CM*YB|&P z@~6(9bmBuiYjyIs|K(rXOY`liukvnRX31w>>n@MU-~PA%@1w7l9iA(j&BHLZ+p8`S znip~V_*oeB_dl@@*1hNB%4sjN=UQh7zlidmo{=uiUrg}%wf~QQb{P5G^Lc9jPqRq= zZD%@hTTb{~A)mHYE%!oy=a2K}4l|beD)07XmVB0-+@_$v{eSHL>+82+?Dy|G#k>7J zh~1;7aXfjxs|xT5iyp;3#}z^=; zOeF5BK7GP{D1Z64_ZanUGU~$=`8fY`0>mwZoQUL;SFg#^eTehN`Ev>Lr~Mdf&azWi zp}CQanlME^Yd-chtc|#ZkQ0%7)^Ln#UITGUP=_h>3PpEVrgn%6+w64YUeeAayIYgij`3n3SA`O5F9UVm?U)n@H` z(d*{KnRN1@=U06qK-`Ek>Et8loB(kn&ZLu1UfnElBhI9gkA!mq#Em$UPCj{cv&4-! zlTJPo&Iu4V;!HaE@&Et; literal 0 HcmV?d00001 diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate deleted file mode 100644 index 6289eba..0000000 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/cppwinrt_BlankApp.vstemplate +++ /dev/null @@ -1,57 +0,0 @@ - - - - - VC - 1000 - microsoft.Windows.CppWinRT.BlankApp - true - BlankApp - true - Enabled - true - cppwinrt.ico - cppwinrt.png - - - - BlankApp.vcxproj.filters - pch.cpp - pch.h - App.xaml - App.cpp - App.h - Views\MainPage.xaml - Views\MainPage.cpp - Views\MainPage.h - Views\Views.idl - Package.appxmanifest - Assets\LockScreenLogo.scale-200.png - Assets\SplashScreen.scale-200.png - Assets\Square150x150Logo.scale-200.png - Assets\Square44x44Logo.scale-200.png - Assets\Square44x44Logo.targetsize-24_altform-unplated.png - Assets\StoreLogo.png - Assets\Wide310x150Logo.scale-200.png - PropertySheet.props - readme.txt - - - - Microsoft.VisualStudio.WinRT.TemplateWizards, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Microsoft.VisualStudio.WinRT.TemplateWizards.CreateProjectCertificate.Wizard - - - Microsoft.VisualStudio.Universal.TemplateWizards, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Microsoft.VisualStudio.Universal.TemplateWizards.PlatformVersion.Wizard - - - NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - NuGet.VisualStudio.TemplateWizard - - - - - - - \ No newline at end of file From 60892df2798ee1c223e24502259ad6e6890188d0 Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Mon, 21 Aug 2023 22:44:25 -0500 Subject: [PATCH 09/23] Added default output and intermediate directories --- .../ProjectTemplates/BlankApp/BlankApp.vcxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj index d2b8689..530c5e0 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj @@ -78,6 +78,10 @@ + + Out\$(Configuration)\$(Platform)\ + Intermediate\$(Configuration)\$(Platform)\ + Use From b0242437a29a2d792eed4eded23b4ef96d593652 Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Mon, 21 Aug 2023 22:45:07 -0500 Subject: [PATCH 10/23] Made C++ 20 and C 17 the default language standards --- .../ProjectTemplates/BlankApp/BlankApp.vcxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj index 530c5e0..67f1cda 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj @@ -90,6 +90,8 @@ Level4 %(AdditionalOptions) /bigobj WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions) + stdcpp20 + stdc17 false From 982f8d6cb613783649e0daab34bd26ac907a202e Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Mon, 21 Aug 2023 22:46:58 -0500 Subject: [PATCH 11/23] Disabled prefixes by default --- .../ProjectTemplates/BlankApp/BlankApp.vcxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj index 67f1cda..e3e771e 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj @@ -15,6 +15,7 @@ 10.0 $targetplatformversion$ 10.0.17134.0 + false From c1b14408e70f8a42e4c17bf71ee9ab03fc7f6b30 Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Tue, 22 Aug 2023 10:28:10 -0500 Subject: [PATCH 12/23] Switched to project name for root namespace and filenames --- .../ProjectTemplates/BlankApp/BlankApp.vcxproj | 2 +- .../ProjectTemplates/BlankApp/BlankApp.vstemplate | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj index e3e771e..918541a 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj @@ -7,7 +7,7 @@ true {$guid1$} $projectname$ - $safeprojectname$ + $projectname$ en-US 15.0 true diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate index 4ebd912..d94d69e 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate @@ -15,8 +15,8 @@ TemplateIcon.ico - - BlankApp.vcxproj.filters + + BlankApp.vcxproj.filters pch.cpp pch.h App.xaml From 92ea8f67e5e746f12ae8a6100938a0505089e3d8 Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Tue, 22 Aug 2023 10:31:19 -0500 Subject: [PATCH 13/23] Switched to tabs for PropertySheet --- .../BlankApp/PropertySheet.props | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/PropertySheet.props b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/PropertySheet.props index e34141b..ec7dcac 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/PropertySheet.props +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/PropertySheet.props @@ -1,16 +1,16 @@ - - - - - + For more advanced scenarios, and complete documentation, please see: + https://github.com/Microsoft/cppwinrt/tree/master/nuget + --> + + \ No newline at end of file From 9e226e24c881a93304b757721993ce51089132f5 Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Tue, 22 Aug 2023 10:49:27 -0500 Subject: [PATCH 14/23] Added template to VSIX manifest --- .../SimpleKit.Templates.WindowsRuntime.csproj | 4 ++++ .../source.extension.vsixmanifest | 1 + 2 files changed, 5 insertions(+) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/SimpleKit.Templates.WindowsRuntime.csproj b/templates/SimpleKit.Templates.WindowsRuntime/SimpleKit.Templates.WindowsRuntime.csproj index 37f4e1e..d62ce23 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/SimpleKit.Templates.WindowsRuntime.csproj +++ b/templates/SimpleKit.Templates.WindowsRuntime/SimpleKit.Templates.WindowsRuntime.csproj @@ -50,6 +50,9 @@ + + true + true @@ -75,6 +78,7 @@ + \ No newline at end of file diff --git a/templates/SimpleKit.Templates.WindowsRuntime/source.extension.vsixmanifest b/templates/SimpleKit.Templates.WindowsRuntime/source.extension.vsixmanifest index 9fd4c50..8cf92ee 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/source.extension.vsixmanifest +++ b/templates/SimpleKit.Templates.WindowsRuntime/source.extension.vsixmanifest @@ -19,6 +19,7 @@ + From b9a2454ec2378478ca348d388811c13356486149 Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:43:30 -0500 Subject: [PATCH 15/23] Added template wizard to allow for a C++ adapted root namespace https://github.com/microsoft/cppwinrt/pull/918 --- .../CppWizard.cs | 69 +++++++++++++++++++ .../SimpleKit.Templates.WindowsRuntime.csproj | 15 +++- .../source.extension.vsixmanifest | 1 + 3 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 templates/SimpleKit.Templates.WindowsRuntime/CppWizard.cs diff --git a/templates/SimpleKit.Templates.WindowsRuntime/CppWizard.cs b/templates/SimpleKit.Templates.WindowsRuntime/CppWizard.cs new file mode 100644 index 0000000..2e028d3 --- /dev/null +++ b/templates/SimpleKit.Templates.WindowsRuntime/CppWizard.cs @@ -0,0 +1,69 @@ +using EnvDTE; +using Microsoft; +using Microsoft.VisualStudio.ComponentModelHost; +using Microsoft.VisualStudio.OLE.Interop; +using Microsoft.VisualStudio.Shell; +using Microsoft.VisualStudio.TemplateWizard; +using NuGet.VisualStudio; +using System.Collections.Generic; +using System.ComponentModel.Composition; +using System.ComponentModel.Composition.Hosting; + +namespace SimpleKit.Templates.WindowsRuntime +{ + /// + /// A wizard extension that adds a root namespace dedicated to C++ + /// type definitions. + /// + internal sealed class CppWizard : IWizard + { + [Import] + internal IVsTemplateWizard Wizard { get; set; } + + private void Initialize(object automationObject) + { + ThreadHelper.ThrowIfNotOnUIThread(); + using (var serviceProvider = new ServiceProvider((IServiceProvider)automationObject)) + { + var componentModel = (IComponentModel)serviceProvider.GetService(typeof(SComponentModel)); + Assumes.Present(componentModel); + + using (var container = new CompositionContainer(componentModel.DefaultExportProvider)) + { + container.ComposeParts(this); + } + } + } + + // Code taken from here, many thanks to original author(s): + // https://github.com/sylveon/cppwinrt/blob/bb2339505debce51f9aed13703227668537da0ba/vsix/WizardExtension.cs + // Relevant thread: https://github.com/microsoft/cppwinrt/pull/918 + void IWizard.RunStarted(object automationObject, Dictionary replacementsDictionary, WizardRunKind runKind, object[] customParams) + { + ThreadHelper.ThrowIfNotOnUIThread(); + Initialize(automationObject); + + if (replacementsDictionary.TryGetValue("$rootnamespace$", out var rootNamespace)) + replacementsDictionary.Add("$cpprootnamespace$", rootNamespace.Replace(".", "::")); + else if (replacementsDictionary.TryGetValue("$projectname$", out var projectName)) + replacementsDictionary.Add("$cpprootnamespace$", projectName.Replace(".", "::")); + + Wizard.RunStarted(automationObject, replacementsDictionary, runKind, customParams); + } + + void IWizard.BeforeOpeningFile(ProjectItem projectItem) + => Wizard.BeforeOpeningFile(projectItem); + + void IWizard.ProjectFinishedGenerating(Project project) + => Wizard.ProjectFinishedGenerating(project); + + void IWizard.ProjectItemFinishedGenerating(ProjectItem projectItem) + => Wizard.ProjectItemFinishedGenerating(projectItem); + + void IWizard.RunFinished() + => Wizard.RunFinished(); + + bool IWizard.ShouldAddProjectItem(string filePath) + => Wizard.ShouldAddProjectItem(filePath); + } +} diff --git a/templates/SimpleKit.Templates.WindowsRuntime/SimpleKit.Templates.WindowsRuntime.csproj b/templates/SimpleKit.Templates.WindowsRuntime/SimpleKit.Templates.WindowsRuntime.csproj index d62ce23..782e1c1 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/SimpleKit.Templates.WindowsRuntime.csproj +++ b/templates/SimpleKit.Templates.WindowsRuntime/SimpleKit.Templates.WindowsRuntime.csproj @@ -4,6 +4,12 @@ 17.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + true + + + SimpleKitKey.pfx + Debug @@ -19,8 +25,8 @@ true true true - false - false + true + true true true Program @@ -46,6 +52,7 @@ 4 + @@ -59,6 +66,7 @@ true + Designer @@ -74,6 +82,9 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all + + 17.7.0 + diff --git a/templates/SimpleKit.Templates.WindowsRuntime/source.extension.vsixmanifest b/templates/SimpleKit.Templates.WindowsRuntime/source.extension.vsixmanifest index 8cf92ee..e006bb9 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/source.extension.vsixmanifest +++ b/templates/SimpleKit.Templates.WindowsRuntime/source.extension.vsixmanifest @@ -19,6 +19,7 @@ + From a7183e45999219e4bcee66a06188e35c57aa8225 Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:44:31 -0500 Subject: [PATCH 16/23] Added template wizard to blank app template --- .../ProjectTemplates/BlankApp/BlankApp.vstemplate | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate index d94d69e..e3501a4 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate @@ -47,7 +47,7 @@ Microsoft.VisualStudio.Universal.TemplateWizards.PlatformVersion.Wizard - NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - NuGet.VisualStudio.TemplateWizard + SimpleKit.Templates.WindowsRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6947745fa0996c29 + SimpleKit.Templates.WindowsRuntime.CppWizard \ No newline at end of file From 9b7d1a8ca05a9c3a2d129e92359a1f8ef055891f Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Tue, 22 Aug 2023 13:45:01 -0500 Subject: [PATCH 17/23] Adapted blank app template to new wizard --- .../ProjectTemplates/BlankApp/App.cpp | 7 ++++--- .../ProjectTemplates/BlankApp/App.h | 2 +- .../ProjectTemplates/BlankApp/App.xaml | 7 ++----- .../ProjectTemplates/BlankApp/Package.appxmanifest | 2 +- .../ProjectTemplates/BlankApp/Views/MainPage.cpp | 2 +- .../ProjectTemplates/BlankApp/Views/MainPage.h | 4 ++-- .../ProjectTemplates/BlankApp/Views/MainPage.xaml | 2 +- .../ProjectTemplates/BlankApp/Views/Views.idl | 2 +- .../ProjectTemplates/BlankApp/pch.h | 4 ++++ 9 files changed, 17 insertions(+), 15 deletions(-) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.cpp b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.cpp index c180196..7124963 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.cpp +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.cpp @@ -3,11 +3,12 @@ #include "Views/MainPage.h" -namespace wamc = winrt::Windows::ApplicationModel::Core; +namespace views = winrt::$cpprootnamespace$::Views::implementation; namespace wama = winrt::Windows::ApplicationModel::Activation; +namespace wamc = winrt::Windows::ApplicationModel::Core; namespace wux = winrt::Windows::UI::Xaml; -namespace winrt::$safeprojectname$::implementation { +namespace winrt::$cpprootnamespace$::implementation { App::App() { #if defined _DEBUG && !defined DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION UnhandledException([this](const IInspectable&, const wux::UnhandledExceptionEventArgs& e) @@ -24,7 +25,7 @@ namespace winrt::$safeprojectname$::implementation { void App::OnLaunched(const wama::LaunchActivatedEventArgs& args) const { const auto window = wux::Window::Current(); if (!window.Content()) - window.Content(winrt::make()); + window.Content(winrt::make()); if (!args.PrelaunchActivated()) { window.Activate(); diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.h b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.h index 3c3eace..17f68b1 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.h +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.h @@ -1,7 +1,7 @@ #pragma once #include "App.xaml.g.h" -namespace winrt::$safeprojectname$::implementation { +namespace winrt::$cpprootnamespace$::implementation { struct App : AppT { /** * @brief Creates the singleton application object. diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.xaml b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.xaml index 95c703a..d57a876 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.xaml +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/App.xaml @@ -1,7 +1,4 @@  - - + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" /> diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Package.appxmanifest b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Package.appxmanifest index 2ccc6dc..dcb22c6 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Package.appxmanifest +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Package.appxmanifest @@ -30,7 +30,7 @@ + EntryPoint="$projectname$.App"> { }; } diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml index 0303db5..f6f0359 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml @@ -1,5 +1,5 @@  #include #include + #include #include + #include +#include + #include #include #include From 951198491815ca7358bd17071bccf5517fbe3e3a Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Tue, 22 Aug 2023 15:54:06 -0500 Subject: [PATCH 18/23] Removed README --- .../BlankApp/BlankApp.vcxproj | 3 --- .../BlankApp/BlankApp.vcxproj.filters | 3 --- .../BlankApp/BlankApp.vstemplate | 1 - .../ProjectTemplates/BlankApp/readme.txt | 23 ------------------- 4 files changed, 30 deletions(-) delete mode 100644 templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/readme.txt diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj index 918541a..ffcf183 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj @@ -156,9 +156,6 @@ - - false - diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters index d629843..d8067c3 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vcxproj.filters @@ -47,9 +47,6 @@ - - - Views diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate index e3501a4..d4fd5ee 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/BlankApp.vstemplate @@ -35,7 +35,6 @@ Assets\StoreLogo.png Assets\Wide310x150Logo.scale-200.png PropertySheet.props - readme.txt diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/readme.txt b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/readme.txt deleted file mode 100644 index 8698c54..0000000 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/readme.txt +++ /dev/null @@ -1,23 +0,0 @@ -======================================================================== - C++/WinRT $projectname$ Project Overview -======================================================================== - -This project demonstrates how to get started writing XAML apps directly -with standard C++, using the C++/WinRT SDK component 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 C++/WinRT here: -http://aka.ms/cppwinrt/ -======================================================================== From cf63a4982af759fbabb7b95c4cd6356b2c24810b Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Wed, 23 Aug 2023 10:35:34 -0500 Subject: [PATCH 19/23] Updated landing page --- .../ProjectTemplates/BlankApp/Views/MainPage.xaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml index f6f0359..100323e 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml @@ -6,7 +6,11 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> - + + From cabe08b9b08f19fe802174b93028063caae570dc Mon Sep 17 00:00:00 2001 From: YourOrdinaryCat <49221554+YourOrdinaryCat@users.noreply.github.com> Date: Wed, 23 Aug 2023 21:49:42 -0500 Subject: [PATCH 20/23] Fixed button alignment in landing page --- .../ProjectTemplates/BlankApp/Views/MainPage.xaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml index 100323e..98fc009 100644 --- a/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml +++ b/templates/SimpleKit.Templates.WindowsRuntime/ProjectTemplates/BlankApp/Views/MainPage.xaml @@ -11,6 +11,10 @@ VerticalAlignment="Center" Spacing="8"> - +