diff --git a/.nuke/parameters.json b/.nuke/parameters.json index b19a9aadf6..c2f3bbc754 100644 --- a/.nuke/parameters.json +++ b/.nuke/parameters.json @@ -1,4 +1,4 @@ { "$schema": "./build.schema.json", - "Solution": "MeoAssistantArknights.sln" -} \ No newline at end of file + "Solution": "tools/MaaBuilder.sln" +} diff --git a/MeoAssistantArknights.sln b/MeoAssistantArknights.sln index 5447bafde1..649dbaef43 100644 --- a/MeoAssistantArknights.sln +++ b/MeoAssistantArknights.sln @@ -28,6 +28,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MeoAssistantBuilder", "src\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ItemMappingCvt", "tools\ItemMappingCvt\ItemMappingCvt.vcxproj", "{C9EA2837-0A4B-488F-A289-643B9D0BFCEB}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MeoAssistantBuilder", "tools\MeoAssistantBuilder\MeoAssistantBuilder.csproj", "{834C1184-5CF8-4FF8-B538-64A09E1EAED5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CICD|x64 = CICD|x64 @@ -38,6 +40,8 @@ Global RelWithDebInfo|x86 = RelWithDebInfo|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {834C1184-5CF8-4FF8-B538-64A09E1EAED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {834C1184-5CF8-4FF8-B538-64A09E1EAED5}.Release|Any CPU.ActiveCfg = Release|Any CPU {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.CICD|x64.ActiveCfg = RelWithDebInfo|x64 {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.CICD|x64.Build.0 = RelWithDebInfo|x64 {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.CICD|x86.ActiveCfg = Release|x64 diff --git a/build.ps1 b/build.ps1 index c882fdd772..fdd58245a8 100644 --- a/build.ps1 +++ b/build.ps1 @@ -13,7 +13,7 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent # CONFIGURATION ########################################################################### -$BuildProjectFile = "$PSScriptRoot\src\MeoAssistantBuilder\MeoAssistantBuilder.csproj" +$BuildProjectFile = "$PSScriptRoot\tools\MaaBuilder\MaaBuilder.csproj" $TempDirectory = "$PSScriptRoot\\.nuke\temp" $DotNetGlobalFile = "$PSScriptRoot\\global.json" diff --git a/build.sh b/build.sh index 5ba1d1a8a2..79fb65d746 100644 --- a/build.sh +++ b/build.sh @@ -9,7 +9,7 @@ SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd) # CONFIGURATION ########################################################################### -BUILD_PROJECT_FILE="$SCRIPT_DIR/src/MeoAssistantBuilder/MeoAssistantBuilder.csproj" +BUILD_PROJECT_FILE="$SCRIPT_DIR/tools/MaaBuilder/MaaBuilder.csproj" TEMP_DIRECTORY="$SCRIPT_DIR//.nuke/temp" DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json" diff --git a/src/MeoAssistantBuilder/Properties/launchSettings.json b/src/MeoAssistantBuilder/Properties/launchSettings.json deleted file mode 100644 index f013c864d8..0000000000 --- a/src/MeoAssistantBuilder/Properties/launchSettings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "profiles": { - "MeoAssistantBuilder": { - "commandName": "Project", - "commandLineArgs": "--target DevTest" - } - } -} \ No newline at end of file diff --git a/tools/MaaBuilder.sln b/tools/MaaBuilder.sln new file mode 100644 index 0000000000..3ca7042005 --- /dev/null +++ b/tools/MaaBuilder.sln @@ -0,0 +1,23 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32505.173 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaaBuilder", "MaaBuilder\MaaBuilder.csproj", "{C62E485E-4851-42F9-A4D4-B098B1135E5E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C62E485E-4851-42F9-A4D4-B098B1135E5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C62E485E-4851-42F9-A4D4-B098B1135E5E}.Release|Any CPU.ActiveCfg = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DE56D63D-A051-4FA1-9F1F-95FBF1002B70} + EndGlobalSection +EndGlobal diff --git a/src/MeoAssistantBuilder/.editorconfig b/tools/MaaBuilder/.editorconfig similarity index 100% rename from src/MeoAssistantBuilder/.editorconfig rename to tools/MaaBuilder/.editorconfig diff --git a/src/MeoAssistantBuilder/ActionConfiguration.cs b/tools/MaaBuilder/ActionConfiguration.cs similarity index 99% rename from src/MeoAssistantBuilder/ActionConfiguration.cs rename to tools/MaaBuilder/ActionConfiguration.cs index 564c712b8d..be052989e0 100644 --- a/src/MeoAssistantBuilder/ActionConfiguration.cs +++ b/tools/MaaBuilder/ActionConfiguration.cs @@ -1,7 +1,7 @@ using Nuke.Common.Tooling; using System.ComponentModel; -namespace MeoAssistantBuilder; +namespace MaaBuilder; [TypeConverter(typeof(TypeConverter))] public class ActionConfiguration : Enumeration diff --git a/src/MeoAssistantBuilder/Build.CI.GitHubActions.DevBuild.cs b/tools/MaaBuilder/Build.CI.GitHubActions.DevBuild.cs similarity index 97% rename from src/MeoAssistantBuilder/Build.CI.GitHubActions.DevBuild.cs rename to tools/MaaBuilder/Build.CI.GitHubActions.DevBuild.cs index 0c9dea4bc5..fc6506bc5b 100644 --- a/src/MeoAssistantBuilder/Build.CI.GitHubActions.DevBuild.cs +++ b/tools/MaaBuilder/Build.CI.GitHubActions.DevBuild.cs @@ -1,6 +1,6 @@ using Nuke.Common.CI.GitHubActions; -namespace MeoAssistantBuilder; +namespace MaaBuilder; [GitHubActions( name: "dev-build", diff --git a/src/MeoAssistantBuilder/Build.CI.GitHubActions.ReleaseMaa.cs b/tools/MaaBuilder/Build.CI.GitHubActions.ReleaseMaa.cs similarity index 91% rename from src/MeoAssistantBuilder/Build.CI.GitHubActions.ReleaseMaa.cs rename to tools/MaaBuilder/Build.CI.GitHubActions.ReleaseMaa.cs index b2db30323c..3a0650df6f 100644 --- a/src/MeoAssistantBuilder/Build.CI.GitHubActions.ReleaseMaa.cs +++ b/tools/MaaBuilder/Build.CI.GitHubActions.ReleaseMaa.cs @@ -1,6 +1,6 @@ using Nuke.Common.CI.GitHubActions; -namespace MeoAssistantBuilder; +namespace MaaBuilder; [GitHubActions( name: "release-maa", diff --git a/src/MeoAssistantBuilder/Build.CI.GitHubActions.ReleaseMaaCore.cs b/tools/MaaBuilder/Build.CI.GitHubActions.ReleaseMaaCore.cs similarity index 92% rename from src/MeoAssistantBuilder/Build.CI.GitHubActions.ReleaseMaaCore.cs rename to tools/MaaBuilder/Build.CI.GitHubActions.ReleaseMaaCore.cs index e609c31d32..f965a0efe7 100644 --- a/src/MeoAssistantBuilder/Build.CI.GitHubActions.ReleaseMaaCore.cs +++ b/tools/MaaBuilder/Build.CI.GitHubActions.ReleaseMaaCore.cs @@ -1,6 +1,6 @@ /*using Nuke.Common.CI.GitHubActions; -namespace MeoAssistantBuilder; +namespace MaaBuilder; [GitHubActions( name: "release-maa-core", diff --git a/src/MeoAssistantBuilder/Build.CI.GitHubActions.ReleaseMaaResource.cs b/tools/MaaBuilder/Build.CI.GitHubActions.ReleaseMaaResource.cs similarity index 93% rename from src/MeoAssistantBuilder/Build.CI.GitHubActions.ReleaseMaaResource.cs rename to tools/MaaBuilder/Build.CI.GitHubActions.ReleaseMaaResource.cs index 133c2f5a20..3111772f05 100644 --- a/src/MeoAssistantBuilder/Build.CI.GitHubActions.ReleaseMaaResource.cs +++ b/tools/MaaBuilder/Build.CI.GitHubActions.ReleaseMaaResource.cs @@ -1,6 +1,6 @@ using Nuke.Common.CI.GitHubActions; -namespace MeoAssistantBuilder; +namespace MaaBuilder; [GitHubActions( name: "release-maa-resource", diff --git a/src/MeoAssistantBuilder/Build.cs b/tools/MaaBuilder/Build.cs similarity index 99% rename from src/MeoAssistantBuilder/Build.cs rename to tools/MaaBuilder/Build.cs index a7de238abb..8c892d47ce 100644 --- a/src/MeoAssistantBuilder/Build.cs +++ b/tools/MaaBuilder/Build.cs @@ -3,6 +3,7 @@ using Nuke.Common; using Nuke.Common.Execution; using Nuke.Common.Git; using Nuke.Common.IO; +using Nuke.Common.ProjectModel; using Nuke.Common.Tooling; using Nuke.Common.Tools.GitHub; using Nuke.Common.Tools.MSBuild; @@ -15,7 +16,7 @@ using System.Linq; using System.Runtime.InteropServices; using static Nuke.Common.Tools.MSBuild.MSBuildTasks; -namespace MeoAssistantBuilder; +namespace MaaBuilder; [CheckBuildProjectConfigurations] public partial class Build : NukeBuild @@ -38,7 +39,7 @@ public partial class Build : NukeBuild } return Execute(_ => _.Default); } - + BuildParameters Parameters; const string MasterBranch = "master"; @@ -92,6 +93,7 @@ public partial class Build : NukeBuild Information($"在 GitHub Actions 中运行：{Parameters.IsGitHubActions}"); Information($"是 Pull Request：{Parameters.IsPullRequest}"); Information($"是 Workflow Dispatch 触发：{Parameters.IsWorkflowDispatch}"); + Information($"是 PreRelease 版本：{Parameters.IsPreRelease}"); Information($"Actions 名称：{Parameters.GhActionName ?? "Null"}"); Information($"Actions 分支：{Parameters.GhBranch ?? "Null"}"); Information($"Actions PR：{Parameters.GhPullRequestId ?? "Null"}"); diff --git a/src/MeoAssistantBuilder/BuildConfiguration.cs b/tools/MaaBuilder/BuildConfiguration.cs similarity index 97% rename from src/MeoAssistantBuilder/BuildConfiguration.cs rename to tools/MaaBuilder/BuildConfiguration.cs index 8908aa4d45..dc997cd6fc 100644 --- a/src/MeoAssistantBuilder/BuildConfiguration.cs +++ b/tools/MaaBuilder/BuildConfiguration.cs @@ -1,7 +1,7 @@ using Nuke.Common.Tooling; using System.ComponentModel; -namespace MeoAssistantBuilder; +namespace MaaBuilder; [TypeConverter(typeof(TypeConverter))] public class BuildConfiguration : Enumeration diff --git a/src/MeoAssistantBuilder/BuildParameters.cs b/tools/MaaBuilder/BuildParameters.cs similarity index 96% rename from src/MeoAssistantBuilder/BuildParameters.cs rename to tools/MaaBuilder/BuildParameters.cs index 5db5a52d60..f53151734f 100644 --- a/src/MeoAssistantBuilder/BuildParameters.cs +++ b/tools/MaaBuilder/BuildParameters.cs @@ -15,7 +15,7 @@ using System.Runtime.InteropServices; using System.Text.RegularExpressions; using static Nuke.Common.Tools.VSWhere.VSWhereTasks; -namespace MeoAssistantBuilder; +namespace MaaBuilder; public partial class Build { @@ -122,8 +122,11 @@ public partial class Build MaaResourceChangeLogFile = RootDirectory / "CHANGELOG_RES.md"; // 项目 - MaaCoreProject = b.Solution.GetProject("MeoAssistant"); - MaaWpfProject = b.Solution.GetProject("MeoAsstGui"); + var mySln = b.Solution; + var maaSolution = ProjectModelTasks.ParseSolution(RootDirectory / "MeoAssistantArknights.sln"); + Assert.True(maaSolution is not null, "无法载入 MeoAssistantArknights.sln"); + MaaCoreProject = maaSolution.GetProject("MeoAssistant"); + MaaWpfProject = maaSolution.GetProject("MeoAsstGui"); // 配置 CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("zh-Hans-CN"); diff --git a/src/MeoAssistantBuilder/Directory.Build.props b/tools/MaaBuilder/Directory.Build.props similarity index 100% rename from src/MeoAssistantBuilder/Directory.Build.props rename to tools/MaaBuilder/Directory.Build.props diff --git a/src/MeoAssistantBuilder/Directory.Build.targets b/tools/MaaBuilder/Directory.Build.targets similarity index 100% rename from src/MeoAssistantBuilder/Directory.Build.targets rename to tools/MaaBuilder/Directory.Build.targets diff --git a/src/MeoAssistantBuilder/MeoAssistantBuilder.csproj b/tools/MaaBuilder/MaaBuilder.csproj similarity index 81% rename from src/MeoAssistantBuilder/MeoAssistantBuilder.csproj rename to tools/MaaBuilder/MaaBuilder.csproj index a50821c11b..36f5f0c71d 100644 --- a/src/MeoAssistantBuilder/MeoAssistantBuilder.csproj +++ b/tools/MaaBuilder/MaaBuilder.csproj @@ -8,15 +8,8 @@ ..\.. ..\.. 1 - x64 - Release - AnyCPU;x64 - - - - @@ -25,6 +18,10 @@ + + + + diff --git a/src/MeoAssistantBuilder/MeoAssistantBuilder.csproj.DotSettings b/tools/MaaBuilder/MaaBuilder.csproj.DotSettings similarity index 100% rename from src/MeoAssistantBuilder/MeoAssistantBuilder.csproj.DotSettings rename to tools/MaaBuilder/MaaBuilder.csproj.DotSettings diff --git a/tools/MaaBuilder/Properties/launchSettings.json b/tools/MaaBuilder/Properties/launchSettings.json new file mode 100644 index 0000000000..f75b911c80 --- /dev/null +++ b/tools/MaaBuilder/Properties/launchSettings.json @@ -0,0 +1,7 @@ +{ + "profiles": { + "MaaBuilder": { + "commandName": "Project" + } + } +} \ No newline at end of file diff --git a/src/MeoAssistantBuilder/README.md b/tools/MaaBuilder/README.md similarity index 100% rename from src/MeoAssistantBuilder/README.md rename to tools/MaaBuilder/README.md