From d2d0f2c4bc4aae2e57569abedfedd6339abd4b62 Mon Sep 17 00:00:00 2001
From: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
Date: Mon, 11 Aug 2025 17:33:28 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0MaaBuilder=E4=B8=AD?=
=?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E8=BF=87=E6=97=B6=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
tools/MaaBuilder/Builder/BuildParameters.cs | 2 +-
tools/MaaBuilder/Builder/Helper/Build.Helper.Bundler.cs | 8 ++++----
tools/MaaBuilder/Builder/Job/Build.Job.Clean.cs | 6 +++---
tools/MaaBuilder/MaaBuilder.csproj | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/MaaBuilder/Builder/BuildParameters.cs b/tools/MaaBuilder/Builder/BuildParameters.cs
index 9975ab4885..477e2d74b5 100644
--- a/tools/MaaBuilder/Builder/BuildParameters.cs
+++ b/tools/MaaBuilder/Builder/BuildParameters.cs
@@ -133,7 +133,7 @@ public partial class Build
MaaChangelogFile = RootDirectory / "CHANGELOG.md";
// 项目
- var maaSolution = ProjectModelTasks.ParseSolution(RootDirectory / "MAA.sln");
+ var maaSolution = SolutionModelTasks.ParseSolution(RootDirectory / "MAA.sln");
Assert.True(maaSolution is not null, "无法载入 MAA.sln");
MaaCoreProject = maaSolution.GetProject("MaaCore");
MaaWpfProject = maaSolution.GetProject("MaaWpfGui");
diff --git a/tools/MaaBuilder/Builder/Helper/Build.Helper.Bundler.cs b/tools/MaaBuilder/Builder/Helper/Build.Helper.Bundler.cs
index d22342fbd6..c5b2132152 100644
--- a/tools/MaaBuilder/Builder/Helper/Build.Helper.Bundler.cs
+++ b/tools/MaaBuilder/Builder/Helper/Build.Helper.Bundler.cs
@@ -35,7 +35,7 @@ public partial class Build
var sourceDirectory = new DirectoryInfo(input);
var allFiles = sourceDirectory.GetFiles("*.*", SearchOption.AllDirectories);
var allHashes = allFiles
- .Select(x => FileSystemTasks.GetFileHash(x.FullName).ToUpperInvariant() +
+ .Select(x => ((AbsolutePath)x.FullName).GetFileHash().ToUpperInvariant() +
((AbsolutePath)x.FullName).GetUnixRelativePathTo(input))
.Select(GetStringMd5)
.OrderBy(x => x);
@@ -47,7 +47,7 @@ public partial class Build
var combinedHashString = hashCombinedBuilder.ToString();
var hash = GetStringMd5(combinedHashString);
- var bundleHash = FileSystemTasks.GetFileHash(bundle).ToUpperInvariant();
+ var bundleHash = ((AbsolutePath)bundle).GetFileHash().ToUpperInvariant();
ArtifactChecksums.Add(new Checksum
{
@@ -86,14 +86,14 @@ public partial class Build
foreach (var file in files)
{
- FileSystemTasks.DeleteFile(file);
+ file.DeleteFile();
}
}
void BundleMaaBundle(AbsolutePath buildOutput, string bundleName, Package package)
{
var tempDir = buildOutput.Parent / package.PackageType;
- FileSystemTasks.EnsureExistingDirectory(tempDir);
+ tempDir.CreateOrCleanDirectory();
var include = package.Configuration.Include;
var exclude = package.Configuration.Exclude;
diff --git a/tools/MaaBuilder/Builder/Job/Build.Job.Clean.cs b/tools/MaaBuilder/Builder/Job/Build.Job.Clean.cs
index 2cc25fede6..58da892283 100644
--- a/tools/MaaBuilder/Builder/Job/Build.Job.Clean.cs
+++ b/tools/MaaBuilder/Builder/Job/Build.Job.Clean.cs
@@ -8,12 +8,12 @@ public partial class Build
Target UseClean => _ => _
.Executes(() =>
{
- FileSystemTasks.EnsureCleanDirectory(Parameters.ArtifactOutput);
- FileSystemTasks.EnsureCleanDirectory(Parameters.BuildOutput / BuildConfiguration.Release);
+ Parameters.ArtifactOutput.CreateOrCleanDirectory();
+ (Parameters.BuildOutput / BuildConfiguration.Release).CreateOrCleanDirectory();
foreach (var package in Parameters.Packages)
{
- FileSystemTasks.EnsureCleanDirectory(Parameters.BuildOutput / package.PackageType);
+ (Parameters.BuildOutput / package.PackageType).CreateOrCleanDirectory();
}
});
}
diff --git a/tools/MaaBuilder/MaaBuilder.csproj b/tools/MaaBuilder/MaaBuilder.csproj
index 7a2753fd50..961b620887 100644
--- a/tools/MaaBuilder/MaaBuilder.csproj
+++ b/tools/MaaBuilder/MaaBuilder.csproj
@@ -12,7 +12,7 @@
-
+