From 3606b90915c8d530a2108570fa31e8bb116cd39d Mon Sep 17 00:00:00 2001
From: RMBGAME <rmb@rmbgame.net>
Date: Wed, 8 Sep 2021 00:37:28 +0800
Subject: [PATCH] uwp

---
 .../Package.appxmanifest                                 | 4 ++--
 ...ST.Client.Desktop.Avalonia.App.Bridge.Package.wapproj | 9 +++++----
 .../ST.Client.Desktop.Avalonia.App.Bridge.csproj         | 9 +++------
 .../Services/Implementation/SteamServiceImpl.cs          | 2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/Package.appxmanifest b/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/Package.appxmanifest
index ad479ee1d..1440929bd 100644
--- a/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/Package.appxmanifest
+++ b/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/Package.appxmanifest
@@ -51,8 +51,8 @@
         <uap:LockScreen BadgeLogo="Images\BadgeLogo.png" Notification="badgeAndTileText"/>
       </uap:VisualElements>
       <Extensions>
-        <desktop:Extension Category="windows.fullTrustProcess" Executable="Launcher\Steam++.Launcher.exe" />
-        <desktop:Extension Category="windows.startupTask" Executable="Launcher\Steam++.Launcher.exe" EntryPoint="Windows.FullTrustApplication">
+        <desktop:Extension Category="windows.fullTrustProcess" Executable="ST.Client.Desktop.Avalonia.App.Bridge\Steam++.exe" />
+        <desktop:Extension Category="windows.startupTask" Executable="ST.Client.Desktop.Avalonia.App.Bridge\Steam++.exe" EntryPoint="Windows.FullTrustApplication">
           <desktop:StartupTask TaskId="BootAutoStartTask" Enabled="true" DisplayName="Steam++ System Boot Run" />
         </desktop:Extension>
       </Extensions>
diff --git a/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/ST.Client.Desktop.Avalonia.App.Bridge.Package.wapproj b/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/ST.Client.Desktop.Avalonia.App.Bridge.Package.wapproj
index 0651437fa..946a2c823 100644
--- a/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/ST.Client.Desktop.Avalonia.App.Bridge.Package.wapproj
+++ b/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/ST.Client.Desktop.Avalonia.App.Bridge.Package.wapproj
@@ -62,14 +62,15 @@
     <AppxBundlePlatforms>x64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
-    <EntryPointProjectUniqueName>..\ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher\Launcher\Launcher.csproj</EntryPointProjectUniqueName>
     <PackageCertificateKeyFile>ST.Client.Desktop.Avalonia.App.Bridge.Package_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <EntryPointProjectUniqueName>..\ST.Client.Desktop.Avalonia.App.Bridge\ST.Client.Desktop.Avalonia.App.Bridge.csproj</EntryPointProjectUniqueName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <AppxBundle>Always</AppxBundle>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <AppxBundle>Always</AppxBundle>
@@ -163,9 +164,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" PrivateAssets="all" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ST.Client.Desktop.Avalonia.App.Bridge.Package.RefLauncher\Launcher\Launcher.csproj" />
-  </ItemGroup>
   <!--<ItemGroup>
     -->
   <!--<ItemGroup Condition="'$(Platform)'=='x64'">-->
@@ -258,5 +256,8 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>-->
+  <ItemGroup>
+    <ProjectReference Include="..\ST.Client.Desktop.Avalonia.App.Bridge\ST.Client.Desktop.Avalonia.App.Bridge.csproj" />
+  </ItemGroup>
   <!--ST.Tools.DesktopBridgeLink(Release-x64)-->
 </Project>
\ No newline at end of file
diff --git a/src/ST.Client.Desktop.Avalonia.App.Bridge/ST.Client.Desktop.Avalonia.App.Bridge.csproj b/src/ST.Client.Desktop.Avalonia.App.Bridge/ST.Client.Desktop.Avalonia.App.Bridge.csproj
index 053326029..b27d5fef4 100644
--- a/src/ST.Client.Desktop.Avalonia.App.Bridge/ST.Client.Desktop.Avalonia.App.Bridge.csproj
+++ b/src/ST.Client.Desktop.Avalonia.App.Bridge/ST.Client.Desktop.Avalonia.App.Bridge.csproj
@@ -10,12 +10,9 @@
     <DefineConstants>WINDOWS;WINDOWS_DESKTOP_BRIDGE;$(DefineConstants)</DefineConstants>
     <ApplicationIcon>..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationIcon>
     <ApplicationManifest>..\ST.Client.Desktop.Avalonia.App\Properties\app.manifest</ApplicationManifest>
-    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
-    <Platform>x64</Platform>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <PublishSingleFile>true</PublishSingleFile>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
+    <PlatformTarget>x64</PlatformTarget>
+    <PublishSingleFile>false</PublishSingleFile>
     <!--目前裁剪存在问题，禁用-->
     <PublishTrimmed>false</PublishTrimmed>
     <TrimMode>link</TrimMode>
diff --git a/src/ST.Client.Desktop/Services/Implementation/SteamServiceImpl.cs b/src/ST.Client.Desktop/Services/Implementation/SteamServiceImpl.cs
index 14a28a2a4..a908f5fdc 100644
--- a/src/ST.Client.Desktop/Services/Implementation/SteamServiceImpl.cs
+++ b/src/ST.Client.Desktop/Services/Implementation/SteamServiceImpl.cs
@@ -132,7 +132,7 @@ namespace System.Application.Services.Implementation
         {
             if (!string.IsNullOrEmpty(SteamProgramPath))
             {
-                Process2.Start(SteamProgramPath, arguments);
+                Process2.Start(SteamProgramPath, arguments, true);
             }
         }