chore.移动 MaaBuilder 项目位置

yuanqwq · May 23, 2022 · e998cf7 · e998cf7
1 parent e8175c6
commit e998cf7
Show file tree

Hide file tree

Showing 21 changed files with 58 additions and 30 deletions.
diff --git a/.nuke/parameters.json b/.nuke/parameters.json
@@ -1,4 +1,4 @@
 {
   "$schema": "./build.schema.json",
-  "Solution": "MeoAssistantArknights.sln"
-}
+  "Solution": "tools/MaaBuilder.sln"
+}
diff --git 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
@@ -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
@@ -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
diff --git a/tools/MaaBuilder.sln 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 → tools/MaaBuilder/.editorconfig b/src/MeoAssistantBuilder/.editorconfig → tools/MaaBuilder/.editorconfig
diff --git a/...eoAssistantBuilder/ActionConfiguration.cs → tools/MaaBuilder/ActionConfiguration.cs b/...eoAssistantBuilder/ActionConfiguration.cs → tools/MaaBuilder/ActionConfiguration.cs
@@ -1,7 +1,7 @@
 using Nuke.Common.Tooling;
 using System.ComponentModel;
 
-namespace MeoAssistantBuilder;
+namespace MaaBuilder;
 
 [TypeConverter(typeof(TypeConverter<ActionConfiguration>))]
 public class ActionConfiguration : Enumeration

diff --git a/...uilder/Build.CI.GitHubActions.DevBuild.cs → ...uilder/Build.CI.GitHubActions.DevBuild.cs b/...uilder/Build.CI.GitHubActions.DevBuild.cs → ...uilder/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/...lder/Build.CI.GitHubActions.ReleaseMaa.cs → ...lder/Build.CI.GitHubActions.ReleaseMaa.cs b/...lder/Build.CI.GitHubActions.ReleaseMaa.cs → ...lder/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/.../Build.CI.GitHubActions.ReleaseMaaCore.cs → .../Build.CI.GitHubActions.ReleaseMaaCore.cs b/.../Build.CI.GitHubActions.ReleaseMaaCore.cs → .../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/...ld.CI.GitHubActions.ReleaseMaaResource.cs → ...ld.CI.GitHubActions.ReleaseMaaResource.cs b/...ld.CI.GitHubActions.ReleaseMaaResource.cs → ...ld.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 → tools/MaaBuilder/Build.cs b/src/MeoAssistantBuilder/Build.cs → tools/MaaBuilder/Build.cs
@@ -3,6 +3,7 @@
 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.Runtime.InteropServices;
 using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
 
-namespace MeoAssistantBuilder;
+namespace MaaBuilder;
 
 [CheckBuildProjectConfigurations]
 public partial class Build : NukeBuild
@@ -38,7 +39,7 @@ public static int Main()
         }
         return Execute<Build>(_ => _.Default);
     }
-    
+
     BuildParameters Parameters;
 
     const string MasterBranch = "master";
@@ -92,6 +93,7 @@ protected override void OnBuildInitialized()
         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/...MeoAssistantBuilder/BuildConfiguration.cs → tools/MaaBuilder/BuildConfiguration.cs b/...MeoAssistantBuilder/BuildConfiguration.cs → tools/MaaBuilder/BuildConfiguration.cs
@@ -1,7 +1,7 @@
 using Nuke.Common.Tooling;
 using System.ComponentModel;
 
-namespace MeoAssistantBuilder;
+namespace MaaBuilder;
 
 [TypeConverter(typeof(TypeConverter<BuildConfiguration>))]
 public class BuildConfiguration : Enumeration

diff --git a/src/MeoAssistantBuilder/BuildParameters.cs → tools/MaaBuilder/BuildParameters.cs b/src/MeoAssistantBuilder/BuildParameters.cs → tools/MaaBuilder/BuildParameters.cs
@@ -15,7 +15,7 @@
 using System.Text.RegularExpressions;
 using static Nuke.Common.Tools.VSWhere.VSWhereTasks;
 
-namespace MeoAssistantBuilder;
+namespace MaaBuilder;
 
 public partial class Build
 {
@@ -122,8 +122,11 @@ public BuildParameters(Build b)
             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/...MeoAssistantBuilder/Directory.Build.props → tools/MaaBuilder/Directory.Build.props b/...MeoAssistantBuilder/Directory.Build.props → tools/MaaBuilder/Directory.Build.props
diff --git a/...oAssistantBuilder/Directory.Build.targets → tools/MaaBuilder/Directory.Build.targets b/...oAssistantBuilder/Directory.Build.targets → tools/MaaBuilder/Directory.Build.targets
diff --git a/...sistantBuilder/MeoAssistantBuilder.csproj → tools/MaaBuilder/MaaBuilder.csproj b/...sistantBuilder/MeoAssistantBuilder.csproj → tools/MaaBuilder/MaaBuilder.csproj
@@ -8,15 +8,8 @@
     <NukeRootDirectory>..\..</NukeRootDirectory>
     <NukeScriptDirectory>..\..</NukeScriptDirectory>
     <NukeTelemetryVersion>1</NukeTelemetryVersion>
-    <PlatformTarget>x64</PlatformTarget>
-    <Configurations>Release</Configurations>
-    <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
-  <ItemGroup>
-      <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Nuke.Common" Version="6.0.3" />
   </ItemGroup>
@@ -25,6 +18,10 @@
     <PackageDownload Include="vswhere" Version="[3.0.2]" />
   </ItemGroup>
 
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Remove="..\..\.github\workflows\release-maa-core.yml" />
   </ItemGroup>

diff --git a/...er/MeoAssistantBuilder.csproj.DotSettings → .../MaaBuilder/MaaBuilder.csproj.DotSettings b/...er/MeoAssistantBuilder.csproj.DotSettings → .../MaaBuilder/MaaBuilder.csproj.DotSettings
diff --git a/tools/MaaBuilder/Properties/launchSettings.json b/tools/MaaBuilder/Properties/launchSettings.json
@@ -0,0 +1,7 @@
+{
+  "profiles": {
+    "MaaBuilder": {
+      "commandName": "Project"
+    }
+  }
+}
diff --git a/src/MeoAssistantBuilder/README.md → tools/MaaBuilder/README.md b/src/MeoAssistantBuilder/README.md → tools/MaaBuilder/README.md