diff --git a/.github/workflows/build-loaders.yml b/.github/workflows/build-loaders.yml index 0eb07015..52be9337 100644 --- a/.github/workflows/build-loaders.yml +++ b/.github/workflows/build-loaders.yml @@ -2,37 +2,43 @@ name: Build Loaders on: push: - branches: [ "main" ] + branches: + - main + paths-ignore: + - ".*/**" + - "**/*.md" pull_request: - branches: [ "main" ] + branches: + - main + paths-ignore: + - ".*/**" + - "**/*.md" workflow_dispatch: - + jobs: build-loaders-on-windows: runs-on: windows-latest steps: - - uses: actions/checkout@v3 with: - submodules: 'true' + submodules: "true" - name: Setup .NET uses: actions/setup-dotnet@v2 with: - dotnet-version: '6.0.x' + dotnet-version: "6.0.x" include-prerelease: false - name: Setup Dotnet SDK run: | bitsadmin.exe /rawreturn /transfer getfile https://go.microsoft.com/fwlink/?linkid=2088517 C:\sdk.exe C:\sdk.exe - + - name: Build Loaders + working-directory: "KitX Loaders" run: | - cd "KitX Loaders" - cd "KitX.Loader.Winform.Framework" dotnet build -c Release cd ".." @@ -48,33 +54,3 @@ jobs: cd "KitX.Loader.WPF.Core" dotnet build -c Release cd ".." - - cd ".." - - # build-loaders-on-ubuntu: - # runs-on: ubuntu-latest - - # steps: - - # - uses: actions/checkout@v3 - - # - name: Setup .NET - # uses: actions/setup-dotnet@v2 - # with: - # dotnet-version: '6.0.x' - # include-prerelease: false - - # build-loaders-on-macos: - # runs-on: macos-latest - - # steps: - - # - uses: actions/checkout@v3 - - # - name: Setup .NET - # uses: actions/setup-dotnet@v2 - # with: - # dotnet-version: '6.0.x' - # include-prerelease: false - - diff --git a/.github/workflows/build-plugins.yml b/.github/workflows/build-plugins.yml index 20ef3f7b..4b6d8afd 100644 --- a/.github/workflows/build-plugins.yml +++ b/.github/workflows/build-plugins.yml @@ -2,26 +2,33 @@ name: Build Plugins on: push: - branches: [ "main" ] + branches: + - main + paths-ignore: + - ".*/**" + - "**/*.md" pull_request: - branches: [ "main" ] + branches: + - main + paths-ignore: + - ".*/**" + - "**/*.md" workflow_dispatch: - + jobs: build-plugins-on-windows: runs-on: windows-latest steps: - - uses: actions/checkout@v3 with: - submodules: 'true' + submodules: "true" - name: Setup .NET uses: actions/setup-dotnet@v2 with: - dotnet-version: '6.0.x' + dotnet-version: "6.0.x" include-prerelease: false - name: Setup Dotnet SDK @@ -30,39 +37,8 @@ jobs: C:\sdk.exe - name: Build Plugins + working-directory: "KitX Plugins" run: | - cd "KitX Plugins" - cd "TestPlugin.WPF.Core" dotnet build -c Release cd ".." - - cd ".." - - # build-plugins-on-ubuntu: - # runs-on: ubuntu-latest - - # steps: - - # - uses: actions/checkout@v3 - - # - name: Setup .NET - # uses: actions/setup-dotnet@v2 - # with: - # dotnet-version: '6.0.x' - # include-prerelease: false - - # build-plugins-on-macos: - # runs-on: macos-latest - - # steps: - - # - uses: actions/checkout@v3 - - # - name: Setup .NET - # uses: actions/setup-dotnet@v2 - # with: - # dotnet-version: '6.0.x' - # include-prerelease: false - - diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index debc43cc..3a5ffda0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,164 +2,137 @@ name: Build Universal on: push: - branches: [ "main" ] + branches: + - main + paths-ignore: + - ".*/**" + - "**/*.md" pull_request: - branches: [ "main" ] + branches: + - main + paths-ignore: + - ".*/**" + - "**/*.md" workflow_dispatch: - + jobs: build-on-windows: runs-on: windows-latest steps: - - uses: actions/checkout@v3 with: - submodules: 'true' + submodules: "true" - name: Setup .NET uses: actions/setup-dotnet@v2 with: - dotnet-version: '6.0.x' + dotnet-version: "6.0.x" include-prerelease: false - name: Build Contracts + working-directory: "KitX Contracts" run: | - cd "KitX Contracts" - cd "KitX.Contract.CSharp" dotnet build -c Release cd ".." - cd ".." - - name: Build Dashboard + working-directory: "KitX Dashboard" run: | - cd "KitX Dashboard" dotnet build -c Release - cd ".." - name: Build Rules + working-directory: "KitX Rules" run: | - cd "KitX Rules" - cd "KitX.Web.Rules" dotnet build -c Release cd ".." - cd ".." - - name: Build File Format Helper + working-directory: "KitX File Format Helper" run: | - cd "KitX File Format Helper" - cd "KitX.KXP.Helper" dotnet build -c Release cd ".." - cd ".." - build-on-ubuntu: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 with: - submodules: 'true' + submodules: "true" - name: Setup .NET uses: actions/setup-dotnet@v2 with: - dotnet-version: '6.0.x' + dotnet-version: "6.0.x" include-prerelease: false - name: Build Contracts + working-directory: "KitX Contracts" run: | - cd "KitX Contracts" - cd "KitX.Contract.CSharp" dotnet build -c Release cd ".." - cd ".." - - name: Build Dashboard + working-directory: "KitX Dashboard" run: | - cd "KitX Dashboard" dotnet build -c Release - cd ".." - name: Build Rules + working-directory: "KitX Rules" run: | - cd "KitX Rules" - cd "KitX.Web.Rules" dotnet build -c Release cd ".." - cd ".." - - name: Build File Format Helper + working-directory: "KitX File Format Helper" run: | - cd "KitX File Format Helper" - cd "KitX.KXP.Helper" dotnet build -c Release cd ".." - cd ".." - build-on-macos: runs-on: macos-latest steps: - - uses: actions/checkout@v3 with: - submodules: 'true' + submodules: "true" - name: Setup .NET uses: actions/setup-dotnet@v2 with: - dotnet-version: '6.0.x' + dotnet-version: "6.0.x" include-prerelease: false - + - name: Build Contracts + working-directory: "KitX Contracts" run: | - cd "KitX Contracts" - cd "KitX.Contract.CSharp" dotnet build -c Release cd ".." - cd ".." - - name: Build Dashboard + working-directory: "KitX Dashboard" run: | - cd "KitX Dashboard" dotnet build -c Release - cd ".." - name: Build Rules + working-directory: "KitX Rules" run: | - cd "KitX Rules" - cd "KitX.Web.Rules" dotnet build -c Release cd ".." - cd ".." - - name: Build File Format Helper + working-directory: "KitX File Format Helper" run: | - cd "KitX File Format Helper" - cd "KitX.KXP.Helper" dotnet build -c Release cd ".." - - cd ".." - - diff --git a/KitX Contracts b/KitX Contracts index 6ccba1b9..b182bc2a 160000 --- a/KitX Contracts +++ b/KitX Contracts @@ -1 +1 @@ -Subproject commit 6ccba1b9e56d47c87d6e8356e809823bbc0ff940 +Subproject commit b182bc2aaa52ed980bbf750f22dd44c530f2f584 diff --git a/KitX Dashboard b/KitX Dashboard index d3b016ac..1219af70 160000 --- a/KitX Dashboard +++ b/KitX Dashboard @@ -1 +1 @@ -Subproject commit d3b016ac01c4d18c10cc88f7947eaad257f579c1 +Subproject commit 1219af705125a7dfb0c82dd3a6ee6b63a68de66a diff --git a/KitX Dashboard Helper b/KitX Dashboard Helper index a8d8f5a3..6e7499e6 160000 --- a/KitX Dashboard Helper +++ b/KitX Dashboard Helper @@ -1 +1 @@ -Subproject commit a8d8f5a342693ee2b79e20ab2d383a31aed498c7 +Subproject commit 6e7499e64dd4818eca41d3c3c15a7c26a1f8ebec diff --git a/KitX Docs b/KitX Docs index c385e54c..bfb2273d 160000 --- a/KitX Docs +++ b/KitX Docs @@ -1 +1 @@ -Subproject commit c385e54c0f482ec033aebc6589ede42cf99b5856 +Subproject commit bfb2273d68cdcb27520456a7cb2dd1489179692e diff --git a/KitX File Format Helper b/KitX File Format Helper index 1aa92dc8..82ce28dc 160000 --- a/KitX File Format Helper +++ b/KitX File Format Helper @@ -1 +1 @@ -Subproject commit 1aa92dc88cea1746697f72989bdeb18df7929c44 +Subproject commit 82ce28dc88577cdd88f4e8c90ebf1d0250bf5fe0 diff --git a/KitX Installer b/KitX Installer index 4c2417b7..dfa909cf 160000 --- a/KitX Installer +++ b/KitX Installer @@ -1 +1 @@ -Subproject commit 4c2417b7846fdbeba41c6d66e458ebca00100e62 +Subproject commit dfa909cfc3eb7618a34ad50633eb05d8639d2f43 diff --git a/KitX Loaders b/KitX Loaders index 2d9c25ff..5f37994b 160000 --- a/KitX Loaders +++ b/KitX Loaders @@ -1 +1 @@ -Subproject commit 2d9c25ff8d5cf8aceff03b1629bc0dc136faacd8 +Subproject commit 5f37994b114a760fc5e9ff2509339d3a486368de diff --git a/KitX Mobile b/KitX Mobile index dbd3a483..0fd3cc19 160000 --- a/KitX Mobile +++ b/KitX Mobile @@ -1 +1 @@ -Subproject commit dbd3a4834d3557e04c5a4a1d56710067c2e7745d +Subproject commit 0fd3cc19912bc8a92a3396955b840fba53511aee diff --git a/KitX Plugins b/KitX Plugins index 2be4f8ec..b64f86a3 160000 --- a/KitX Plugins +++ b/KitX Plugins @@ -1 +1 @@ -Subproject commit 2be4f8ec7121981606ca26b955a6538eed55ad5b +Subproject commit b64f86a3921c17f6d5d6b67d90c56262b67877ab diff --git a/KitX Rules b/KitX Rules index 70b8ca0f..50907936 160000 --- a/KitX Rules +++ b/KitX Rules @@ -1 +1 @@ -Subproject commit 70b8ca0f4d7cec320fa6cdff5632d00ea7433d76 +Subproject commit 50907936880a0c8d54f268b368d14772e5b50c03 diff --git a/KitX Script b/KitX Script index 58154707..75b066ae 160000 --- a/KitX Script +++ b/KitX Script @@ -1 +1 @@ -Subproject commit 58154707bd1e358e5ac7910df07b707946fb4362 +Subproject commit 75b066aeeca6f105c168e44dfaa4d1aabc2b34eb diff --git a/KitX Test b/KitX Test index 7a3da6f0..ee342364 160000 --- a/KitX Test +++ b/KitX Test @@ -1 +1 @@ -Subproject commit 7a3da6f069895c578e7c48cb08d1bdb27b217c52 +Subproject commit ee3423641dafcd90146136dcf421d565fe328f09 diff --git a/KitX Tools b/KitX Tools index 2669a656..cd258b34 160000 --- a/KitX Tools +++ b/KitX Tools @@ -1 +1 @@ -Subproject commit 2669a6569d1a3a7e5f21cba0bd83e927e86d05bc +Subproject commit cd258b34fea4a9ad9d027b963298184039f85618 diff --git a/KitX Website b/KitX Website index 1d66f420..b0732113 160000 --- a/KitX Website +++ b/KitX Website @@ -1 +1 @@ -Subproject commit 1d66f4206fcaf1d4b49e545c445b80aa85206a97 +Subproject commit b073211328c47b23c64d9d26c6b86a8a8b01b9d7 diff --git a/README.md b/README.md index 09d139f1..6942536e 100644 --- a/README.md +++ b/README.md @@ -97,17 +97,10 @@ # 文档总览 | Docs Preview -
-展开 | Expand - -| Languages | Docs | -|-----------|----------------------------------------------------------------------------------| -| zh-cn | [简体中文](https://github.com/Crequency/KitX-Docs/blob/main/zh-cn/README.md) | -| zh-cnt | [繁體中文](https://github.com/Crequency/KitX-Docs/blob/main/zh-cnt/README.md) | -| en-us | [English (US)](https://github.com/Crequency/KitX-Docs/blob/main/en-us/README.md) | -| ja-jp | [日本語](https://github.com/Crequency/KitX-Docs/blob/main/ja-jp/README.md) | - -
+| Languages | Docs | Link | +|-----------|-----------------------------------------------------------|-------------------------------------------| +| zh-cn | [简体中文](https://crequency.github.io/KitX-Docs/) | https://crequency.github.io/KitX-Docs/ | +| en-us | [English (US)](https://crequency.github.io/KitX-Docs/en/) | https://crequency.github.io/KitX-Docs/en/ | --- diff --git a/Reference/Common.Activity b/Reference/Common.Activity index d61078ed..958928c0 160000 --- a/Reference/Common.Activity +++ b/Reference/Common.Activity @@ -1 +1 @@ -Subproject commit d61078edee6a4553ba046dd22701804cdf50bf78 +Subproject commit 958928c051b4eda9ee367f5c52754098c5a60926 diff --git a/Reference/Common.BasicHelper b/Reference/Common.BasicHelper index d8a58269..5d276ed8 160000 --- a/Reference/Common.BasicHelper +++ b/Reference/Common.BasicHelper @@ -1 +1 @@ -Subproject commit d8a5826949566af3cd8291a5a5bfe3b5f6f58626 +Subproject commit 5d276ed832b08f4a3555e6bb9ea3e010809edfbb diff --git a/ToolKits/KitX.ToolKits.Publisher/Program.cs b/ToolKits/KitX.ToolKits.Publisher/Program.cs index 505724e8..8d4e2e96 100644 --- a/ToolKits/KitX.ToolKits.Publisher/Program.cs +++ b/ToolKits/KitX.ToolKits.Publisher/Program.cs @@ -5,6 +5,10 @@ Copyright (C) Crequency 2023 """); +var publishDir = Path.GetFullPath("../../KitX Publish"); +if (publishDir is not null && Directory.Exists(publishDir)) + Directory.Delete(publishDir, true); + var path = Path.GetFullPath("../../KitX Dashboard/"); var pro = "Properties/"; var pub = "PublishProfiles/"; diff --git a/ToolKits/start.ps1 b/ToolKits/start.ps1 index 12e70312..2059e524 100755 --- a/ToolKits/start.ps1 +++ b/ToolKits/start.ps1 @@ -15,26 +15,31 @@ if($type -eq "dashboard"){ git submodule update "KitX Dashboard" cd "KitX Dashboard" git checkout dev=main + git pull cd ".." git submodule update "KitX Dashboard Helper" cd "KitX Dashboard Helper" git checkout main + git pull cd ".." git submodule update "KitX File Format Helper" cd "KitX File Format Helper" git checkout main + git pull cd ".." git submodule update "KitX Rules" cd "KitX Rules" git checkout main + git pull cd ".." git submodule update "KitX Script" cd "KitX Script" git checkout main + git pull cd ".." echo "" @@ -48,6 +53,9 @@ if($type -eq "mobile"){ echo "executing ..." git submodule update "KitX Mobile" + cd "KitX Mobile" + git checkout main + git pull cd ".." } @@ -62,16 +70,19 @@ if($type -eq "loader"){ git submodule update "KitX Contracts" cd "KitX Contracts" git checkout main + git pull cd ".." git submodule update "KitX Loaders" cd "KitX Loaders" git checkout main + git pull cd ".." git submodule update "KitX Rules" cd "KitX Rules" git checkout main + git pull cd ".." } @@ -87,21 +98,25 @@ if($type -eq "plugin"){ git submodule update "KitX Contracts" cd "KitX Contracts" git checkout main + git pull cd ".." git submodule update "KitX Loaders" cd "KitX Loaders" git checkout main + git pull cd ".." git submodule update "KitX Plugins" cd "KitX Plugins" git checkout main + git pull cd ".." git submodule update "KitX Rules" cd "KitX Rules" git checkout main + git pull cd ".." } @@ -114,6 +129,7 @@ if($type -eq "installer"){ git submodule update "KitX Installer" cd "KitX Installer" git checkout main + git pull cd ".." } @@ -130,26 +146,31 @@ if($type -eq "reference"){ git submodule update "Reference/Common.Activity" cd "Reference/Common.Activity" git checkout main + git pull cd "../.." git submodule update "Reference/Common.Algorithm" cd "Reference/Common.Algorithm" git checkout dev=main + git pull cd "../.." git submodule update "Reference/Common.BasicHelper" cd "Reference/Common.BasicHelper" git checkout dev=main + git pull cd "../.." git submodule update "Reference/Common.ExternalConsole" cd "Reference/Common.ExternalConsole" git checkout dev=main + git pull cd "../.." git submodule update "Reference/Common.Update" cd "Reference/Common.Update" git checkout main + git pull cd "../.." } diff --git a/ToolKits/start.sh b/ToolKits/start.sh index 2fc07d4b..f91f9a92 100755 --- a/ToolKits/start.sh +++ b/ToolKits/start.sh @@ -15,26 +15,31 @@ then git submodule update "KitX Dashboard" cd "KitX Dashboard" git checkout dev=main + git pull cd ".." git submodule update "KitX Dashboard Helper" cd "KitX Dashboard Helper" git checkout main + git pull cd ".." git submodule update "KitX File Format Helper" cd "KitX File Format Helper" git checkout main + git pull cd ".." git submodule update "KitX Rules" cd "KitX Rules" git checkout main + git pull cd ".." git submodule update "KitX Script" cd "KitX Script" git checkout main + git pull cd ".." echo "" @@ -48,6 +53,9 @@ then echo "executing ..." git submodule update "KitX Mobile" + cd "KitX Mobile" + git checkout main + git pull cd ".." fi @@ -62,16 +70,19 @@ then git submodule update "KitX Contracts" cd "KitX Contracts" git checkout main + git pull cd ".." git submodule update "KitX Loaders" cd "KitX Loaders" git checkout main + git pull cd ".." git submodule update "KitX Rules" cd "KitX Rules" git checkout main + git pull cd ".." fi @@ -87,21 +98,25 @@ then git submodule update "KitX Contracts" cd "KitX Contracts" git checkout main + git pull cd ".." git submodule update "KitX Loaders" cd "KitX Loaders" git checkout main + git pull cd ".." git submodule update "KitX Plugins" cd "KitX Plugins" git checkout main + git pull cd ".." git submodule update "KitX Rules" cd "KitX Rules" git checkout main + git pull cd ".." fi @@ -114,6 +129,7 @@ then git submodule update "KitX Installer" cd "KitX Installer" git checkout main + git pull cd ".." fi @@ -130,26 +146,31 @@ then git submodule update "Reference/Common.Activity" cd "Reference/Common.Activity" git checkout main + git pull cd "../.." git submodule update "Reference/Common.Algorithm" cd "Reference/Common.Algorithm" git checkout dev=main + git pull cd "../.." git submodule update "Reference/Common.BasicHelper" cd "Reference/Common.BasicHelper" git checkout dev=main + git pull cd "../.." git submodule update "Reference/Common.ExternalConsole" cd "Reference/Common.ExternalConsole" git checkout dev=main + git pull cd "../.." git submodule update "Reference/Common.Update" cd "Reference/Common.Update" git checkout main + git pull cd "../.." fi