refactor: 再次重新规划分类与命名空间

PCL.Test/BaseXTest.cs

@@ -1,6 +1,6 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using PCL.Core.Extension;
+using PCL.Core.Utils.Exts;
 
 namespace PCL.Test;
 

PCL.Test/DiffTest.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using PCL.Core.Update.Diff;
+using PCL.Core.Utils.Diff;
 
 namespace PCL.Test;
 

PCL.Test/SemVerTest.cs

@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
-using PCL.Core.Update;
+using PCL.Core.Utils;
 
 namespace PCL.Test
 {

PCL.Test/SnapLiteTest.cs

@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Threading.Tasks;
-using PCL.Core.VersionControl;
+using PCL.Core.Utils.VersionControl;
 
 namespace PCL.Test;
 

PCL.Test/ToastTest.cs

@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-using static PCL.Core.Native.ToastNotification;
+using static PCL.Core.UI.ToastNotification;
 
 namespace PCL.Test;
 

PCL.Test/WebServerTest.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using PCL.Core.Network;
+using PCL.Core.Net;
 using PCL.Core.Utils;
 
 namespace PCL.Test;

Plain Craft Launcher 2/Application.xaml.vb

@@ -1,6 +1,5 @@
 Imports System.Windows.Threading
-Imports System.IO.Compression
+Imports PCL.Core.App
-Imports PCL.Core.LifecycleManagement
 
 Public Class Application
 

Plain Craft Launcher 2/Controls/MinecraftServer.xaml.vb

@@ -1,6 +1,5 @@
 Imports System.Net
 Imports System.Net.Sockets
-Imports System.Security.Policy
 Imports System.Threading.Tasks
 Imports PCL.Core.Link
 

Plain Craft Launcher 2/Controls/MinecraftServerQuery.xaml.vb

@@ -1,8 +1,4 @@
-Imports System.Net
+
-Imports System.Net.Sockets
-Imports System.Security.Policy
-Imports System.Threading.Tasks
-Imports PCL.Core.Link
 
 Class MinecraftServerQuery
     Inherits Grid

Plain Craft Launcher 2/FormMain.xaml.vb

@@ -1,7 +1,7 @@
 Imports System.ComponentModel
 Imports System.Runtime.InteropServices
 Imports System.Windows.Interop
-Imports PCL.Core.LifecycleManagement
+Imports PCL.Core.App
 
 Public Class FormMain
 

Plain Craft Launcher 2/Modules/Base/ModBase.vb

@@ -1,16 +1,14 @@
 Imports System.Globalization
 Imports System.IO.Compression
 Imports System.Runtime.CompilerServices
-Imports System.Runtime.InteropServices
 Imports System.Security.Cryptography
 Imports System.Security.Principal
 Imports System.Text.RegularExpressions
 Imports System.Xaml
 Imports System.Threading.Tasks
 Imports Newtonsoft.Json
-Imports Newtonsoft.Json.Serialization
+Imports PCL.Core.App
 Imports PCL.Core.Logging
-Imports PCL.Core.Native
 
 Public Module ModBase
 
@@ -43,11 +41,11 @@ Public Module ModBase
     ''' <summary>
     ''' 程序可执行文件所在目录，以“\”结尾。
     ''' </summary>
-    Public Path As String = If(NativeInterop.ExecutableDirectory.EndsWith("\"), NativeInterop.ExecutableDirectory, NativeInterop.ExecutableDirectory & "\")
+    Public Path As String = If(Basics.ExecutableDirectory.EndsWith("\"), Basics.ExecutableDirectory, Basics.ExecutableDirectory & "\")
     ''' <summary>
     ''' 程序可执行文件完整路径。
     ''' </summary>
-    Public PathWithName As String = NativeInterop.ExecutablePath
+    Public PathWithName As String = Basics.ExecutablePath
     ''' <summary>
     ''' 程序内嵌图片文件夹路径，以“/”结尾。
     ''' </summary>

Plain Craft Launcher 2/Modules/Base/ModNativeInterop.vb

@@ -1,5 +1,6 @@
 Imports Newtonsoft.Json
-Imports PCL.Core.Native
+Imports PCL.Core.App
+Imports PCL.Core.IO
 
 Public Module ModNativeInterop
 
@@ -124,7 +125,7 @@ Public Module ModNativeInterop
             If OpenLogPipes.Contains(id) Then Return RPCResponse.Err("日志 ID 正在使用")
             Dim pipeName = LogPipePrefix & RandomInteger(10000, 99999)
             OpenLogPipes.Add(id)
-            NativeInterop.StartPipeServer($"Log({id})", pipeName,
+            PipeComm.StartPipeServer($"Log({id})", pipeName,
                 Function(r, w, c) LogPipeCallback(r, w, request),
                 Sub() OpenLogPipes.Remove(id),
                 True, {clientProcess.Id})

Plain Craft Launcher 2/Modules/Base/ModNet.vb

@@ -3,10 +3,9 @@ Imports System.Net.Http
 Imports System.Runtime.InteropServices
 Imports System.Threading.Tasks
 Imports System.IO.Compression
-Imports LiteDB
 Imports CacheCow.Client
 Imports CacheCow.Common
-Imports PCL.Core.Network
+Imports PCL.Core.Net
 Imports PCL.Core.Utils.Hash
 
 Public Module ModNet

Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb

@@ -1,8 +1,5 @@
-Imports System.Diagnostics.Eventing.Reader
+
 Imports System.IO.Compression
-Imports System.Threading.Tasks
-Imports Microsoft.Identity.Client
-Imports Microsoft.Identity.Client.Broker
 Imports PCL.Core.Minecraft
 
 Public Module ModLaunch

Plain Craft Launcher 2/Modules/ModLink.vb

@@ -4,11 +4,11 @@ Imports System.Net.Sockets
 Imports Makaretu.Nat
 Imports STUN
 Imports System.Threading.Tasks
-Imports PCL.Core.Extension
 Imports PCL.Core.IO
 Imports PCL.Core.Link
-Imports PCL.Core.Native
+Imports PCL.Core.Net
-Imports PCL.Core.Network
+Imports PCL.Core.Utils.Exts
+Imports PCL.Core.Utils.OS
 
 Public Module ModLink
 
@@ -226,7 +226,7 @@ Public Module ModLink
     End Function
     Public Function GetLauncherBrand(pid As Integer) As String
         Try
-            Dim cmd = NativeInterop.GetCommandLine(pid)
+            Dim cmd = ProcessInterop.GetCommandLine(pid)
             If cmd.Contains("-Dminecraft.launcher.brand=") Then
                 Return cmd.AfterFirst("-Dminecraft.launcher.brand=").BeforeFirst("-").TrimEnd("'", " ")
             Else

Plain Craft Launcher 2/Modules/ModMusic.vb

@@ -1,5 +1,4 @@
 Imports Windows.Media
-Imports Windows.Storage
 Imports Windows.Storage.Streams
 Public Module ModMusic
 

Plain Craft Launcher 2/Modules/ModSecret.vb

@@ -3,11 +3,9 @@ Imports System.Net.Http
 Imports System.Security.Cryptography
 Imports System.Management
 Imports PCL.Core.IO
-Imports PCL.Core.Secret
 Imports PCL.Core.UI
-Imports PCL.Core.Update
 Imports PCL.Core.Utils
-Imports PCL.Core.VersionControl
+Imports PCL.Core.Utils.Secret
 
 Friend Module ModSecret
 

Plain Craft Launcher 2/Modules/ModWebServer.vb

@@ -1,8 +1,7 @@
 Imports System.Net.NetworkInformation
 Imports System.Threading.Tasks
 Imports Newtonsoft.Json
-Imports PCL.Core.Network
+Imports PCL.Core.Net
-Imports PCL.Core.Utils
 
 Public Module ModWebServer
 

Plain Craft Launcher 2/Modules/Updates/IUpdateSource.vb

@@ -1,5 +1,4 @@
-Imports PCL.Core.Update
+Imports PCL.Core.Utils
-Imports PCL.Core.VersionControl
 
 Public Interface IUpdateSource
     ''' <summary>

Plain Craft Launcher 2/Modules/Updates/UpdatesMinioModel.vb

@@ -1,7 +1,6 @@
 Imports System.IO.Compression
-Imports PCL.Core.Update
+Imports PCL.Core.Utils
-Imports PCL.Core.Update.Diff
+Imports PCL.Core.Utils.Diff
-Imports PCL.Core.VersionControl
 
 Public Class UpdatesMinioModel '社区自己的更新系统格式
     Implements IUpdateSource

Plain Craft Launcher 2/Modules/Updates/UpdatesMirrorChyanModel.vb

@@ -1,7 +1,6 @@
 
-Imports System.Text.Json
+
-Imports PCL.Core.Update
+Imports PCL.Core.Utils
-Imports PCL.Core.VersionControl
 
 Public Class UpdatesMirrorChyanModel 'Mirror 酱的更新格式
     Implements IUpdateSource

Plain Craft Launcher 2/Modules/Updates/UpdatesRandomModel.vb

@@ -1,5 +1,4 @@
-Imports PCL.Core.Update
+Imports PCL.Core.Utils
-Imports PCL.Core.VersionControl
 
 Public Class UpdatesRandomModel '社区自己的更新系统格式
     Implements IUpdateSource

Plain Craft Launcher 2/Modules/Updates/UpdatesWrapperModel.vb

@@ -1,5 +1,4 @@
-Imports PCL.Core.Update
+Imports PCL.Core.Utils
-Imports PCL.Core.VersionControl
 
 Public Class UpdatesWrapperModel
     Implements IUpdateSource

Plain Craft Launcher 2/My Project/Resources.Designer.vb

@@ -11,7 +11,6 @@
 Option Strict On
 Option Explicit On
 
-Imports System
 
 Namespace My.Resources
     

Plain Craft Launcher 2/Pages/PageDownload/Comp/PageDownloadCompDetail.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Security.Cryptography
+
 
 Public Class PageDownloadCompDetail
     Private CompItem As MyCompItem = Nothing

Plain Craft Launcher 2/Pages/PageInstance/PageInstanceSaves.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Security.Principal
+
 
 Public Class PageInstanceSaves
     Implements IRefreshable

Plain Craft Launcher 2/Pages/PageInstance/PageInstanceSaves/PageInstanceSavesBackup.xaml.vb

@@ -1,5 +1,5 @@
 Imports PCL.Core.IO
-Imports PCL.Core.VersionControl
+Imports PCL.Core.Utils.VersionControl
 
 Class PageInstanceSavesBackup
     Implements IRefreshable

Plain Craft Launcher 2/Pages/PageInstance/PageInstanceSaves/PageInstanceSavesLeft.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Threading.Tasks
+
 
 Public Class PageInstanceSavesLeft
     Implements IRefreshable

Plain Craft Launcher 2/Pages/PageInstance/PageInstanceScreenshot.xaml.vb

@@ -1,5 +1,4 @@
-Imports System.Security.Principal
+
-Imports Imazen.WebP.Extern
 
 Public Class PageInstanceScreenshot
     Implements IRefreshable

Plain Craft Launcher 2/Pages/PageLink/PageLinkLobby.xaml.vb

@@ -1,7 +1,8 @@
 
-Imports PCL.Core.Extension
+
 Imports PCL.Core.Link
-Imports PCL.Core.Native
+Imports PCL.Core.UI
+Imports PCL.Core.Utils.Exts
 
 Public Class PageLinkLobby
     '记录的启动情况

Plain Craft Launcher 2/Pages/PageOther/PageOtherTest.xaml.vb

@@ -1,10 +1,9 @@
 Imports System.Net
 Imports System.Runtime.ConstrainedExecution
 Imports System.Runtime.InteropServices
+Imports PCL.Core.App
 
 Imports PCL.Core.IO
-Imports PCL.Core.Link
-Imports PCL.Core.Native
 
 Public Class PageOtherTest
     Public Sub New()
@@ -502,7 +501,7 @@ Public Class PageOtherTest
         If choice = 1 Then Exit Sub
         Dim shortcutPath = If(choice = 2, desktop, start)
         Dim locationName = If(choice = 2, desktopName, startName)
-        Files.CreateShortcut(shortcutPath, NativeInterop.ExecutablePath)
+        Files.CreateShortcut(shortcutPath, Basics.ExecutablePath)
         Hint("已在" & locationName & "创建快捷方式", HintType.Finish)
     End Sub
     

Plain Craft Launcher 2/Pages/PageOther/PageOtherVote.xaml.vb

@@ -1,9 +1,5 @@
-Imports System.Net.Http
+
 Imports System.Text.RegularExpressions
-Imports System.Windows.Forms
-Imports System.Windows.Forms.LinkLabel
-Imports System.Xml
-Imports NAudio.Gui
 
 Public Class PageOtherVote
     Public Class Vote

Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb

@@ -1,4 +1,4 @@
-Imports PCL.Core.Network
+Imports PCL.Core.Net
 
 Public Class ModSetup
 

Plain Craft Launcher 2/Pages/PageSpeedLeft.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Threading.Tasks
+
 
 Public Class PageSpeedLeft
     Private Const WatcherInterval As Integer = 300

Plain Craft Launcher 2/Program.vb

@@ -1,5 +1,5 @@
-Imports PCL.Core.LifecycleManagement
+
-Imports PCL.Core.UI
+Imports PCL.Core.App
 
 Module Program