Merge pull request #986 from BeyondDimension/develop

v2.6.7

packaging/build-osx-app.sh

@@ -33,9 +33,9 @@ emit_plist() {
 	<key>CFBundleIdentifier</key>
 	<string>net.steampp.app</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.6</string>
+	<string>2.6.7</string>
 	<key>CFBundleVersion</key>
-	<string>2.6.6.0</string>
+	<string>2.6.7.0</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.14</string>
 	<key>CFBundleDevelopmentRegion</key>

release-template.md

@@ -50,7 +50,7 @@
 						- .nupkg 文件可使用解压工具打开或解压，找到此文件复制即可
 
 [![steampp.net](https://img.shields.io/badge/WebSite-steampp.net-brightgreen.svg?style=flat-square&color=61dafb)](https://steampp.net)
-[![Steam++ v2.6.6](https://img.shields.io/badge/Steam++-v2.6.6-brightgreen.svg?style=flat-square&color=512bd4)]()
+[![Steam++ v2.6.7](https://img.shields.io/badge/Steam++-v2.6.7-brightgreen.svg?style=flat-square&color=512bd4)]()
   
   
 ##### [不知道该下载哪个文件?](./download-guide.md)
@@ -59,21 +59,21 @@
 ### 文件校验
 |  File  | Checksum (SHA256)  |
 |  ----  |  ----  |
-| Steam++_win_x64_v2.6.6.7z  | SHA256 |
-| Steam++_win_x64_fde_v2.6.6.7z  | SHA256 |
+| Steam++_win_x64_v2.6.7.7z  | SHA256 |
+| Steam++_win_x64_fde_v2.6.7.7z  | SHA256 |
 | | |
-| Steam++_win_x64_v2.6.6.exe  | SHA256 |
-| Steam++_win_x64_fde_v2.6.6.exe  | SHA256 |
+| Steam++_win_x64_v2.6.7.exe  | SHA256 |
+| Steam++_win_x64_fde_v2.6.7.exe  | SHA256 |
 | | |
-| Steam++_linux_x64_v2.6.6.7z  | SHA256 |
-| Steam++_linux_arm64_v2.6.6.7z  | SHA256 |
+| Steam++_linux_x64_v2.6.7.7z  | SHA256 |
+| Steam++_linux_arm64_v2.6.7.7z  | SHA256 |
 | | |
-| Steam++_linux_x64_v2.6.6.deb  | SHA256 |
-| Steam++_linux_arm64_v2.6.6.deb  | SHA256 |
+| Steam++_linux_x64_v2.6.7.deb  | SHA256 |
+| Steam++_linux_arm64_v2.6.7.deb  | SHA256 |
 | | |
-| Steam++_linux_x64_v2.6.6.rpm  | SHA256 |
-| Steam++_linux_arm64_v2.6.6.rpm  | SHA256 |
+| Steam++_linux_x64_v2.6.7.rpm  | SHA256 |
+| Steam++_linux_arm64_v2.6.7.rpm  | SHA256 |
 | | |
-| Steam++_macos_x64_v2.6.6.dmg  | SHA256 |
+| Steam++_macos_x64_v2.6.7.dmg  | SHA256 |
 | | |
-| Steam++_android_v2.6.6.apk  | SHA256 |
+| Steam++_android_v2.6.7.apk  | SHA256 |

src/Common.CoreLib/IOPath.cs

@@ -173,12 +173,12 @@ namespace System
                 string sourceAppDataPath, string sourceCachePath)
             {
                 var paths = new[] { destAppDataPath, destCachePath, };
-                var dict_paths = paths.ToDictionary(x => x, Directory.Exists);
+                var dict_paths = paths.ToDictionary(x => x, x => Directory.Exists(x) && Directory.EnumerateFileSystemEntries(x).Any());
 
                 if (dict_paths.Values.All(x => !x))
                 {
                     var old_paths = new[] { sourceAppDataPath, sourceCachePath, };
-                    if (old_paths.All(Directory.Exists)) // 迁移之前根目录上的文件夹
+                    if (old_paths.All(x => Directory.Exists(x) && Directory.EnumerateFileSystemEntries(x).Any())) // 迁移之前根目录上的文件夹
                     {
                         for (int i = 0; i < old_paths.Length; i++)
                         {
@@ -191,7 +191,8 @@ namespace System
                             }
                             catch
                             {
-                                // 跨卷移动失败或其他原因失败，使用旧的目录
+                                // 跨卷移动失败或其他原因失败，使用旧的目录，并尝试删除创建的空文件夹
+                                DirTryDelete(path);
                                 paths[i] = old_path;
                             }
                         }

src/Common.CoreLib/Properties/ThisAssembly.Version.cs

@@ -12,7 +12,7 @@ namespace System.Properties
         ///   <item> macOS：\packaging\build-osx-app.sh &lt;CFBundleVersion&gt; &lt;CFBundleShortVersionString&gt; </item>
         /// </list>
         /// </summary>
-        public const string Version = "2.6.6";
+        public const string Version = "2.6.7";
 
         //public const string InfoVersion = Version + "-beta";
     }

src/ST.Client.Desktop.Avalonia.App.Bridge.Package/Package.appxmanifest

@@ -10,7 +10,7 @@
   <Identity
     Name="4651ED44255E.47979655102CE"
     Publisher="CN=A90E406B-B2D3-4A23-B061-0FA1D65C4F66"
-    Version="2.6.5.0" />
+    Version="2.6.7.0" />
 
   <Properties>
     <DisplayName>Steam++</DisplayName>

src/ST.Client.Mobile.Droid.App/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="20220206" android:versionName="2.6.6" package="net.steampp.app" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="20220206" android:versionName="2.6.7" package="net.steampp.app" android:installLocation="auto">
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
   <application android:fullBackupContent="@xml/auto_backup_rules"></application>
   <!-- Required for API Level 30 to make sure the app can detect browsers and other apps where communication is needed.-->