From bcff694172e2003ca1810f84c5d1a87ac841c3ce Mon Sep 17 00:00:00 2001 From: Aigio Liu Date: Wed, 17 Nov 2021 12:09:05 +0800 Subject: [PATCH] Remove osx FDE --- README.en.md | 2 +- README.md | 2 +- release-template.md | 9 +++----- .../PublishProfiles/fd-osx-arm64.pubxml | 21 ------------------- .../PublishProfiles/fd-osx-x64.pubxml | 20 ------------------ src/ST.Tools.Publish/Steps/Step_start.cs | 4 ++++ 6 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 src/ST.Client.Desktop.Avalonia.App/Properties/PublishProfiles/fd-osx-arm64.pubxml delete mode 100644 src/ST.Client.Desktop.Avalonia.App/Properties/PublishProfiles/fd-osx-x64.pubxml diff --git a/README.en.md b/README.en.md index e3d2074cf..6346850ae 100644 --- a/README.en.md +++ b/README.en.md @@ -55,7 +55,7 @@ OS | Version | Architectures [Windows 10 Client][Windows-client] | Version 1607+(**\***) | x64 | [Windows][Windows-lifecycle] [Windows Server][Windows-Server] | 2012+ | x64 | [Windows Server][Windows-Server-lifecycle] -**\*** Windows 7 SP1 is supported with KB3063858 [64 bit](https://www.microsoft.com/download/details.aspx?id=47442) installed. +**\*** Windows 7 SP1 is supported with [Extended Security Updates](https://docs.microsoft.com/troubleshoot/windows-client/windows-7-eos-faq/windows-7-extended-security-updates-faq) installed. **\*** Microsoft Store/Desktop Bridge Version 1809+ [Windows-client]: https://www.microsoft.com/windows/ diff --git a/README.md b/README.md index 46bf1f736..50662d42c 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ OS | Version | Architectures [Windows 10 Client][Windows-client] | Version 1607+(**\***) | x64 | [Windows][Windows-lifecycle] [Windows Server][Windows-Server] | 2012+ | x64 | [Windows Server][Windows-Server-lifecycle] -**\*** Windows 7 SP1 is supported with KB3063858 [64 位](https://www.microsoft.com/zh-cn/download/details.aspx?id=47442) installed. +**\*** Windows 7 SP1 is supported with [Extended Security Updates](https://docs.microsoft.com/troubleshoot/windows-client/windows-7-eos-faq/windows-7-extended-security-updates-faq) installed. **\*** Microsoft Store/Desktop Bridge Version 1809+ [Windows-client]: https://www.microsoft.com/windows/ diff --git a/release-template.md b/release-template.md index 297db6a22..49d740f54 100644 --- a/release-template.md +++ b/release-template.md @@ -71,7 +71,6 @@ - 如果你已安装了 [ASP.NET Core Runtime 6.0.0](https://dotnet.microsoft.com/download/dotnet/6.0) 则下载文件名中带有 **fde** 的文件，可减少磁盘占用空间 - [在 Windows 上安装 .NET](https://docs.microsoft.com/en-us/dotnet/core/install/windows) - 在 Windows 上不需要 Hosting Bundle 和 IIS support - - [在 macOS 上安装 .NET](https://docs.microsoft.com/en-us/dotnet/core/install/macos) - [在 Linux 上安装 .NET](https://docs.microsoft.com/en-us/dotnet/core/install/linux) - Mobile - Android @@ -90,6 +89,7 @@ | Steam++_linux_x64_v2.6.0.7z | SHA256 | | Steam++_linux_arm64_v2.6.0.7z | SHA256 | | Steam++_linux_arm_v2.6.0.7z | SHA256 | +| | | | Steam++_linux_x64_fde_v2.6.0.7z | SHA256 | | Steam++_linux_arm64_fde_v2.6.0.7z | SHA256 | | Steam++_linux_arm_fde_v2.6.0.7z | SHA256 | @@ -97,6 +97,7 @@ | Steam++_linux_x64_v2.6.0.deb | SHA256 | | Steam++_linux_arm64_v2.6.0.deb | SHA256 | | Steam++_linux_arm_v2.6.0.deb | SHA256 | +| | | | Steam++_linux_x64_fde_v2.6.0.deb | SHA256 | | Steam++_linux_arm64_fde_v2.6.0.deb | SHA256 | | Steam++_linux_arm_fde_v2.6.0.deb | SHA256 | @@ -104,19 +105,15 @@ | Steam++_linux_x64_v2.6.0.rpm | SHA256 | | Steam++_linux_arm64_v2.6.0.rpm | SHA256 | | Steam++_linux_arm_v2.6.0.rpm | SHA256 | +| | | | Steam++_linux_x64_fde_v2.6.0.rpm | SHA256 | | Steam++_linux_arm64_fde_v2.6.0.rpm | SHA256 | | Steam++_linux_arm_fde_v2.6.0.rpm | SHA256 | | | | | Steam++_macos_x64_v2.6.0.dmg | SHA256 | -| Steam++_macos_x64_fde_v2.6.0.dmg | SHA256 | | Steam++_macos_arm64_v2.6.0.dmg | SHA256 | -| Steam++_macos_arm64_fde_v2.6.0.dmg | SHA256 | -| | | | Steam++_macos_x64_v2.6.0.7z | SHA256 | -| Steam++_macos_x64_fde_v2.6.0.7z | SHA256 | | Steam++_macos_arm64_v2.6.0.7z | SHA256 | -| Steam++_macos_arm64_fde_v2.6.0.7z | SHA256 | | | | | Steam++_android_arm64_v8a_v2.6.0.apk | SHA256 | | Steam++_android_armeabi_v7a_v2.6.0.apk | SHA256 | diff --git a/src/ST.Client.Desktop.Avalonia.App/Properties/PublishProfiles/fd-osx-arm64.pubxml b/src/ST.Client.Desktop.Avalonia.App/Properties/PublishProfiles/fd-osx-arm64.pubxml deleted file mode 100644 index f79a38386..000000000 --- a/src/ST.Client.Desktop.Avalonia.App/Properties/PublishProfiles/fd-osx-arm64.pubxml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - FRAMEWORK_DEPENDENT;MAC;PUBLISH;$(DefineConstants) - Release - arm64 - bin\Release\Publish\FrameworkDependent\osx-arm64 - FileSystem - osx.11.0-arm64 - net6.0 - false - true - true - none - false - - diff --git a/src/ST.Client.Desktop.Avalonia.App/Properties/PublishProfiles/fd-osx-x64.pubxml b/src/ST.Client.Desktop.Avalonia.App/Properties/PublishProfiles/fd-osx-x64.pubxml deleted file mode 100644 index 20f3356c5..000000000 --- a/src/ST.Client.Desktop.Avalonia.App/Properties/PublishProfiles/fd-osx-x64.pubxml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - FRAMEWORK_DEPENDENT;MAC;PUBLISH;$(DefineConstants) - Release - Any CPU - bin\Release\Publish\FrameworkDependent\osx-x64 - FileSystem - osx.10.14-x64 - net6.0 - false - true - true - none - false - - diff --git a/src/ST.Tools.Publish/Steps/Step_start.cs b/src/ST.Tools.Publish/Steps/Step_start.cs index 3ca20eeb3..de30b25d7 100644 --- a/src/ST.Tools.Publish/Steps/Step_start.cs +++ b/src/ST.Tools.Publish/Steps/Step_start.cs @@ -40,6 +40,10 @@ namespace System.Application.Steps foreach (var item in dirNames) { + var isMacOS = item.Name.StartsWith("osx"); + // ASP.NET Core Runtime 6.0.0 缺少 macOS Installers + if (isMacOS && d == DeploymentMode.FDE) continue; + if (!Directory.Exists(item.Path)) { Console.WriteLine($"错误：找不到发布文件夹({item.Name})，{item.Path}");