From 19ffd9273240c0e5429532999c65981615e8f188 Mon Sep 17 00:00:00 2001 From: Darren Hoehna Date: Wed, 17 Aug 2022 11:11:30 -0700 Subject: [PATCH 1/3] Updating cs winui 3 packaged solution. Removing complex'ness. --- ...CsWinUiDesktopInstancing (Package).wapproj | 12 +- .../Images/LockScreenLogo.scale-200.png | Bin .../Images/SplashScreen.scale-200.png | Bin .../Images/Square150x150Logo.scale-200.png | Bin .../Images/Square44x44Logo.scale-200.png | Bin ...x44Logo.targetsize-24_altform-unplated.png | Bin .../Images/StoreLogo.png | Bin .../Images/Wide310x150Logo.scale-200.png | Bin .../Package.appxmanifest | 24 +- .../CsWinUiDesktopInstancing.sln | 70 ++--- .../ActivationTrackerHelper.cs | 52 ++++ .../{CsWinUiDesktopInstancing => }/App.xaml | 4 +- .../CsWinUiDesktopInstancing/App.xaml.cs | 89 +++++++ .../CsWinUiDesktopInstancing.csproj | 18 ++ .../CsWinUiDesktopInstancing/App.xaml.cs | 60 ----- .../CsWinUiDesktopInstancing.csproj | 36 --- .../CsWinUiDesktopInstancing/MainWindow.xaml | 31 --- .../MainWindow.xaml.cs | 38 --- .../CsWinUiDesktopInstancing/Program.cs | 241 ------------------ .../Properties/launchSettings.json | 7 - .../CsWinUiDesktopInstancing/MainWindow.xaml | 14 + .../MainWindow.xaml.cs | 39 +++ .../PublishProfiles/win10-arm64.pubxml | 3 +- .../PublishProfiles/win10-x64.pubxml | 3 +- .../PublishProfiles/win10-x86.pubxml | 3 +- .../app.manifest | 0 .../Instancing/cs-winui-packaged/Marlowe.moo | 14 - .../cs-winui-packaged/Shakespeare.moo | 14 - 28 files changed, 266 insertions(+), 506 deletions(-) rename Samples/AppLifecycle/Instancing/cs-winui-packaged/{CsWinUiDesktopInstancing => }/CsWinUiDesktopInstancing (Package)/CsWinUiDesktopInstancing (Package).wapproj (91%) rename Samples/AppLifecycle/Instancing/cs-winui-packaged/{CsWinUiDesktopInstancing => }/CsWinUiDesktopInstancing (Package)/Images/LockScreenLogo.scale-200.png (100%) rename Samples/AppLifecycle/Instancing/cs-winui-packaged/{CsWinUiDesktopInstancing => }/CsWinUiDesktopInstancing (Package)/Images/SplashScreen.scale-200.png (100%) rename Samples/AppLifecycle/Instancing/cs-winui-packaged/{CsWinUiDesktopInstancing => }/CsWinUiDesktopInstancing (Package)/Images/Square150x150Logo.scale-200.png (100%) rename Samples/AppLifecycle/Instancing/cs-winui-packaged/{CsWinUiDesktopInstancing => }/CsWinUiDesktopInstancing (Package)/Images/Square44x44Logo.scale-200.png (100%) rename Samples/AppLifecycle/Instancing/cs-winui-packaged/{CsWinUiDesktopInstancing => }/CsWinUiDesktopInstancing (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png (100%) rename Samples/AppLifecycle/Instancing/cs-winui-packaged/{CsWinUiDesktopInstancing => }/CsWinUiDesktopInstancing (Package)/Images/StoreLogo.png (100%) rename Samples/AppLifecycle/Instancing/cs-winui-packaged/{CsWinUiDesktopInstancing => }/CsWinUiDesktopInstancing (Package)/Images/Wide310x150Logo.scale-200.png (100%) rename Samples/AppLifecycle/Instancing/cs-winui-packaged/{CsWinUiDesktopInstancing => }/CsWinUiDesktopInstancing (Package)/Package.appxmanifest (65%) create mode 100644 Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/ActivationTrackerHelper.cs rename Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/{CsWinUiDesktopInstancing => }/App.xaml (87%) create mode 100644 Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/App.xaml.cs create mode 100644 Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing.csproj delete mode 100644 Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/App.xaml.cs delete mode 100644 Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing.csproj delete mode 100644 Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/MainWindow.xaml delete mode 100644 Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/MainWindow.xaml.cs delete mode 100644 Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/Program.cs delete mode 100644 Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/Properties/launchSettings.json create mode 100644 Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/MainWindow.xaml create mode 100644 Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/MainWindow.xaml.cs rename Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/{CsWinUiDesktopInstancing => }/Properties/PublishProfiles/win10-arm64.pubxml (78%) rename Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/{CsWinUiDesktopInstancing => }/Properties/PublishProfiles/win10-x64.pubxml (78%) rename Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/{CsWinUiDesktopInstancing => }/Properties/PublishProfiles/win10-x86.pubxml (78%) rename Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/{CsWinUiDesktopInstancing => }/app.manifest (100%) delete mode 100644 Samples/AppLifecycle/Instancing/cs-winui-packaged/Marlowe.moo delete mode 100644 Samples/AppLifecycle/Instancing/cs-winui-packaged/Shakespeare.moo diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/CsWinUiDesktopInstancing (Package).wapproj b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/CsWinUiDesktopInstancing (Package).wapproj similarity index 91% rename from Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/CsWinUiDesktopInstancing (Package).wapproj rename to Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/CsWinUiDesktopInstancing (Package).wapproj index 28f906859..dbd3fd066 100644 --- a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/CsWinUiDesktopInstancing (Package).wapproj +++ b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/CsWinUiDesktopInstancing (Package).wapproj @@ -35,10 +35,10 @@ - 00c39744-8a06-4f19-8387-08d5d2f51efe - 10.0.19041.0 - 10.0.19041.0 - net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback) + c52f1da3-cc53-48d6-bb67-f68556c9529f + 10.0.22621.0 + 10.0.17763.0 + net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback) en-US false ..\CsWinUiDesktopInstancing\CsWinUiDesktopInstancing.csproj @@ -64,10 +64,10 @@ - + build - + build diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/LockScreenLogo.scale-200.png b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/LockScreenLogo.scale-200.png similarity index 100% rename from Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/LockScreenLogo.scale-200.png rename to Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/LockScreenLogo.scale-200.png diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/SplashScreen.scale-200.png b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/SplashScreen.scale-200.png similarity index 100% rename from Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/SplashScreen.scale-200.png rename to Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/SplashScreen.scale-200.png diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/Square150x150Logo.scale-200.png b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/Square150x150Logo.scale-200.png similarity index 100% rename from Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/Square150x150Logo.scale-200.png rename to Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/Square150x150Logo.scale-200.png diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/Square44x44Logo.scale-200.png b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/Square44x44Logo.scale-200.png similarity index 100% rename from Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/Square44x44Logo.scale-200.png rename to Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/Square44x44Logo.scale-200.png diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png rename to Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/StoreLogo.png b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/StoreLogo.png similarity index 100% rename from Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/StoreLogo.png rename to Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/StoreLogo.png diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/Wide310x150Logo.scale-200.png b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/Wide310x150Logo.scale-200.png similarity index 100% rename from Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Images/Wide310x150Logo.scale-200.png rename to Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Images/Wide310x150Logo.scale-200.png diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Package.appxmanifest b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Package.appxmanifest similarity index 65% rename from Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Package.appxmanifest rename to Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Package.appxmanifest index 73ec4da51..1d8a37e90 100644 --- a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing (Package)/Package.appxmanifest +++ b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing (Package)/Package.appxmanifest @@ -7,13 +7,13 @@ IgnorableNamespaces="uap rescap"> - CsWinUiDesktopInstancing - Microsoft Corporation + CsWinUiDesktopInstancing (Package) + dahoehna Images\StoreLogo.png @@ -31,26 +31,14 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> - - - - - Images\StoreLogo.png - - .moo - - - - - diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing.sln b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing.sln index 84208d4a7..ce72c22aa 100644 --- a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing.sln +++ b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31624.102 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32811.315 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "CsWinUiDesktopInstancing (Package)", "CsWinUiDesktopInstancing\CsWinUiDesktopInstancing (Package)\CsWinUiDesktopInstancing (Package).wapproj", "{00C39744-8A06-4F19-8387-08D5D2F51EFE}" +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "CsWinUiDesktopInstancing (Package)", "CsWinUiDesktopInstancing (Package)\CsWinUiDesktopInstancing (Package).wapproj", "{C52F1DA3-CC53-48D6-BB67-F68556C9529F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsWinUiDesktopInstancing", "CsWinUiDesktopInstancing\CsWinUiDesktopInstancing\CsWinUiDesktopInstancing.csproj", "{6F47035B-47C3-4DAB-A346-45364DD02004}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsWinUiDesktopInstancing", "CsWinUiDesktopInstancing\CsWinUiDesktopInstancing.csproj", "{57A96983-B741-4206-8C25-3E86E942264B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,41 +17,41 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Debug|arm64.ActiveCfg = Debug|arm64 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Debug|arm64.Build.0 = Debug|arm64 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Debug|arm64.Deploy.0 = Debug|arm64 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Debug|x64.ActiveCfg = Debug|x64 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Debug|x64.Build.0 = Debug|x64 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Debug|x64.Deploy.0 = Debug|x64 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Debug|x86.ActiveCfg = Debug|x86 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Debug|x86.Build.0 = Debug|x86 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Debug|x86.Deploy.0 = Debug|x86 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Release|arm64.ActiveCfg = Release|arm64 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Release|arm64.Build.0 = Release|arm64 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Release|arm64.Deploy.0 = Release|arm64 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Release|x64.ActiveCfg = Release|x64 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Release|x64.Build.0 = Release|x64 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Release|x64.Deploy.0 = Release|x64 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Release|x86.ActiveCfg = Release|x86 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Release|x86.Build.0 = Release|x86 - {00C39744-8A06-4F19-8387-08D5D2F51EFE}.Release|x86.Deploy.0 = Release|x86 - {6F47035B-47C3-4DAB-A346-45364DD02004}.Debug|arm64.ActiveCfg = Debug|arm64 - {6F47035B-47C3-4DAB-A346-45364DD02004}.Debug|arm64.Build.0 = Debug|arm64 - {6F47035B-47C3-4DAB-A346-45364DD02004}.Debug|x64.ActiveCfg = Debug|x64 - {6F47035B-47C3-4DAB-A346-45364DD02004}.Debug|x64.Build.0 = Debug|x64 - {6F47035B-47C3-4DAB-A346-45364DD02004}.Debug|x86.ActiveCfg = Debug|x86 - {6F47035B-47C3-4DAB-A346-45364DD02004}.Debug|x86.Build.0 = Debug|x86 - {6F47035B-47C3-4DAB-A346-45364DD02004}.Release|arm64.ActiveCfg = Release|arm64 - {6F47035B-47C3-4DAB-A346-45364DD02004}.Release|arm64.Build.0 = Release|arm64 - {6F47035B-47C3-4DAB-A346-45364DD02004}.Release|x64.ActiveCfg = Release|x64 - {6F47035B-47C3-4DAB-A346-45364DD02004}.Release|x64.Build.0 = Release|x64 - {6F47035B-47C3-4DAB-A346-45364DD02004}.Release|x86.ActiveCfg = Release|x86 - {6F47035B-47C3-4DAB-A346-45364DD02004}.Release|x86.Build.0 = Release|x86 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Debug|arm64.ActiveCfg = Debug|arm64 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Debug|arm64.Build.0 = Debug|arm64 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Debug|arm64.Deploy.0 = Debug|arm64 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Debug|x64.ActiveCfg = Debug|x64 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Debug|x64.Build.0 = Debug|x64 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Debug|x64.Deploy.0 = Debug|x64 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Debug|x86.ActiveCfg = Debug|x86 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Debug|x86.Build.0 = Debug|x86 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Debug|x86.Deploy.0 = Debug|x86 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Release|arm64.ActiveCfg = Release|arm64 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Release|arm64.Build.0 = Release|arm64 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Release|arm64.Deploy.0 = Release|arm64 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Release|x64.ActiveCfg = Release|x64 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Release|x64.Build.0 = Release|x64 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Release|x64.Deploy.0 = Release|x64 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Release|x86.ActiveCfg = Release|x86 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Release|x86.Build.0 = Release|x86 + {C52F1DA3-CC53-48D6-BB67-F68556C9529F}.Release|x86.Deploy.0 = Release|x86 + {57A96983-B741-4206-8C25-3E86E942264B}.Debug|arm64.ActiveCfg = Debug|arm64 + {57A96983-B741-4206-8C25-3E86E942264B}.Debug|arm64.Build.0 = Debug|arm64 + {57A96983-B741-4206-8C25-3E86E942264B}.Debug|x64.ActiveCfg = Debug|x64 + {57A96983-B741-4206-8C25-3E86E942264B}.Debug|x64.Build.0 = Debug|x64 + {57A96983-B741-4206-8C25-3E86E942264B}.Debug|x86.ActiveCfg = Debug|x86 + {57A96983-B741-4206-8C25-3E86E942264B}.Debug|x86.Build.0 = Debug|x86 + {57A96983-B741-4206-8C25-3E86E942264B}.Release|arm64.ActiveCfg = Release|arm64 + {57A96983-B741-4206-8C25-3E86E942264B}.Release|arm64.Build.0 = Release|arm64 + {57A96983-B741-4206-8C25-3E86E942264B}.Release|x64.ActiveCfg = Release|x64 + {57A96983-B741-4206-8C25-3E86E942264B}.Release|x64.Build.0 = Release|x64 + {57A96983-B741-4206-8C25-3E86E942264B}.Release|x86.ActiveCfg = Release|x86 + {57A96983-B741-4206-8C25-3E86E942264B}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6E3F7613-0E42-488E-A45A-A7ED4684A761} + SolutionGuid = {E30441A4-3660-43F3-8683-EFC42CF42C67} EndGlobalSection EndGlobal diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/ActivationTrackerHelper.cs b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/ActivationTrackerHelper.cs new file mode 100644 index 000000000..1440c7195 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/ActivationTrackerHelper.cs @@ -0,0 +1,52 @@ +using Microsoft.Win32; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CsWinUiDesktopInstancing +{ + internal static class ActivationTrackerHelper + { + private const string c_redirectionKeyName = @"SOFTWARE\AppLifecycleExample"; + private const string c_redirectionValueName = "NumberOfActivations"; + + private static RegistryKey GetRegistryKey() + { + return Registry.CurrentUser.CreateSubKey(c_redirectionKeyName, true); + } + + private static void SetNumberOfActivations(int newNumberOfActivations) + { + RegistryKey instanceTrackerKey = GetRegistryKey(); + instanceTrackerKey.SetValue(c_redirectionValueName, newNumberOfActivations); + } + + internal static int IncrementAndSetNumberOfRedirectionsReturnNewNumber() + { + int numberOfActivations = GetNumberOfActivations(); + numberOfActivations++; + SetNumberOfActivations(numberOfActivations); + return numberOfActivations; + } + + internal static int GetNumberOfActivations() + { + int numberOfActivations = 0; + RegistryKey instanceTrackerKey = GetRegistryKey(); + + object numberOfActivationsAsObject = instanceTrackerKey.GetValue(c_redirectionValueName); + if (numberOfActivationsAsObject == null) + { + instanceTrackerKey.SetValue(c_redirectionValueName, numberOfActivations); + } + else + { + numberOfActivations = Convert.ToInt32(numberOfActivationsAsObject); + } + + return numberOfActivations; + } + } +} diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/App.xaml b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/App.xaml similarity index 87% rename from Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/App.xaml rename to Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/App.xaml index 3433dfd5a..9ef05fece 100644 --- a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/App.xaml +++ b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/App.xaml @@ -1,6 +1,4 @@ - - + /// Provides application-specific behavior to supplement the default Application class. + /// + public partial class App : Application + { + // Modify this to increase the number of active instances. + public const int c_maxNumberOfInstances = 2; + + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + this.InitializeComponent(); + } + + /// + /// Invoked when the application is launched 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. + + // NOTE: Redirection needs to happen here. If redirection is done anywhere else the behavior is unknown. + // For example, I got a COM error when redirection was in the constructor for m_Window. + protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) + { + int numberOfActivations = ActivationTrackerHelper.IncrementAndSetNumberOfRedirectionsReturnNewNumber(); + m_window = new MainWindow(); + + // GetInstances also gets the current instance. + // Meat and potatoes of redirection. + var instances = Microsoft.Windows.AppLifecycle.AppInstance.GetInstances(); + + // Number will be incorrect if instance (instanceNumber < c_maxNumberOfInstances) is closed. + // Can be fixed on an OnExit event handler. + m_window.Title = "Instance: " + ((instances.Count) - 1).ToString(); + + // Need activated event args to pass into the redirected instance. + var activatedArgs = Microsoft.Windows.AppLifecycle.AppInstance.GetCurrent().GetActivatedEventArgs(); + bool isActivationRedirected = false; + if (instances.Count > c_maxNumberOfInstances) + { + // Time to redirect + // Choose what instance to redirect to. + int instanceToRedirectTo = (numberOfActivations % c_maxNumberOfInstances); + isActivationRedirected = true; + + // Need to call RedirectActivationToAsync on the instance to redirect to. + // Not passing in the instance into RedirectionActivationToAsync. + instances[instanceToRedirectTo].RedirectActivationToAsync(activatedArgs).GetAwaiter(); + } + + if (isActivationRedirected) + { + this.Exit(); + } + else + { + m_window.Activate(); + } + } + + private Window m_window; + } +} diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing.csproj b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing.csproj new file mode 100644 index 000000000..7c4fdbe6a --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing.csproj @@ -0,0 +1,18 @@ + + + WinExe + net6.0-windows10.0.19041.0 + 10.0.17763.0 + CsWinUiDesktopInstancing + app.manifest + x86;x64;arm64 + win10-x86;win10-x64;win10-arm64 + true + + + + + + + + diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/App.xaml.cs b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/App.xaml.cs deleted file mode 100644 index 4c9ca4970..000000000 --- a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/App.xaml.cs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -using Microsoft.UI.Xaml; - -namespace CsWinUiDesktopInstancing -{ - public partial class App : Application - { - private Window m_window; - public Window AppWindow - { - get { return m_window; } - private set { } - } - - public App() - { - InitializeComponent(); - } - - // NOTE: WinUI's App.OnLaunched is given a Microsoft.UI.Xaml.LaunchActivatedEventArgs, - // where the UWPLaunchActivatedEventArgs property will be one of the - // Windows.ApplicationModel.Activation.*ActivatedEventArgs types. - // Conversely, AppInstance.GetActivatedEventArgs will return a - // Microsoft.Windows.AppLifecycle.AppActivationArguments, where the Data property - // will be one of the Windows.ApplicationModel.Activation.*ActivatedEventArgs types. - protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) - { - // NOTE: OnLaunched will always report that the ActivationKind == Launch, - // even when it isn't. - Windows.ApplicationModel.Activation.ActivationKind kind - = args.UWPLaunchActivatedEventArgs.Kind; - Program.ReportInfo($"OnLaunched: Kind={kind}"); - - // NOTE: AppInstance is ambiguous between - // Microsoft.Windows.AppLifecycle.AppInstance and - // Windows.ApplicationModel.AppInstance - var currentInstance = - Microsoft.Windows.AppLifecycle.AppInstance.GetCurrent(); - if (currentInstance != null) - { - // AppInstance.GetActivatedEventArgs will report the correct ActivationKind, - // even in WinUI's OnLaunched. - Microsoft.Windows.AppLifecycle.AppActivationArguments activationArgs - = currentInstance.GetActivatedEventArgs(); - if (activationArgs != null) - { - Microsoft.Windows.AppLifecycle.ExtendedActivationKind extendedKind - = activationArgs.Kind; - Program.ReportInfo($"activationArgs.Kind={extendedKind}"); - } - } - - // Go ahead and do standard window initialization regardless. - m_window = new MainWindow(); - m_window.Activate(); - } - } -} diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing.csproj b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing.csproj deleted file mode 100644 index 10d94b4b3..000000000 --- a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - WinExe - net5.0-windows10.0.19041.0 - 10.0.17763.0 - CsWinUiDesktopInstancing - app.manifest - x86;x64;arm64 - win10-x86;win10-x64;win10-arm64 - true - - - DISABLE_XAML_GENERATED_MAIN - - - DISABLE_XAML_GENERATED_MAIN - - - DISABLE_XAML_GENERATED_MAIN - - - DISABLE_XAML_GENERATED_MAIN - - - DISABLE_XAML_GENERATED_MAIN - - - DISABLE_XAML_GENERATED_MAIN - - - - - - - - diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/MainWindow.xaml b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/MainWindow.xaml deleted file mode 100644 index e75cd9e8e..000000000 --- a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/MainWindow.xaml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/MainWindow.xaml.cs b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/MainWindow.xaml.cs deleted file mode 100644 index d11ff07f2..000000000 --- a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/MainWindow.xaml.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -using Microsoft.UI.Xaml; - -namespace CsWinUiDesktopInstancing -{ - public sealed partial class MainWindow : Window - { - public MainWindow() - { - InitializeComponent(); - Title = "CsWinUiDesktopInstancing"; - - if (Program.OutputStack != null && Program.OutputStack.Count > 0) - { - foreach (string message in Program.OutputStack) - { - OutputMessage(message); - } - Program.OutputStack.Clear(); - } - } - - public void OutputMessage(string message) - { - DispatcherQueue.TryEnqueue(() => - { - StatusListView.Items.Add(message); - }); - } - - private void ActivationInfoButton_Click(object sender, RoutedEventArgs e) - { - Program.GetActivationInfo(); - } - } -} diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/Program.cs b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/Program.cs deleted file mode 100644 index 44325fe7b..000000000 --- a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/Program.cs +++ /dev/null @@ -1,241 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -using Microsoft.UI.Dispatching; -using Microsoft.Windows.AppLifecycle; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.InteropServices; -using System.Threading; -using System.Threading.Tasks; -using Windows.ApplicationModel.Activation; -using Windows.Storage; - -namespace CsWinUiDesktopInstancing -{ - // NOTE: We need to check for redirection as early as possible, and - // before creating any windows. To do this, we must define this symbol - // in the project build properties: - // DISABLE_XAML_GENERATED_MAIN - // ...and define a custom Program class with a Main method - - public static class Program - { - private static int activationCount = 1; - public static List OutputStack { get; private set; } - - // Replaces the standard App.g.i.cs. - // Note: We can't declare Main to be async because in a WinUI app - // this prevents Narrator from reading XAML elements. - [STAThread] - static void Main(string[] args) - { - WinRT.ComWrappersSupport.InitializeComWrappers(); - - OutputStack = new(); - - bool isRedirect = DecideRedirection(); - if (!isRedirect) - { - Microsoft.UI.Xaml.Application.Start((p) => - { - var context = new DispatcherQueueSynchronizationContext( - DispatcherQueue.GetForCurrentThread()); - SynchronizationContext.SetSynchronizationContext(context); - new App(); - }); - } - } - - #region Report helpers - - public static void ReportInfo(string message) - { - // If we already have a form, display the message now. - // Otherwise, add it to the collection for displaying later. - if (App.Current is App thisApp && thisApp.AppWindow != null - && thisApp.AppWindow is MainWindow mainWindow) - { - mainWindow.OutputMessage(message); - } - else - { - OutputStack.Add(message); - } - } - - private static void ReportFileArgs(string callSite, AppActivationArguments args) - { - ReportInfo($"called from {callSite}"); - if (args.Data is IFileActivatedEventArgs fileArgs) - { - IStorageItem item = fileArgs.Files.FirstOrDefault(); - if (item is StorageFile file) - { - ReportInfo($"file: {file.Name}"); - } - } - } - - private static void ReportLaunchArgs(string callSite, AppActivationArguments args) - { - ReportInfo($"called from {callSite}"); - if (args.Data is ILaunchActivatedEventArgs launchArgs) - { - string[] argStrings = launchArgs.Arguments.Split(); - for (int i = 0; i < argStrings.Length; i++) - { - string argString = argStrings[i]; - if (!string.IsNullOrWhiteSpace(argString)) - { - ReportInfo($"arg[{i}] = {argString}"); - } - } - } - } - - private static void OnActivated(object sender, AppActivationArguments args) - { - ExtendedActivationKind kind = args.Kind; - if (kind == ExtendedActivationKind.Launch) - { - ReportLaunchArgs($"OnActivated ({activationCount++})", args); - } - else if (kind == ExtendedActivationKind.File) - { - ReportFileArgs($"OnActivated ({activationCount++})", args); - } - } - - public static void GetActivationInfo() - { - AppActivationArguments args = AppInstance.GetCurrent().GetActivatedEventArgs(); - ExtendedActivationKind kind = args.Kind; - ReportInfo($"ActivationKind: {kind}"); - - if (kind == ExtendedActivationKind.Launch) - { - if (args.Data is ILaunchActivatedEventArgs launchArgs) - { - string argString = launchArgs.Arguments; - string[] argStrings = argString.Split(); - foreach (string arg in argStrings) - { - if (!string.IsNullOrWhiteSpace(arg)) - { - ReportInfo(arg); - } - } - } - } - else if (kind == ExtendedActivationKind.File) - { - if (args.Data is IFileActivatedEventArgs fileArgs) - { - IStorageItem file = fileArgs.Files.FirstOrDefault(); - if (file != null) - { - ReportInfo(file.Name); - } - } - } - } - - #endregion - - - #region Redirection - - // Decide if we want to redirect the incoming activation to another instance. - private static bool DecideRedirection() - { - bool isRedirect = false; - - // Find out what kind of activation this is. - AppActivationArguments args = AppInstance.GetCurrent().GetActivatedEventArgs(); - ExtendedActivationKind kind = args.Kind; - ReportInfo($"ActivationKind={kind}"); - if (kind == ExtendedActivationKind.Launch) - { - // This is a launch activation. - ReportLaunchArgs("Main", args); - } - else if (kind == ExtendedActivationKind.File) - { - ReportFileArgs("Main", args); - - try - { - // This is a file activation: here we'll get the file information, - // and register the file name as our instance key. - if (args.Data is IFileActivatedEventArgs fileArgs) - { - IStorageItem file = fileArgs.Files[0]; - AppInstance keyInstance = AppInstance.FindOrRegisterForKey(file.Name); - ReportInfo($"Registered key = {keyInstance.Key}"); - - // If we successfully registered the file name, we must be the - // only instance running that was activated for this file. - if (keyInstance.IsCurrent) - { - // Report successful file name key registration. - ReportInfo($"IsCurrent=true; registered this instance for {file.Name}"); - - // Hook up the Activated event, to allow for this instance of the app - // getting reactivated as a result of multi-instance redirection. - keyInstance.Activated += OnActivated; - } - else - { - isRedirect = true; - RedirectActivationTo(args, keyInstance); - } - } - } - catch (Exception ex) - { - ReportInfo($"Error getting instance information: {ex.Message}"); - } - } - - return isRedirect; - } - - [DllImport("kernel32.dll", CharSet = CharSet.Unicode)] - private static extern IntPtr CreateEvent( - IntPtr lpEventAttributes, bool bManualReset, - bool bInitialState, string lpName); - - [DllImport("kernel32.dll")] - private static extern bool SetEvent(IntPtr hEvent); - - [DllImport("ole32.dll")] - private static extern uint CoWaitForMultipleObjects( - uint dwFlags, uint dwMilliseconds, ulong nHandles, - IntPtr[] pHandles, out uint dwIndex); - - private static IntPtr redirectEventHandle = IntPtr.Zero; - - // Do the redirection on another thread, and use a non-blocking - // wait method to wait for the redirection to complete. - public static void RedirectActivationTo( - AppActivationArguments args, AppInstance keyInstance) - { - redirectEventHandle = CreateEvent(IntPtr.Zero, true, false, null); - Task.Run(() => - { - keyInstance.RedirectActivationToAsync(args).AsTask().Wait(); - SetEvent(redirectEventHandle); - }); - uint CWMO_DEFAULT = 0; - uint INFINITE = 0xFFFFFFFF; - _ = CoWaitForMultipleObjects( - CWMO_DEFAULT, INFINITE, 1, - new IntPtr[] { redirectEventHandle }, out uint handleIndex); - } - - #endregion - - } -} diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/Properties/launchSettings.json b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/Properties/launchSettings.json deleted file mode 100644 index 98be39af2..000000000 --- a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/Properties/launchSettings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "profiles": { - "CsWinUiDesktopInstancing": { - "commandName": "Project" - } - } -} \ No newline at end of file diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/MainWindow.xaml b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/MainWindow.xaml new file mode 100644 index 000000000..48e344224 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/MainWindow.xaml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/MainWindow.xaml.cs b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/MainWindow.xaml.cs new file mode 100644 index 000000000..b2a9c3f05 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/MainWindow.xaml.cs @@ -0,0 +1,39 @@ +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace CsWinUiDesktopInstancing +{ + /// + /// An empty window that can be used on its own or navigated to within a Frame. + /// + public sealed partial class MainWindow : Window + { + public MainWindow() + { + int numberOfActivations = ActivationTrackerHelper.GetNumberOfActivations(); + this.Title = numberOfActivations.ToString(); + this.InitializeComponent(); + activationTrackerTextBox.Text = numberOfActivations.ToString(); + } + + private void activationTrackerButton_Click(object sender, RoutedEventArgs e) + { + activationTrackerTextBox.Text = ActivationTrackerHelper.GetNumberOfActivations().ToString(); + } + } +} diff --git a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/Properties/PublishProfiles/win10-arm64.pubxml b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/Properties/PublishProfiles/win10-arm64.pubxml similarity index 78% rename from Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/Properties/PublishProfiles/win10-arm64.pubxml rename to Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/Properties/PublishProfiles/win10-arm64.pubxml index 8dd0b28c0..a132e44c6 100644 --- a/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/Properties/PublishProfiles/win10-arm64.pubxml +++ b/Samples/AppLifecycle/Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/Properties/PublishProfiles/win10-arm64.pubxml @@ -10,7 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ true False - True + False + True - + +using namespace winrt; +using namespace Windows::Foundation; +using namespace winrt::Microsoft::UI::Xaml; +using namespace winrt::Microsoft::UI::Xaml::Controls; +using namespace winrt::Microsoft::UI::Xaml::Navigation; +using namespace CppWinUiDesktopInstancing; +using namespace CppWinUiDesktopInstancing::implementation; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +/// +/// Initializes the singleton application object. This is the first line of authored code +/// executed, and as such is the logical equivalent of main() or WinMain(). +/// +App::App() +{ + InitializeComponent(); + +#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&) +{ + auto numberOfActivations{ IncrementAndSetNumberOfRedirectionsReturnNewNumber() }; + window = make(); + + // GetInstances also gets the current instance. + // Meat and potatoes of redirection. + auto instances = winrt::Microsoft::Windows::AppLifecycle::AppInstance::GetInstances(); + + // Number will be incorrect if instance (instanceNumber < c_maxNumberOfInstances) is closed. + // Can be fixed on an OnExit event handler. + std::wstring windowTitle{L"Instances: "}; + windowTitle.append(std::to_wstring(instances.Size() - 1)); + window.Title(windowTitle); + + + // Need activated event args to pass into the redirected instance. + auto activatedArgs = winrt::Microsoft::Windows::AppLifecycle::AppInstance::GetCurrent().GetActivatedEventArgs(); + bool isActivationRedirected = false; + if (instances.Size() > c_maxNumberOfInstances) + { + // Time to redirect + // Choose what instance to redirect to. + int instanceToRedirectTo = (numberOfActivations % c_maxNumberOfInstances); + isActivationRedirected = true; + + // Need to call RedirectActivationToAsync on the instance to redirect to. + // Not passing in the instance into RedirectionActivationToAsync. + instances.GetAt(instanceToRedirectTo).RedirectActivationToAsync(activatedArgs).GetResults(); + } + + if (isActivationRedirected) + { + this->Exit(); + } + else + { + window.Activate(); + } +} diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/App.xaml.h b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/App.xaml.h new file mode 100644 index 000000000..9de4d849e --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/App.xaml.h @@ -0,0 +1,17 @@ +#pragma once + +#include "App.xaml.g.h" + +namespace winrt::CppWinUiDesktopInstancing::implementation +{ + struct App : AppT + { + const DWORD c_maxNumberOfInstances{ 2 }; + App(); + + void OnLaunched(Microsoft::UI::Xaml::LaunchActivatedEventArgs const&); + + private: + winrt::Microsoft::UI::Xaml::Window window{ nullptr }; + }; +} diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing.vcxproj b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing.vcxproj similarity index 58% rename from Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing.vcxproj rename to Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing.vcxproj index c29d2bcce..8029a052e 100644 --- a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing.vcxproj +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing.vcxproj @@ -1,14 +1,13 @@  - - - - + + + true true true - {49ac0c00-df6b-4f6c-a5dd-d178bf133a2c} + {67844494-855a-468d-8d92-fa34d7e2f680} CppWinUiDesktopInstancing CppWinUiDesktopInstancing - - - - - - - - - - - - - - diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.xaml.cpp b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.xaml.cpp deleted file mode 100644 index 60265969f..000000000 --- a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.xaml.cpp +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -#include "pch.h" -#include "App.xaml.h" -#include "MainWindow.xaml.h" -#if __has_include("MainWindow.g.cpp") -#include "MainWindow.g.cpp" -#endif - -using namespace winrt; -using namespace winrt::Microsoft::UI::Xaml; - -namespace winrt::CppWinUiDesktopInstancing::implementation -{ - MainWindow::MainWindow() - { - InitializeComponent(); - this->StatusListView().ItemsSource(messages); - this->Title(winrt::hstring(L"CppWinUiDesktopInstancing")); - } -} - -void winrt::CppWinUiDesktopInstancing::implementation::MainWindow::ActivationInfoButton_Click( - winrt::Windows::Foundation::IInspectable const& /*sender*/, - winrt::Microsoft::UI::Xaml::RoutedEventArgs const& /*e*/) -{ - GetActivationInfo(); -} diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/pch.cpp b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/pch.cpp deleted file mode 100644 index f9d486919..000000000 --- a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/pch.cpp +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -#include "pch.h" diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.idl b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/MainWindow.idl similarity index 51% rename from Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.idl rename to Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/MainWindow.idl index 1601f3d01..c4bf8e124 100644 --- a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.idl +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/MainWindow.idl @@ -1,7 +1,4 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -namespace CppWinUiDesktopInstancing +namespace CppWinUiDesktopInstancing { [default_interface] runtimeclass MainWindow : Microsoft.UI.Xaml.Window diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/MainWindow.xaml b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/MainWindow.xaml new file mode 100644 index 000000000..6bfa4ebc7 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/MainWindow.xaml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/MainWindow.xaml.cpp b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/MainWindow.xaml.cpp new file mode 100644 index 000000000..3bf0507c3 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/MainWindow.xaml.cpp @@ -0,0 +1,30 @@ +#include "pch.h" +#include "MainWindow.xaml.h" +#if __has_include("MainWindow.g.cpp") +#include "MainWindow.g.cpp" +#endif +#include "ActivationTrackerHelper.h" + +using namespace winrt; +using namespace winrt::Microsoft::UI::Xaml; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace winrt::CppWinUiDesktopInstancing::implementation +{ + MainWindow::MainWindow() + { + auto numberOfActivations{ GetNumberOfActivations() }; + this->Title(winrt::to_hstring(static_cast(numberOfActivations))); + InitializeComponent(); + auto activationTextBox{ activationTrackerTextBox()}; + activationTextBox.Text(winrt::to_hstring(static_cast(numberOfActivations))); + } + + void MainWindow::activationTrackerButton_Click(IInspectable const&, RoutedEventArgs const&) + { + auto activationTextBox{ activationTrackerTextBox() }; + activationTextBox.Text(winrt::to_hstring(static_cast(GetNumberOfActivations()))); + } +} diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.xaml.h b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/MainWindow.xaml.h similarity index 55% rename from Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.xaml.h rename to Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/MainWindow.xaml.h index 6b238a73d..71844da81 100644 --- a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/MainWindow.xaml.h +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/MainWindow.xaml.h @@ -1,7 +1,4 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -#pragma once +#pragma once #include "MainWindow.g.h" namespace winrt::CppWinUiDesktopInstancing::implementation @@ -9,10 +6,7 @@ namespace winrt::CppWinUiDesktopInstancing::implementation struct MainWindow : MainWindowT { MainWindow(); - - void ActivationInfoButton_Click( - winrt::Windows::Foundation::IInspectable const& sender, - winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e); + void activationTrackerButton_Click(Windows::Foundation::IInspectable const& sender, Microsoft::UI::Xaml::RoutedEventArgs const& args); }; } diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/app.manifest b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/app.manifest similarity index 100% rename from Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/app.manifest rename to Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/app.manifest diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/packages.config b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/packages.config similarity index 63% rename from Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/packages.config rename to Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/packages.config index 4d5709d40..b376144b5 100644 --- a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/packages.config +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/packages.config @@ -1,7 +1,7 @@  - + - - + + \ No newline at end of file diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/pch.cpp b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/pch.cpp new file mode 100644 index 000000000..bcb5590be --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/pch.cpp @@ -0,0 +1 @@ +#include "pch.h" diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/pch.h b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/pch.h similarity index 72% rename from Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/pch.h rename to Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/pch.h index a9f87647a..2f32fca8c 100644 --- a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/CppWinUiDesktopInstancing/pch.h +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/pch.h @@ -1,19 +1,9 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -#pragma once +#pragma once #include #include #include #include -#include -#include -#include -#include -#include -#include "strsafe.h" - // Undefine GetCurrentTime macro to prevent // conflict with Storyboard::GetCurrentTime #undef GetCurrentTime @@ -32,8 +22,4 @@ #include #include #include - -#include -#include - -#include +#include \ No newline at end of file diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/readme.txt b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/readme.txt new file mode 100644 index 000000000..a84a00939 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/readme.txt @@ -0,0 +1,27 @@ +======================================================================== + CppWinUiDesktopInstancing Project Overview +======================================================================== + +This project demonstrates how to get started writing WinUI3 apps directly +with standard C++, using the Windows App SDK and C++/WinRT packages and +XAML compiler support to generate implementation headers from interface +(IDL) files. These headers can then be used to implement the local +Windows Runtime classes referenced in the app's XAML pages. + +Steps: +1. Create an interface (IDL) file to define any local Windows Runtime + classes referenced in the app's XAML pages. +2. Build the project once to generate implementation templates under + the "Generated Files" folder, as well as skeleton class definitions + under "Generated Files\sources". +3. Use the skeleton class definitions for reference to implement your + Windows Runtime classes. + +======================================================================== +Learn more about Windows App SDK here: +https://docs.microsoft.com/windows/apps/windows-app-sdk/ +Learn more about WinUI3 here: +https://docs.microsoft.com/windows/apps/winui/winui3/ +Learn more about C++/WinRT here: +http://aka.ms/cppwinrt/ +======================================================================== diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/Marlowe.moo b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/Marlowe.moo deleted file mode 100644 index d61fd88f7..000000000 --- a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/Marlowe.moo +++ /dev/null @@ -1,14 +0,0 @@ -And we will sit upon the rocks, -And see the shepherds feed their flocks -By shallow rivers, to whose falls -Melodious birds sing madrigals. - -And I will make thee beds of roses -And a thousand fragrant posies; -A cap of flowers, and a kirtle -Embroider'd all with leaves of myrtle. - -A gown made of the finest wool -Which from our pretty lambs we pull; -Fair-lined slippers for the cold, -With buckles of the purest gold. diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/Shakespeare.moo b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/Shakespeare.moo deleted file mode 100644 index 70818da95..000000000 --- a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/Shakespeare.moo +++ /dev/null @@ -1,14 +0,0 @@ -Shall I compare thee to a Summer's day? -Thou art more lovely and more temperate: -Rough winds do shake the darling buds of May, -And Summer's lease hath all too short a date; -Sometimes too hot the eye of heaven shines, -And often is his gold complexion dimm'd; -And every fair from fair sometimes declines, -By chance or nature's changing course untrimm'd; -But thy eternal Summer shall not fade -Nor lose possession of that fair thou owest; -Nor shall Death brag thou wanderest in his shade, -When in eternal lines to time thou growest; -So long as men can breathe, or eyes can see, -So long lives this, and this gives life to thee. From 09f8ca4478b86fc1d9bc4e59abf1ba05603e3f9a Mon Sep 17 00:00:00 2001 From: Darren Hoehna Date: Tue, 11 Oct 2022 12:17:25 -0700 Subject: [PATCH 3/3] Addressing comments --- .../Package.appxmanifest | 2 +- .../ActivationTrackerHelper.h | 2 +- .../CppWinUiDesktopInstancing/App.xaml | 3 +- .../CppWinUiDesktopInstancing/App.xaml.cpp | 2 +- .../EMTrackingChecking/App.cpp | 118 +++++++++++ .../EMTrackingChecking/App.h | 13 ++ .../EMTrackingChecking/App.idl | 3 + .../EMTrackingChecking/App.xaml | 7 + .../Assets/LockScreenLogo.scale-200.png | Bin 0 -> 1430 bytes .../Assets/SplashScreen.scale-200.png | Bin 0 -> 7700 bytes .../Assets/Square150x150Logo.scale-200.png | Bin 0 -> 2937 bytes .../Assets/Square44x44Logo.scale-200.png | Bin 0 -> 1647 bytes ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 1255 bytes .../EMTrackingChecking/Assets/StoreLogo.png | Bin 0 -> 1451 bytes .../Assets/Wide310x150Logo.scale-200.png | Bin 0 -> 3204 bytes .../EMTrackingChecking/EMTrackingChecking.sln | 51 +++++ .../EMTrackingChecking.vcxproj | 186 ++++++++++++++++++ .../EMTrackingChecking.vcxproj.filters | 60 ++++++ .../EMTrackingChecking/MainPage.cpp | 24 +++ .../EMTrackingChecking/MainPage.h | 27 +++ .../EMTrackingChecking/MainPage.idl | 9 + .../EMTrackingChecking/MainPage.xaml | 13 ++ .../EMTrackingChecking/Package.appxmanifest | 32 +++ .../EMTrackingChecking/PropertySheet.props | 16 ++ .../EMTrackingChecking/packages.config | 6 + .../EMTrackingChecking/pch.cpp | 1 + .../EMTrackingChecking/pch.h | 15 ++ .../EMTrackingChecking/readme.txt | 23 +++ 28 files changed, 609 insertions(+), 4 deletions(-) create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.cpp create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.h create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.idl create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.xaml create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/LockScreenLogo.scale-200.png create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/SplashScreen.scale-200.png create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/Square150x150Logo.scale-200.png create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/Square44x44Logo.scale-200.png create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/Square44x44Logo.targetsize-24_altform-unplated.png create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/StoreLogo.png create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/Wide310x150Logo.scale-200.png create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/EMTrackingChecking.sln create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/EMTrackingChecking.vcxproj create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/EMTrackingChecking.vcxproj.filters create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.cpp create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.h create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.idl create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.xaml create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Package.appxmanifest create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/PropertySheet.props create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/packages.config create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/pch.cpp create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/pch.h create mode 100644 Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/readme.txt diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing (Package)/Package.appxmanifest b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing (Package)/Package.appxmanifest index 6d096a5f7..d9fd930d4 100644 --- a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing (Package)/Package.appxmanifest +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing (Package)/Package.appxmanifest @@ -8,7 +8,7 @@ diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/ActivationTrackerHelper.h b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/ActivationTrackerHelper.h index b94100d2f..754f23f78 100644 --- a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/ActivationTrackerHelper.h +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/ActivationTrackerHelper.h @@ -44,7 +44,7 @@ inline DWORD GetNumberOfActivations() return numberOfActivations; } -inline DWORD IncrementAndSetNumberOfRedirectionsReturnNewNumber() +inline DWORD IncrementNumberOfRedirections() { auto numberOfActivations{GetNumberOfActivations()}; numberOfActivations++; diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/App.xaml b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/App.xaml index 343860e5a..5eabbbba8 100644 --- a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/App.xaml +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/CppWinUiDesktopInstancing/App.xaml @@ -1,4 +1,5 @@ - +Details about the launch request and process. void App::OnLaunched(LaunchActivatedEventArgs const&) { - auto numberOfActivations{ IncrementAndSetNumberOfRedirectionsReturnNewNumber() }; + auto numberOfActivations{ IncrementNumberOfRedirections() }; window = make(); // GetInstances also gets the current instance. diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.cpp b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.cpp new file mode 100644 index 000000000..f4ae83b91 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/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 EMTrackingChecking; +using namespace EMTrackingChecking::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(), 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(), 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/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.h b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.h new file mode 100644 index 000000000..c954c908f --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.h @@ -0,0 +1,13 @@ +#pragma once +#include "App.xaml.g.h" + +namespace winrt::EMTrackingChecking::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/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.idl b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.idl new file mode 100644 index 000000000..66486506a --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.idl @@ -0,0 +1,3 @@ +namespace EMTrackingChecking +{ +} diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.xaml b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.xaml new file mode 100644 index 000000000..8662056c5 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/App.xaml @@ -0,0 +1,7 @@ + + + diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/LockScreenLogo.scale-200.png b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/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/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/SplashScreen.scale-200.png b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/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/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/Square150x150Logo.scale-200.png b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/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/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/Square44x44Logo.scale-200.png b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/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/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/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/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/StoreLogo.png b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/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/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/Wide310x150Logo.scale-200.png b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Assets/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 + + + + + + true + true + true + true + {df6319d7-92d4-413e-8699-6c50d552daa9} + EMTrackingChecking + EMTrackingChecking + en-US + 15.0 + true + Windows Store + 10.0 + 10.0.22621.0 + 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 + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + \ No newline at end of file diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/EMTrackingChecking.vcxproj.filters b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/EMTrackingChecking.vcxproj.filters new file mode 100644 index 000000000..28f03343a --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/EMTrackingChecking.vcxproj.filters @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + + + + + + {e48dc53e-40b1-40cb-970a-f89935452892} + + + + + + + + + + \ No newline at end of file diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.cpp b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.cpp new file mode 100644 index 000000000..8b87c8ca7 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/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::EMTrackingChecking::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/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.h b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.h new file mode 100644 index 000000000..c1a61f55a --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.h @@ -0,0 +1,27 @@ +#pragma once + +#include "MainPage.g.h" + +namespace winrt::EMTrackingChecking::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::EMTrackingChecking::factory_implementation +{ + struct MainPage : MainPageT + { + }; +} diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.idl b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.idl new file mode 100644 index 000000000..60f6903e9 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.idl @@ -0,0 +1,9 @@ +namespace EMTrackingChecking +{ + [default_interface] + runtimeclass MainPage : Windows.UI.Xaml.Controls.Page + { + MainPage(); + Int32 MyProperty; + } +} diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.xaml b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.xaml new file mode 100644 index 000000000..daa972dcd --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/MainPage.xaml @@ -0,0 +1,13 @@ + + + + + + diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Package.appxmanifest b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Package.appxmanifest new file mode 100644 index 000000000..c52e3f4c6 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/Package.appxmanifest @@ -0,0 +1,32 @@ + + + + + + EMTrackingChecking + dahoehna + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/PropertySheet.props b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/PropertySheet.props new file mode 100644 index 000000000..e34141b01 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/PropertySheet.props @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/packages.config b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/packages.config new file mode 100644 index 000000000..977d3c7aa --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/pch.cpp b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/pch.cpp new file mode 100644 index 000000000..bcb5590be --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/pch.cpp @@ -0,0 +1 @@ +#include "pch.h" diff --git a/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/pch.h b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/pch.h new file mode 100644 index 000000000..b559e3664 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/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/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/readme.txt b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/readme.txt new file mode 100644 index 000000000..8a0a7d768 --- /dev/null +++ b/Samples/AppLifecycle/Instancing/cpp-winui-packaged/EMTrackingChecking/readme.txt @@ -0,0 +1,23 @@ +======================================================================== + C++/WinRT EMTrackingChecking 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/ +========================================================================