Merge pull request #5 from AMagicPear/fix/fix-5.10

fix: 修复迁移后的依赖问题

Author: Hill23333

PCL.Neo.Core/Const.cs

@@ -25,4 +25,38 @@ public enum RunningOs
                 : RunningOs.Unknown;
 
     public static readonly Architecture Architecture = RuntimeInformation.ProcessArchitecture;
+
+    /// <summary>
+    /// 根据 MOJANG API 命名
+    /// </summary>
+    public static string Platform
+    {
+        get
+        {
+            return Os switch
+            {
+                RunningOs.Windows => Architecture switch
+                {
+                    Architecture.X64 => "windows-x64",
+                    Architecture.X86 => "windows-x86",
+                    Architecture.Arm64 => "windows-arm64",
+                    _ => "unknown"
+                },
+                RunningOs.Linux => Architecture switch
+                {
+                    Architecture.X64 => "linux",
+                    Architecture.X86 => "linux-i386",
+                    _ => "unknown"
+                },
+                RunningOs.MacOs => Architecture switch
+                {
+                    Architecture.X64 => "mac-os",
+                    Architecture.Arm64 => "mac-os-arm64",
+                    _ => "unknown"
+                },
+                RunningOs.Unknown => "unknown",
+                _ => "unknown"
+            };
+        }
+    }
 }

PCL.Neo/Helpers/FileHelper.cs renamed to PCL.Neo.Core/Helpers/FileHelper.cs

@@ -1,16 +1,8 @@
-using Avalonia.Platform.Storage;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using PCL.Neo.Services;
-using System;
 using System.Diagnostics;
-using System.IO;
-using System.Net.Http;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
-using System.Threading;
-using System.Threading.Tasks;
 
-namespace PCL.Neo.Helpers;
+namespace PCL.Neo.Core.Helpers;
 
 /// <summary>
 /// 一些文件操作和下载请求之类的

PCL.Neo.Core/Models/Minecraft/Java/JavaData.cs

@@ -1,3 +1,4 @@
+using PCL.Neo.Core.Utils;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 

PCL.Neo.Core/Models/Minecraft/Java/JavaFetcherOnline.cs

@@ -1,3 +1,4 @@
+using PCL.Neo.Core.Helpers;
 using System.Diagnostics;
 using System.Text.Json;
 using System.Text.Json.Nodes;
@@ -105,7 +106,7 @@ public sealed record MojangJavaVersion(string Value)
             }
 
             string localFilePath = Path.Combine(destinationFolder,
-                filePath.Replace("/", Const.Sep.ToString()));
+                filePath.Replace("/", Path.DirectorySeparatorChar.ToString()));
             if (isExecutable) executableFiles.Add(localFilePath);
             Directory.CreateDirectory(Path.GetDirectoryName(localFilePath)!);
             // 有的文件有LZMA压缩但是有的 tm 没有，尼玛搞了个解压缩发现文件少了几个

PCL.Neo.Core/Models/Minecraft/Java/JavaManager.cs

@@ -1,3 +1,5 @@
+using PCL.Neo.Core.Utils;
+
 namespace PCL.Neo.Core.Models.Minecraft.Java;
 
 /// <summary>

PCL.Neo.Core/Models/Minecraft/Java/Unix.cs

@@ -1,3 +1,4 @@
+using PCL.Neo.Core.Utils;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 

PCL.Neo.Core/Models/Minecraft/Java/Windows.cs

@@ -1,3 +1,4 @@
+using PCL.Neo.Core.Utils;
 using System.Collections.Immutable;
 
 namespace PCL.Neo.Core.Models.Minecraft.Java;

PCL.Neo.Core/PCL.Neo.Core.csproj

@@ -6,4 +6,8 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
+    <ItemGroup>
+      <PackageReference Include="SevenZip" Version="19.0.0" />
+    </ItemGroup>
+
 </Project>