Moved AppLifecycle samples out of Quarantine (#169)

microsoft · Feb 12, 2022 · a751769 · a751769
1 parent ffff65f
commit a751769
Show file tree

Hide file tree

Showing 79 changed files with 105 additions and 64 deletions.
diff --git a/...nui-packaged/CsWinUiDesktopActivation.sln → ...nui-packaged/CsWinUiDesktopActivation.sln b/...nui-packaged/CsWinUiDesktopActivation.sln → ...nui-packaged/CsWinUiDesktopActivation.sln
diff --git a/...sWinUiDesktopActivation (Package).wapproj → ...sWinUiDesktopActivation (Package).wapproj b/...sWinUiDesktopActivation (Package).wapproj → ...sWinUiDesktopActivation (Package).wapproj
diff --git a/...kage)/Images/LockScreenLogo.scale-200.png → ...kage)/Images/LockScreenLogo.scale-200.png b/...kage)/Images/LockScreenLogo.scale-200.png → ...kage)/Images/LockScreenLogo.scale-200.png
diff --git a/...ackage)/Images/SplashScreen.scale-200.png → ...ackage)/Images/SplashScreen.scale-200.png b/...ackage)/Images/SplashScreen.scale-200.png → ...ackage)/Images/SplashScreen.scale-200.png
diff --git a/...e)/Images/Square150x150Logo.scale-200.png → ...e)/Images/Square150x150Logo.scale-200.png b/...e)/Images/Square150x150Logo.scale-200.png → ...e)/Images/Square150x150Logo.scale-200.png
diff --git a/...age)/Images/Square44x44Logo.scale-200.png → ...age)/Images/Square44x44Logo.scale-200.png b/...age)/Images/Square44x44Logo.scale-200.png → ...age)/Images/Square44x44Logo.scale-200.png
diff --git a/...44Logo.targetsize-24_altform-unplated.png → ...44Logo.targetsize-24_altform-unplated.png b/...44Logo.targetsize-24_altform-unplated.png → ...44Logo.targetsize-24_altform-unplated.png
diff --git a/...Activation (Package)/Images/StoreLogo.png → ...Activation (Package)/Images/StoreLogo.png b/...Activation (Package)/Images/StoreLogo.png → ...Activation (Package)/Images/StoreLogo.png
diff --git a/...age)/Images/Wide310x150Logo.scale-200.png → ...age)/Images/Wide310x150Logo.scale-200.png b/...age)/Images/Wide310x150Logo.scale-200.png → ...age)/Images/Wide310x150Logo.scale-200.png
diff --git a/...Activation (Package)/Package.appxmanifest → ...Activation (Package)/Package.appxmanifest b/...Activation (Package)/Package.appxmanifest → ...Activation (Package)/Package.appxmanifest
diff --git a/...ivation/CsWinUiDesktopActivation/App.xaml → ...ivation/CsWinUiDesktopActivation/App.xaml b/...ivation/CsWinUiDesktopActivation/App.xaml → ...ivation/CsWinUiDesktopActivation/App.xaml
diff --git a/...tion/CsWinUiDesktopActivation/App.xaml.cs → ...tion/CsWinUiDesktopActivation/App.xaml.cs b/...tion/CsWinUiDesktopActivation/App.xaml.cs → ...tion/CsWinUiDesktopActivation/App.xaml.cs
diff --git a/...ctivation/CsWinUiDesktopActivation.csproj → ...ctivation/CsWinUiDesktopActivation.csproj b/...ctivation/CsWinUiDesktopActivation.csproj → ...ctivation/CsWinUiDesktopActivation.csproj
diff --git a/.../CsWinUiDesktopActivation/MainWindow.xaml → .../CsWinUiDesktopActivation/MainWindow.xaml b/.../CsWinUiDesktopActivation/MainWindow.xaml → .../CsWinUiDesktopActivation/MainWindow.xaml
diff --git a/...WinUiDesktopActivation/MainWindow.xaml.cs → ...WinUiDesktopActivation/MainWindow.xaml.cs b/...WinUiDesktopActivation/MainWindow.xaml.cs → ...WinUiDesktopActivation/MainWindow.xaml.cs
diff --git a/...erties/PublishProfiles/win10-arm64.pubxml → ...erties/PublishProfiles/win10-arm64.pubxml b/...erties/PublishProfiles/win10-arm64.pubxml → ...erties/PublishProfiles/win10-arm64.pubxml
diff --git a/...operties/PublishProfiles/win10-x64.pubxml → ...operties/PublishProfiles/win10-x64.pubxml b/...operties/PublishProfiles/win10-x64.pubxml → ...operties/PublishProfiles/win10-x64.pubxml
diff --git a/...operties/PublishProfiles/win10-x86.pubxml → ...operties/PublishProfiles/win10-x86.pubxml b/...operties/PublishProfiles/win10-x86.pubxml → ...operties/PublishProfiles/win10-x86.pubxml
diff --git a/...Activation/Properties/launchSettings.json → ...Activation/Properties/launchSettings.json b/...Activation/Properties/launchSettings.json → ...Activation/Properties/launchSettings.json
diff --git a/...ion/CsWinUiDesktopActivation/app.manifest → ...ion/CsWinUiDesktopActivation/app.manifest b/...ion/CsWinUiDesktopActivation/app.manifest → ...ion/CsWinUiDesktopActivation/app.manifest
diff --git a/.../Activation/cs-winui-packaged/Marlowe.foo → .../Activation/cs-winui-packaged/Marlowe.foo b/.../Activation/cs-winui-packaged/Marlowe.foo → .../Activation/cs-winui-packaged/Marlowe.foo
diff --git a/...ivation/cs-winui-packaged/Shakespeare.foo → ...ivation/cs-winui-packaged/Shakespeare.foo b/...ivation/cs-winui-packaged/Shakespeare.foo → ...ivation/cs-winui-packaged/Shakespeare.foo
diff --git a/.../cs-wpf-packaged/CsWpfActivation/App.xaml → .../cs-wpf-packaged/CsWpfActivation/App.xaml b/.../cs-wpf-packaged/CsWpfActivation/App.xaml → .../cs-wpf-packaged/CsWpfActivation/App.xaml
diff --git a/...-wpf-packaged/CsWpfActivation/App.xaml.cs → ...-wpf-packaged/CsWpfActivation/App.xaml.cs b/...-wpf-packaged/CsWpfActivation/App.xaml.cs → ...-wpf-packaged/CsWpfActivation/App.xaml.cs
diff --git a/...-packaged/CsWpfActivation/AssemblyInfo.cs → ...-packaged/CsWpfActivation/AssemblyInfo.cs b/...-packaged/CsWpfActivation/AssemblyInfo.cs → ...-packaged/CsWpfActivation/AssemblyInfo.cs
diff --git a/...ed/CsWpfActivation/CsWpfActivation.csproj → ...ed/CsWpfActivation/CsWpfActivation.csproj b/...ed/CsWpfActivation/CsWpfActivation.csproj → ...ed/CsWpfActivation/CsWpfActivation.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
     <UseWPF>true</UseWPF>
     <Platforms>x64;x86</Platforms>
-    <RuntimeIdentifiers>win10-x64;win10-x86;win-x86</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win10-x64;win10-x86;win-x86;win-x64</RuntimeIdentifiers>
     <StartupObject>CsWpfActivation.Program</StartupObject>
   </PropertyGroup>
 

diff --git a/...-packaged/CsWpfActivation/MainWindow.xaml → ...-packaged/CsWpfActivation/MainWindow.xaml b/...-packaged/CsWpfActivation/MainWindow.xaml → ...-packaged/CsWpfActivation/MainWindow.xaml
diff --git a/...ckaged/CsWpfActivation/MainWindow.xaml.cs → ...ckaged/CsWpfActivation/MainWindow.xaml.cs b/...ckaged/CsWpfActivation/MainWindow.xaml.cs → ...ckaged/CsWpfActivation/MainWindow.xaml.cs
diff --git a/...s-wpf-packaged/CsWpfActivation/Program.cs → ...s-wpf-packaged/CsWpfActivation/Program.cs b/...s-wpf-packaged/CsWpfActivation/Program.cs → ...s-wpf-packaged/CsWpfActivation/Program.cs
diff --git a/...Activation/Properties/launchSettings.json → ...Activation/Properties/launchSettings.json b/...Activation/Properties/launchSettings.json → ...Activation/Properties/launchSettings.json
diff --git a/...on/cs-wpf-packaged/CsWpfActivationPkg.sln → ...on/cs-wpf-packaged/CsWpfActivationPkg.sln b/...on/cs-wpf-packaged/CsWpfActivationPkg.sln → ...on/cs-wpf-packaged/CsWpfActivationPkg.sln
diff --git a/...fActivationPkg/CsWpfActivationPkg.wapproj → ...fActivationPkg/CsWpfActivationPkg.wapproj b/...fActivationPkg/CsWpfActivationPkg.wapproj → ...fActivationPkg/CsWpfActivationPkg.wapproj
diff --git a/...onPkg/Images/LockScreenLogo.scale-200.png → ...onPkg/Images/LockScreenLogo.scale-200.png b/...onPkg/Images/LockScreenLogo.scale-200.png → ...onPkg/Images/LockScreenLogo.scale-200.png
diff --git a/...tionPkg/Images/SplashScreen.scale-200.png → ...tionPkg/Images/SplashScreen.scale-200.png b/...tionPkg/Images/SplashScreen.scale-200.png → ...tionPkg/Images/SplashScreen.scale-200.png
diff --git a/...kg/Images/Square150x150Logo.scale-200.png → ...kg/Images/Square150x150Logo.scale-200.png b/...kg/Images/Square150x150Logo.scale-200.png → ...kg/Images/Square150x150Logo.scale-200.png
diff --git a/...nPkg/Images/Square44x44Logo.scale-200.png → ...nPkg/Images/Square44x44Logo.scale-200.png b/...nPkg/Images/Square44x44Logo.scale-200.png → ...nPkg/Images/Square44x44Logo.scale-200.png
diff --git a/...44Logo.targetsize-24_altform-unplated.png → ...44Logo.targetsize-24_altform-unplated.png b/...44Logo.targetsize-24_altform-unplated.png → ...44Logo.targetsize-24_altform-unplated.png
diff --git a/...d/CsWpfActivationPkg/Images/StoreLogo.png → ...d/CsWpfActivationPkg/Images/StoreLogo.png b/...d/CsWpfActivationPkg/Images/StoreLogo.png → ...d/CsWpfActivationPkg/Images/StoreLogo.png
diff --git a/...nPkg/Images/Wide310x150Logo.scale-200.png → ...nPkg/Images/Wide310x150Logo.scale-200.png b/...nPkg/Images/Wide310x150Logo.scale-200.png → ...nPkg/Images/Wide310x150Logo.scale-200.png
diff --git a/...d/CsWpfActivationPkg/Package.appxmanifest → ...d/CsWpfActivationPkg/Package.appxmanifest b/...d/CsWpfActivationPkg/Package.appxmanifest → ...d/CsWpfActivationPkg/Package.appxmanifest
diff --git a/...le/Activation/cs-wpf-packaged/Marlowe.foo → ...le/Activation/cs-wpf-packaged/Marlowe.foo b/...le/Activation/cs-wpf-packaged/Marlowe.foo → ...le/Activation/cs-wpf-packaged/Marlowe.foo
diff --git a/...ctivation/cs-wpf-packaged/Shakespeare.foo → ...ctivation/cs-wpf-packaged/Shakespeare.foo b/...ctivation/cs-wpf-packaged/Shakespeare.foo → ...ctivation/cs-wpf-packaged/Shakespeare.foo
diff --git a/...Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/Program.cs b/...Instancing/cs-winui-packaged/CsWinUiDesktopInstancing/CsWinUiDesktopInstancing/Program.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Activation;
@@ -25,17 +26,16 @@ public static class Program
         public static List<string> OutputStack { get; private set; }
 
         // Replaces the standard App.g.i.cs.
-        // We must declare Main to be async, as we want to await 
-        // another async function call.
+        // Note: We can't declare Main to be async because in a WinUI app
+        // this prevents Narrator from reading XAML elements.
         [STAThread]
-        static async Task<int> Main(string[] args)
+        static void Main(string[] args)
         {
             WinRT.ComWrappersSupport.InitializeComWrappers();
 
             OutputStack = new();
 
-            // Ensure we don't block the STA.
-            bool isRedirect = await DecideRedirection();
+            bool isRedirect = DecideRedirection();
             if (!isRedirect)
             {
                 Microsoft.UI.Xaml.Application.Start((p) =>
@@ -46,10 +46,10 @@ static async Task<int> Main(string[] args)
                     new App();
                 });
             }
-
-            return 0;
         }
 
+        #region Report helpers
+
         public static void ReportInfo(string message)
         {
             // If we already have a form, display the message now.
@@ -65,60 +65,6 @@ public static void ReportInfo(string message)
             }
         }
 
-        private static async Task<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;
-                            await keyInstance.RedirectActivationToAsync(args);
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    ReportInfo($"Error getting instance information: {ex.Message}");
-                }
-            }
-
-            return isRedirect;
-        }
-
         private static void ReportFileArgs(string callSite, AppActivationArguments args)
         {
             ReportInfo($"called from {callSite}");
@@ -196,5 +142,100 @@ public static void GetActivationInfo()
             }
         }
 
+        #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/.../cs-wpf-packaged/CsWpfInstancing/App.xaml → .../cs-wpf-packaged/CsWpfInstancing/App.xaml b/.../cs-wpf-packaged/CsWpfInstancing/App.xaml → .../cs-wpf-packaged/CsWpfInstancing/App.xaml
diff --git a/...-wpf-packaged/CsWpfInstancing/App.xaml.cs → ...-wpf-packaged/CsWpfInstancing/App.xaml.cs b/...-wpf-packaged/CsWpfInstancing/App.xaml.cs → ...-wpf-packaged/CsWpfInstancing/App.xaml.cs
diff --git a/...-packaged/CsWpfInstancing/AssemblyInfo.cs → ...-packaged/CsWpfInstancing/AssemblyInfo.cs b/...-packaged/CsWpfInstancing/AssemblyInfo.cs → ...-packaged/CsWpfInstancing/AssemblyInfo.cs
diff --git a/...ed/CsWpfInstancing/CsWpfInstancing.csproj → ...ed/CsWpfInstancing/CsWpfInstancing.csproj b/...ed/CsWpfInstancing/CsWpfInstancing.csproj → ...ed/CsWpfInstancing/CsWpfInstancing.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
     <UseWPF>true</UseWPF>
     <Platforms>x64;x86</Platforms>
-    <RuntimeIdentifiers>win10-x64;win10-x86;win-x86</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win10-x64;win10-x86;win-x86;win-x64</RuntimeIdentifiers>
     <StartupObject>CsWpfInstancing.Program</StartupObject>
   </PropertyGroup>
 

diff --git a/...-packaged/CsWpfInstancing/MainWindow.xaml → ...-packaged/CsWpfInstancing/MainWindow.xaml b/...-packaged/CsWpfInstancing/MainWindow.xaml → ...-packaged/CsWpfInstancing/MainWindow.xaml
diff --git a/...ckaged/CsWpfInstancing/MainWindow.xaml.cs → ...ckaged/CsWpfInstancing/MainWindow.xaml.cs b/...ckaged/CsWpfInstancing/MainWindow.xaml.cs → ...ckaged/CsWpfInstancing/MainWindow.xaml.cs
diff --git a/...s-wpf-packaged/CsWpfInstancing/Program.cs → ...s-wpf-packaged/CsWpfInstancing/Program.cs b/...s-wpf-packaged/CsWpfInstancing/Program.cs → ...s-wpf-packaged/CsWpfInstancing/Program.cs
diff --git a/...ng/cs-wpf-packaged/CsWpfInstancingPkg.sln → ...ng/cs-wpf-packaged/CsWpfInstancingPkg.sln b/...ng/cs-wpf-packaged/CsWpfInstancingPkg.sln → ...ng/cs-wpf-packaged/CsWpfInstancingPkg.sln
diff --git a/...fInstancingPkg/CsWpfInstancingPkg.wapproj → ...fInstancingPkg/CsWpfInstancingPkg.wapproj b/...fInstancingPkg/CsWpfInstancingPkg.wapproj → ...fInstancingPkg/CsWpfInstancingPkg.wapproj
diff --git a/...ngPkg/Images/LockScreenLogo.scale-200.png → ...ngPkg/Images/LockScreenLogo.scale-200.png b/...ngPkg/Images/LockScreenLogo.scale-200.png → ...ngPkg/Images/LockScreenLogo.scale-200.png
diff --git a/...cingPkg/Images/SplashScreen.scale-200.png → ...cingPkg/Images/SplashScreen.scale-200.png b/...cingPkg/Images/SplashScreen.scale-200.png → ...cingPkg/Images/SplashScreen.scale-200.png
diff --git a/...kg/Images/Square150x150Logo.scale-200.png → ...kg/Images/Square150x150Logo.scale-200.png b/...kg/Images/Square150x150Logo.scale-200.png → ...kg/Images/Square150x150Logo.scale-200.png
diff --git a/...gPkg/Images/Square44x44Logo.scale-200.png → ...gPkg/Images/Square44x44Logo.scale-200.png b/...gPkg/Images/Square44x44Logo.scale-200.png → ...gPkg/Images/Square44x44Logo.scale-200.png
diff --git a/...44Logo.targetsize-24_altform-unplated.png → ...44Logo.targetsize-24_altform-unplated.png b/...44Logo.targetsize-24_altform-unplated.png → ...44Logo.targetsize-24_altform-unplated.png
diff --git a/...d/CsWpfInstancingPkg/Images/StoreLogo.png → ...d/CsWpfInstancingPkg/Images/StoreLogo.png b/...d/CsWpfInstancingPkg/Images/StoreLogo.png → ...d/CsWpfInstancingPkg/Images/StoreLogo.png
diff --git a/...gPkg/Images/Wide310x150Logo.scale-200.png → ...gPkg/Images/Wide310x150Logo.scale-200.png b/...gPkg/Images/Wide310x150Logo.scale-200.png → ...gPkg/Images/Wide310x150Logo.scale-200.png
diff --git a/...d/CsWpfInstancingPkg/Package.appxmanifest → ...d/CsWpfInstancingPkg/Package.appxmanifest b/...d/CsWpfInstancingPkg/Package.appxmanifest → ...d/CsWpfInstancingPkg/Package.appxmanifest
diff --git a/...le/Instancing/cs-wpf-packaged/Marlowe.moo → ...le/Instancing/cs-wpf-packaged/Marlowe.moo b/...le/Instancing/cs-wpf-packaged/Marlowe.moo → ...le/Instancing/cs-wpf-packaged/Marlowe.moo
diff --git a/...nstancing/cs-wpf-packaged/Shakespeare.moo → ...nstancing/cs-wpf-packaged/Shakespeare.moo b/...nstancing/cs-wpf-packaged/Shakespeare.moo → ...nstancing/cs-wpf-packaged/Shakespeare.moo
diff --git a/...tions/cs-wpf-packaged/CsWpfState/App.xaml → ...tions/cs-wpf-packaged/CsWpfState/App.xaml b/...tions/cs-wpf-packaged/CsWpfState/App.xaml → ...tions/cs-wpf-packaged/CsWpfState/App.xaml
diff --git a/...ns/cs-wpf-packaged/CsWpfState/App.xaml.cs → ...ns/cs-wpf-packaged/CsWpfState/App.xaml.cs b/...ns/cs-wpf-packaged/CsWpfState/App.xaml.cs → ...ns/cs-wpf-packaged/CsWpfState/App.xaml.cs
diff --git a/...s-wpf-packaged/CsWpfState/AssemblyInfo.cs → ...s-wpf-packaged/CsWpfState/AssemblyInfo.cs b/...s-wpf-packaged/CsWpfState/AssemblyInfo.cs → ...s-wpf-packaged/CsWpfState/AssemblyInfo.cs
diff --git a/...wpf-packaged/CsWpfState/CsWpfState.csproj → ...wpf-packaged/CsWpfState/CsWpfState.csproj b/...wpf-packaged/CsWpfState/CsWpfState.csproj → ...wpf-packaged/CsWpfState/CsWpfState.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
     <UseWPF>true</UseWPF>
     <Platforms>x64;x86</Platforms>
-    <RuntimeIdentifiers>win10-x64;win10-x86;win-x86</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win10-x64;win10-x86;win-x86;win-x64</RuntimeIdentifiers>
     <StartupObject>CsWpfState.Program</StartupObject>
   </PropertyGroup>
 

diff --git a/...s-wpf-packaged/CsWpfState/MainWindow.xaml → ...s-wpf-packaged/CsWpfState/MainWindow.xaml b/...s-wpf-packaged/CsWpfState/MainWindow.xaml → ...s-wpf-packaged/CsWpfState/MainWindow.xaml
diff --git a/...pf-packaged/CsWpfState/MainWindow.xaml.cs → ...pf-packaged/CsWpfState/MainWindow.xaml.cs b/...pf-packaged/CsWpfState/MainWindow.xaml.cs → ...pf-packaged/CsWpfState/MainWindow.xaml.cs
diff --git a/...ons/cs-wpf-packaged/CsWpfState/Program.cs → ...ons/cs-wpf-packaged/CsWpfState/Program.cs b/...ons/cs-wpf-packaged/CsWpfState/Program.cs → ...ons/cs-wpf-packaged/CsWpfState/Program.cs
diff --git a/...cations/cs-wpf-packaged/CsWpfStatePkg.sln → ...cations/cs-wpf-packaged/CsWpfStatePkg.sln b/...cations/cs-wpf-packaged/CsWpfStatePkg.sln → ...cations/cs-wpf-packaged/CsWpfStatePkg.sln
diff --git a/...kaged/CsWpfStatePkg/CsWpfStatePkg.wapproj → ...kaged/CsWpfStatePkg/CsWpfStatePkg.wapproj b/...kaged/CsWpfStatePkg/CsWpfStatePkg.wapproj → ...kaged/CsWpfStatePkg/CsWpfStatePkg.wapproj
diff --git a/...tePkg/Images/LockScreenLogo.scale-200.png → ...tePkg/Images/LockScreenLogo.scale-200.png b/...tePkg/Images/LockScreenLogo.scale-200.png → ...tePkg/Images/LockScreenLogo.scale-200.png
diff --git a/...tatePkg/Images/SplashScreen.scale-200.png → ...tatePkg/Images/SplashScreen.scale-200.png b/...tatePkg/Images/SplashScreen.scale-200.png → ...tatePkg/Images/SplashScreen.scale-200.png
diff --git a/...kg/Images/Square150x150Logo.scale-200.png → ...kg/Images/Square150x150Logo.scale-200.png b/...kg/Images/Square150x150Logo.scale-200.png → ...kg/Images/Square150x150Logo.scale-200.png
diff --git a/...ePkg/Images/Square44x44Logo.scale-200.png → ...ePkg/Images/Square44x44Logo.scale-200.png b/...ePkg/Images/Square44x44Logo.scale-200.png → ...ePkg/Images/Square44x44Logo.scale-200.png
diff --git a/...44Logo.targetsize-24_altform-unplated.png → ...44Logo.targetsize-24_altform-unplated.png b/...44Logo.targetsize-24_altform-unplated.png → ...44Logo.targetsize-24_altform-unplated.png
diff --git a/...ckaged/CsWpfStatePkg/Images/StoreLogo.png → ...ckaged/CsWpfStatePkg/Images/StoreLogo.png b/...ckaged/CsWpfStatePkg/Images/StoreLogo.png → ...ckaged/CsWpfStatePkg/Images/StoreLogo.png
diff --git a/...ePkg/Images/Wide310x150Logo.scale-200.png → ...ePkg/Images/Wide310x150Logo.scale-200.png b/...ePkg/Images/Wide310x150Logo.scale-200.png → ...ePkg/Images/Wide310x150Logo.scale-200.png
diff --git a/...ckaged/CsWpfStatePkg/Package.appxmanifest → ...ckaged/CsWpfStatePkg/Package.appxmanifest b/...ckaged/CsWpfStatePkg/Package.appxmanifest → ...ckaged/CsWpfStatePkg/Package.appxmanifest