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 @@ - +