From 303873fca4eae6ae0e7dd2e8b618f56a3a5d5d79 Mon Sep 17 00:00:00 2001 From: Aigio Liu Date: Sat, 16 Oct 2021 19:52:22 +0800 Subject: [PATCH] Windows PublishSingleFile --- SteamToolsV2+.sln | 31 --------------- .../api-ms-win-core-winrt-l1-1-0.dll | Bin 0 -> 19704 bytes .../Repositories.sqlite-net-pcl.csproj | 3 +- .../Properties/PublishProfiles/win-x64.pubxml | 10 +++-- .../ST.Client.Avalonia.App.csproj | 6 +++ .../UI/Views/Windows/FluentWindow.cs | 15 +++++--- ...atformServiceImpl.WindowTopRightButtons.cs | 2 +- .../Services/IPlatformService.MacOS.cs | 5 ++- .../Services/IPlatformService.Windows.cs | 36 +++++++++++++----- src/ST.Client/Services/IPlatformService.cs | 30 ++++++++++++--- .../UI/ViewModels/Base/IPageViewModel.cs | 12 ++++++ .../UI/ViewModels/Base/IWindowViewModel.cs | 15 ++++++++ .../UI/ViewModels/General/PageViewModel.cs | 2 +- .../UI/ViewModels/General/WindowViewModel.cs | 4 +- 14 files changed, 109 insertions(+), 62 deletions(-) create mode 100644 references/runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets/api-ms-win-core-winrt-l1-1-0.dll create mode 100644 src/ST.Client/UI/ViewModels/Base/IPageViewModel.cs create mode 100644 src/ST.Client/UI/ViewModels/Base/IWindowViewModel.cs diff --git a/SteamToolsV2+.sln b/SteamToolsV2+.sln index f37c63e32..d433ca257 100644 --- a/SteamToolsV2+.sln +++ b/SteamToolsV2+.sln @@ -91,8 +91,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArchiSteamFarm.Library", "r EndProject Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "ST.Client.Avalonia.App.Bridge.Package", "src\ST.Client.Desktop.Avalonia.App.Bridge.Package\ST.Client.Avalonia.App.Bridge.Package.wapproj", "{1F659618-71E2-4AAF-9D86-62700FD4CF02}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQLite-net-std", "references\sqlite-net\nuget\SQLite-net-std\SQLite-net-std.csproj", "{B1F221F6-E19B-45D8-959D-A9CDA471C2D4}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steam++", "src\ST.Client.Desktop.Avalonia.App.Bridge\Steam++.csproj", "{2A66B796-7BC2-4BE0-A920-1A457BBCCC67}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Tools.DesktopBridgeLink", "src\ST.Tools.DesktopBridgeLink\ST.Tools.DesktopBridgeLink.csproj", "{137690DF-A3CB-4817-ACB8-9EAF3A52B5B5}" @@ -1013,34 +1011,6 @@ Global {1F659618-71E2-4AAF-9D86-62700FD4CF02}.Release|x86.ActiveCfg = Release|x86 {1F659618-71E2-4AAF-9D86-62700FD4CF02}.Release|x86.Build.0 = Release|x86 {1F659618-71E2-4AAF-9D86-62700FD4CF02}.Release|x86.Deploy.0 = Release|x86 - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|ARM.ActiveCfg = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|ARM.Build.0 = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|ARM64.Build.0 = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|iPhone.Build.0 = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|x64.ActiveCfg = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|x64.Build.0 = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|x86.ActiveCfg = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Debug|x86.Build.0 = Debug|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|Any CPU.Build.0 = Release|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|ARM.ActiveCfg = Release|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|ARM.Build.0 = Release|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|ARM64.ActiveCfg = Release|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|ARM64.Build.0 = Release|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|iPhone.ActiveCfg = Release|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|iPhone.Build.0 = Release|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|x64.ActiveCfg = Release|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|x64.Build.0 = Release|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|x86.ActiveCfg = Release|Any CPU - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4}.Release|x86.Build.0 = Release|Any CPU {2A66B796-7BC2-4BE0-A920-1A457BBCCC67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2A66B796-7BC2-4BE0-A920-1A457BBCCC67}.Debug|Any CPU.Build.0 = Debug|Any CPU {2A66B796-7BC2-4BE0-A920-1A457BBCCC67}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -1272,7 +1242,6 @@ Global {9A8D2254-9B2B-4B92-8498-43A73BB9A410} = {E448F863-4C9D-47A4-BC4A-4A1381B54DA4} {F4D8CD7B-6DF4-445C-AFA9-44466A552922} = {673FF8CD-9E85-4FA1-ABFC-D1149675E138} {1F659618-71E2-4AAF-9D86-62700FD4CF02} = {1B889C56-157A-4493-85F2-76366282B002} - {B1F221F6-E19B-45D8-959D-A9CDA471C2D4} = {673FF8CD-9E85-4FA1-ABFC-D1149675E138} {2A66B796-7BC2-4BE0-A920-1A457BBCCC67} = {1B889C56-157A-4493-85F2-76366282B002} {137690DF-A3CB-4817-ACB8-9EAF3A52B5B5} = {E448F863-4C9D-47A4-BC4A-4A1381B54DA4} {42154590-445B-41CF-AAEB-AACD1B65FA2C} = {673FF8CD-9E85-4FA1-ABFC-D1149675E138} diff --git a/references/runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets/api-ms-win-core-winrt-l1-1-0.dll b/references/runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets/api-ms-win-core-winrt-l1-1-0.dll new file mode 100644 index 0000000000000000000000000000000000000000..039e3b2d4ab98cefca0e81fda2d88faa49a259d9 GIT binary patch literal 19704 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%0ACcM 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 literal 0 HcmV?d00001 diff --git a/src/Repositories.sqlite-net-pcl/Repositories.sqlite-net-pcl.csproj b/src/Repositories.sqlite-net-pcl/Repositories.sqlite-net-pcl.csproj index e3fe8f9ae..11860c1ab 100644 --- a/src/Repositories.sqlite-net-pcl/Repositories.sqlite-net-pcl.csproj +++ b/src/Repositories.sqlite-net-pcl/Repositories.sqlite-net-pcl.csproj @@ -19,12 +19,11 @@ - - + \ No newline at end of file diff --git a/src/ST.Client.Desktop.Avalonia.App/Properties/PublishProfiles/win-x64.pubxml b/src/ST.Client.Desktop.Avalonia.App/Properties/PublishProfiles/win-x64.pubxml index 875f7c1b5..b7f17d9f1 100644 --- a/src/ST.Client.Desktop.Avalonia.App/Properties/PublishProfiles/win-x64.pubxml +++ b/src/ST.Client.Desktop.Avalonia.App/Properties/PublishProfiles/win-x64.pubxml @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - PUBLISH;WINDOWS; + PUBLISH;PUBLISH_WIN7;WINDOWS; Release bin\Release\Publish\win-x64 FileSystem @@ -12,8 +12,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU net6.0 true - false - + + + + + + true true diff --git a/src/ST.Client.Desktop.Avalonia.App/ST.Client.Avalonia.App.csproj b/src/ST.Client.Desktop.Avalonia.App/ST.Client.Avalonia.App.csproj index e6493f211..0f429fa67 100644 --- a/src/ST.Client.Desktop.Avalonia.App/ST.Client.Avalonia.App.csproj +++ b/src/ST.Client.Desktop.Avalonia.App/ST.Client.Avalonia.App.csproj @@ -94,6 +94,12 @@ + + + PreserveNewest + + + diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs index 17c15be76..b27023c24 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs +++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/FluentWindow.cs @@ -50,15 +50,18 @@ namespace Avalonia.Controls if (!ViewModelBase.IsInDesignMode) { - if (OperatingSystem2.IsWindows7) + if (OperatingSystem2.IsWindows) { + if (OperatingSystem2.IsWindows7) + { #pragma warning disable CA1416 // 验证平台兼容性 - IPlatformService.Instance.FixAvaloniaFluentWindowStyleOnWin7(PlatformImpl.Handle.Handle); + IPlatformService.Instance.FixAvaloniaFluentWindowStyleOnWin7(PlatformImpl.Handle.Handle); #pragma warning restore CA1416 // 验证平台兼容性 - } - else if (OperatingSystem2.IsWindows10AtLeast) - { - AvaloniaLocator.Current.GetService().ForceNativeTitleBarToTheme(this, "Dark"); + } + else if (OperatingSystem2.IsWindows10AtLeast) + { + AvaloniaLocator.Current.GetService().ForceNativeTitleBarToTheme(this, "Dark"); + } } } } diff --git a/src/ST.Client.Desktop.Windows/Services/Implementation/WindowsPlatformServiceImpl.WindowTopRightButtons.cs b/src/ST.Client.Desktop.Windows/Services/Implementation/WindowsPlatformServiceImpl.WindowTopRightButtons.cs index a31f6b33e..4b1654023 100644 --- a/src/ST.Client.Desktop.Windows/Services/Implementation/WindowsPlatformServiceImpl.WindowTopRightButtons.cs +++ b/src/ST.Client.Desktop.Windows/Services/Implementation/WindowsPlatformServiceImpl.WindowTopRightButtons.cs @@ -16,7 +16,7 @@ namespace System.Application.Services.Implementation public const int SC_MAXIMIZE = 0xF030; //public const int CS_DROPSHADOW = 0x20000; - public void FixFluentWindowStyleOnWin7(IntPtr hWnd) + public void FixAvaloniaFluentWindowStyleOnWin7(IntPtr hWnd) { if (!OperatingSystem2.IsWindows7) return; var value = GetWindowLong(hWnd, GWL_STYLE); diff --git a/src/ST.Client/Services/IPlatformService.MacOS.cs b/src/ST.Client/Services/IPlatformService.MacOS.cs index 7235dc041..fbdb7afd1 100644 --- a/src/ST.Client/Services/IPlatformService.MacOS.cs +++ b/src/ST.Client/Services/IPlatformService.MacOS.cs @@ -12,6 +12,9 @@ namespace System.Application.Services partial interface IPlatformService { [SupportedOSPlatform("MacOS")] - string[] GetMacNetworkSetup() => throw new PlatformNotSupportedException(); + string[] GetMacNetworkSetup() + { + return Array.Empty(); + } } } diff --git a/src/ST.Client/Services/IPlatformService.Windows.cs b/src/ST.Client/Services/IPlatformService.Windows.cs index 4bc138754..692213b3d 100644 --- a/src/ST.Client/Services/IPlatformService.Windows.cs +++ b/src/ST.Client/Services/IPlatformService.Windows.cs @@ -13,10 +13,16 @@ namespace System.Application.Services /// 打开桌面图标设置 /// [SupportedOSPlatform("Windows")] - void OpenDesktopIconsSettings() => throw new PlatformNotSupportedException(); + void OpenDesktopIconsSettings() + { + + } [SupportedOSPlatform("Windows")] - void OpenGameControllers() => throw new PlatformNotSupportedException(); + void OpenGameControllers() + { + + } /// /// 已正常权限启动进程 @@ -24,7 +30,10 @@ namespace System.Application.Services /// /// [SupportedOSPlatform("Windows")] - Process StartAsInvoker(string fileName) => throw new PlatformNotSupportedException(); + Process StartAsInvoker(string fileName) + { + return Process.Start(fileName); + } /// /// 获取占用端口的进程 @@ -33,34 +42,43 @@ namespace System.Application.Services /// /// [SupportedOSPlatform("Windows")] - Process? GetProcessByPortOccupy(ushort port, bool isTCPorUDP = true) => throw new PlatformNotSupportedException(); + Process? GetProcessByPortOccupy(ushort port, bool isTCPorUDP = true) + { + return null; + } /// /// 从管理员权限进程中降权到普通权限启动进程 /// /// [SupportedOSPlatform("Windows")] - void UnelevatedProcessStart(string cmdArgs) => throw new PlatformNotSupportedException(); + void UnelevatedProcessStart(string cmdArgs) + { + + } [SupportedOSPlatform("Windows")] - void FixAvaloniaFluentWindowStyleOnWin7(IntPtr hWnd) => throw new PlatformNotSupportedException(); + void FixAvaloniaFluentWindowStyleOnWin7(IntPtr hWnd) + { + + } /// /// 获取当前 Windows 系统产品名称，例如 Windows 10 Pro /// [SupportedOSPlatform("Windows")] - string WindowsProductName => throw new PlatformNotSupportedException(); + string WindowsProductName => string.Empty; /// /// 获取当前 Windows 系统第四位版本号 /// [SupportedOSPlatform("Windows")] - int WindowsVersionRevision => throw new PlatformNotSupportedException(); + int WindowsVersionRevision => default; /// /// 获取当前 Windows 10/11 系统显示版本，例如 21H1 /// [SupportedOSPlatform("Windows")] - string WindowsReleaseIdOrDisplayVersion => throw new PlatformNotSupportedException(); + string WindowsReleaseIdOrDisplayVersion => string.Empty; } } diff --git a/src/ST.Client/Services/IPlatformService.cs b/src/ST.Client/Services/IPlatformService.cs index 87887e944..baf030576 100644 --- a/src/ST.Client/Services/IPlatformService.cs +++ b/src/ST.Client/Services/IPlatformService.cs @@ -30,7 +30,10 @@ namespace System.Application.Services async void RunShell(string script, bool admin = false) => await RunShellAsync(script, admin); /// - ValueTask RunShellAsync(string script, bool admin = false) => throw new PlatformNotSupportedException(); + ValueTask RunShellAsync(string script, bool admin = false) + { + return new(); + } /// /// 使用文本阅读器打开文件 @@ -182,32 +185,47 @@ namespace System.Application.Services /// 使用资源管理器打开文件夹路径 /// /// - void OpenFolderByDirectoryPath(DirectoryInfo info) => throw new PlatformNotSupportedException(); + void OpenFolderByDirectoryPath(DirectoryInfo info) + { + + } /// /// 使用资源管理器选中文件路径 /// /// - void OpenFolderSelectFilePath(FileInfo info) => throw new PlatformNotSupportedException(); + void OpenFolderSelectFilePath(FileInfo info) + { + + } /// /// 设置系统关闭时任务 /// - void SetSystemSessionEnding(Action action) => throw new PlatformNotSupportedException(); + void SetSystemSessionEnding(Action action) + { + + } /// /// 获取文本阅读器提供商程序文件路径或文件名(如果提供程序已注册环境变量) /// /// /// - string? GetFileName(TextReaderProvider provider) => throw new PlatformNotSupportedException(); + string? GetFileName(TextReaderProvider provider) + { + return null; + } /// /// 设置开机自启动 /// /// 开启、关闭 /// - void SetBootAutoStart(bool isAutoStart, string name) => throw new PlatformNotSupportedException(); + void SetBootAutoStart(bool isAutoStart, string name) + { + + } #region Steam diff --git a/src/ST.Client/UI/ViewModels/Base/IPageViewModel.cs b/src/ST.Client/UI/ViewModels/Base/IPageViewModel.cs new file mode 100644 index 000000000..f3b3be480 --- /dev/null +++ b/src/ST.Client/UI/ViewModels/Base/IPageViewModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Text; + +// ReSharper disable once CheckNamespace +namespace System.Application.UI.ViewModels +{ + public interface IPageViewModel : IViewModelBase + { + string Title { get; set; } + } +} diff --git a/src/ST.Client/UI/ViewModels/Base/IWindowViewModel.cs b/src/ST.Client/UI/ViewModels/Base/IWindowViewModel.cs new file mode 100644 index 000000000..af9fc8e43 --- /dev/null +++ b/src/ST.Client/UI/ViewModels/Base/IWindowViewModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Text; + +// ReSharper disable once CheckNamespace +namespace System.Application.UI.ViewModels +{ + public interface IWindowViewModel : IPageViewModel + { + /// + /// 是否支持窗口大小与位置 + /// + public static bool IsSupportedSizePosition { protected get; set; } = true; + } +} diff --git a/src/ST.Client/UI/ViewModels/General/PageViewModel.cs b/src/ST.Client/UI/ViewModels/General/PageViewModel.cs index fc63d6a09..8896c1372 100644 --- a/src/ST.Client/UI/ViewModels/General/PageViewModel.cs +++ b/src/ST.Client/UI/ViewModels/General/PageViewModel.cs @@ -9,7 +9,7 @@ using System.Text; // ReSharper disable once CheckNamespace namespace System.Application.UI.ViewModels { - public class PageViewModel : ViewModelBase + public class PageViewModel : ViewModelBase, IPageViewModel { protected string title = string.Empty; [IgnoreDataMember] diff --git a/src/ST.Client/UI/ViewModels/General/WindowViewModel.cs b/src/ST.Client/UI/ViewModels/General/WindowViewModel.cs index 4f221fe99..8b3973df2 100644 --- a/src/ST.Client/UI/ViewModels/General/WindowViewModel.cs +++ b/src/ST.Client/UI/ViewModels/General/WindowViewModel.cs @@ -10,9 +10,9 @@ using System.Text; // ReSharper disable once CheckNamespace namespace System.Application.UI.ViewModels { - public class WindowViewModel : PageViewModel + public class WindowViewModel : PageViewModel, IWindowViewModel { - public static bool IsSupportedSizePosition { get; set; } = true; + public static bool IsSupportedSizePosition => IWindowViewModel.IsSupportedSizePosition; protected SizePosition? _SizePosition; public SizePosition SizePosition