From 5f65cb3b1ffd392a2fad02311baa6f378ec3c2e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=80=A1=E9=A3=9E?= <363301617@qq.com>
Date: Wed, 12 Jun 2024 09:46:34 +0800
Subject: [PATCH] Add CsWinRT Package reference

Add CsWinRT Package reference
---
 GetStoreApp/GetStoreApp.csproj                       |  5 +++--
 .../UI/Dialogs/Settings/RestartAppsDialog.xaml.cs    |  6 +++---
 GetStoreApp/WinUIApp.xaml.cs                         | 12 ------------
 GetStoreAppWebView/GetStoreAppWebView.csproj         |  3 ++-
 ...Microsoft.Management.Deployment.Projection.csproj |  6 +++---
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
index e172116f2..a0b78c11f 100644
--- a/GetStoreApp/GetStoreApp.csproj
+++ b/GetStoreApp/GetStoreApp.csproj
@@ -22,7 +22,7 @@
     <Platforms>x86;x64;ARM64</Platforms>
     <PublishProtocol>FileSystem</PublishProtocol>
     <PublishReadyToRun>False</PublishReadyToRun>
-	<PublishSelfContained>true</PublishSelfContained>
+    <PublishSelfContained>true</PublishSelfContained>
     <PublishSingleFile>True</PublishSingleFile>
     <PublishTrimmed>true</PublishTrimmed>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
@@ -117,7 +117,8 @@
     <None Remove="Views\Pages\WinGetPage.xaml" />
     <None Remove="Views\Windows\MainWindow.xaml" />
     <None Remove="WinUIApp.xaml" />
-
+	  
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.0-prerelease.240602.1" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240531000-experimental1" />
 
     <Page Update="Styles\AppBarButton.xaml" XamlRuntime="$(DefaultXamlRuntime)" />
diff --git a/GetStoreApp/UI/Dialogs/Settings/RestartAppsDialog.xaml.cs b/GetStoreApp/UI/Dialogs/Settings/RestartAppsDialog.xaml.cs
index 3ae67a808..e4927bef9 100644
--- a/GetStoreApp/UI/Dialogs/Settings/RestartAppsDialog.xaml.cs
+++ b/GetStoreApp/UI/Dialogs/Settings/RestartAppsDialog.xaml.cs
@@ -1,5 +1,5 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.Windows.AppLifecycle;
 
 // 抑制 CA1822，IDE0060 警告
 #pragma warning disable CA1822,IDE0060
@@ -21,7 +21,7 @@ public RestartAppsDialog()
         /// </summary>
         private void OnRestartAppsClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
         {
-            (Application.Current as WinUIApp).Restart();
+            AppInstance.Restart("Restart");
         }
     }
 }
diff --git a/GetStoreApp/WinUIApp.xaml.cs b/GetStoreApp/WinUIApp.xaml.cs
index 3265a216c..afd90fee6 100644
--- a/GetStoreApp/WinUIApp.xaml.cs
+++ b/GetStoreApp/WinUIApp.xaml.cs
@@ -6,7 +6,6 @@
 using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using System;
-using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Windows.Foundation.Diagnostics;
@@ -120,17 +119,6 @@ private void SetAppIcon()
             }
         }
 
-        /// <summary>
-        /// 重启应用
-        /// </summary>
-        public void Restart()
-        {
-            MainWindow.Current.AppWindow.Hide();
-            ProcessHelper.StartProcess(Path.Combine(InfoHelper.AppInstalledLocation, "GetStoreApp.exe"), "Restart", out _);
-
-            Dispose();
-        }
-
         /// <summary>
         /// 释放资源
         /// </summary>
diff --git a/GetStoreAppWebView/GetStoreAppWebView.csproj b/GetStoreAppWebView/GetStoreAppWebView.csproj
index 85be673cd..f72d59045 100644
--- a/GetStoreAppWebView/GetStoreAppWebView.csproj
+++ b/GetStoreAppWebView/GetStoreAppWebView.csproj
@@ -61,7 +61,8 @@
     <None Remove="UI\Dialogs\ProcessFailedDialog.xaml" />
     <None Remove="WebApp.xaml" />
     <None Remove="WebWindow.xaml" />
-
+	  
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.0-prerelease.240602.1" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240531000-experimental1" GeneratePathProperty="true" />
 
     <Page Remove="WebApp.xaml" />
diff --git a/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj b/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj
index 3e550dfe5..7c944496a 100644
--- a/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj
+++ b/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <CsWinRTIncludes>Microsoft.Management.Deployment</CsWinRTIncludes>
+	  <CsWinRTIncludes>Microsoft.Management.Deployment</CsWinRTIncludes>
     <CSWinRTWindowsMetadata>10.0.22621.0</CSWinRTWindowsMetadata>
     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <IsTrimmable>true</IsTrimmable>
     <Platforms>x64;x86;ARM64</Platforms>
-	<PublishTrimmed>true</PublishTrimmed>
-	<TrimMode>full</TrimMode>
+	  <PublishTrimmed>true</PublishTrimmed>
+	  <TrimMode>full</TrimMode>
     <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <WindowsSdkPackageVersion>10.0.22621.35-preview</WindowsSdkPackageVersion>