Skip to content

Commit

Permalink
Merge pull request #279 from Crequency/dev=main
Browse files Browse the repository at this point in the history
[Pull Request] New project structure
  • Loading branch information
Dynesshely committed Feb 28, 2024
2 parents 7a58da4 + adefacc commit 5dae325
Show file tree
Hide file tree
Showing 15 changed files with 93 additions and 188 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/build-loaders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@ jobs:
ref: dev=main
submodules: "true"

- name: Checkout KitX Standard
uses: actions/checkout@v4
with:
repository: "Crequency/KitX-Standard"
ref: "dev=main"
path: "KitX Standard"
submodules: "true"

- name: Checkout KitX SDK
uses: actions/checkout@v4
with:
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/build-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@ jobs:
ref: dev=main
submodules: "true"

- name: Checkout KitX Standard
uses: actions/checkout@v4
with:
repository: "Crequency/KitX-Standard"
ref: "dev=main"
path: "KitX Standard"
submodules: "true"

- name: Checkout KitX SDK
uses: actions/checkout@v4
with:
Expand Down
17 changes: 6 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,6 @@ jobs:
ref: dev=main
submodules: "true"

- name: Checkout KitX Standard
uses: actions/checkout@v4
with:
repository: "Crequency/KitX-Standard"
ref: "dev=main"
path: "KitX Standard"
submodules: "true"

- name: Checkout KitX SDK
uses: actions/checkout@v4
with:
Expand All @@ -59,16 +51,19 @@ jobs:
dotnet build -c Release
- name: Build Shared
working-directory: "KitX Standard/KitX.Shared"
working-directory: "KitX Standard/KitX Shared"
run: |
cd "KitX.Shared.CSharp"
dotnet build -c Release
- name: Build File Formats
working-directory: "KitX Standard/KitX.FileFormats"
working-directory: "KitX Standard/KitX File Formats"
run: |
cd "KitX.FileFormats.CSharp"
dotnet build -c Release
- name: Build Dashboard
working-directory: "KitX Clients/KitX Dashboard/KitX Dashboard"
working-directory: "KitX Clients/KitX Dashboard"
run: |
cd "KitX Dashboard"
dotnet build -c Release
24 changes: 24 additions & 0 deletions .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Mirror Repo

on:
push:
branches:
- "*"
workflow_dispatch:

jobs:
mirror-repo:
runs-on: ubuntu-latest

steps:
- name: Mirror
uses: Yikun/hub-mirror-action@master
with:
src: github/Crequency
dst: gitee/Crequency
dst_key: ${{ secrets.GITEE_SYNC_KEY }}
dst_token: ${{ secrets.GITEE_SYNC_TOKEN }}
account_type: org
static_list: "KitX"
force_update: true
debug: true
16 changes: 4 additions & 12 deletions .github/workflows/publish-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,6 @@ jobs:
ref: dev=main
submodules: "true"

- name: Checkout KitX Standard
uses: actions/checkout@v4
with:
repository: "Crequency/KitX-Standard"
ref: "dev=main"
path: "KitX Standard"
submodules: "true"

- name: Checkout KitX SDK
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -69,17 +61,17 @@ jobs:
nuget push ./bin/Release/*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} -NoSymbol
nuget push ./bin/Release/*.nupkg -Source github -SkipDuplicate
- name: Build and Publish `KitX.Shared`
working-directory: "KitX Standard/KitX.Shared"
- name: Build and Publish `KitX.Shared.CSharp`
working-directory: "KitX Standard/KitX Shared/KitX.Shared.CSharp"
if: contains(github.event.head_commit.message, '[KitX.Shared]') || contains(github.event.head_commit.message, '[All]')
run: |
dotnet build -c Release
nuget push ./bin/Release/*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} -NoSymbol
nuget push ./bin/Release/*.nupkg -Source github -SkipDuplicate
- name: Build and Publish `KitX.FileFormats`
working-directory: "KitX Standard/KitX.FileFormats"
- name: Build and Publish `KitX.FileFormats.CSharp`
working-directory: "KitX Standard/KitX File Formats/KitX.FileFormats.CSharp"
if: contains(github.event.head_commit.message, '[KitX.FileFormats]') || contains(github.event.head_commit.message, '[All]')
run: |
dotnet build -c Release
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
[submodule "KitX SDK"]
path = KitX SDK
url = [email protected]:Crequency/KitX-SDK.git
[submodule "Reference/Common.ExternalConsole"]
path = Reference/Common.ExternalConsole
url = [email protected]:Crequency/Common.ExternalConsole.git
[submodule "Reference/Common.BasicHelper"]
path = Reference/Common.BasicHelper
url = [email protected]:Crequency/Common.BasicHelper.git
Expand Down
2 changes: 1 addition & 1 deletion KitX Clients/KitX Dashboard
Submodule KitX Dashboard updated 89 files
+24 −0 .github/workflows/mirror.yml
+27 −12 KitX Dashboard/App.axaml.cs
+6 −7 KitX Dashboard/AppFramework.cs
+2 −4 KitX Dashboard/Configuration/AppConfig.cs
+4 −2 KitX Dashboard/Configuration/ConfigFetcher.cs
+1 −1 KitX Dashboard/Configuration/PluginsConfig.cs
+6 −2 KitX Dashboard/ConstantTable.cs
+1 −2 KitX Dashboard/Converters/ActivityStatusConverters.cs
+42 −0 KitX Dashboard/Converters/DeviceInfoConverters.cs
+0 −33 KitX Dashboard/Converters/OperatingSystem2Enum.cs
+66 −0 KitX Dashboard/Converters/OperatingSystemUtils.cs
+2 −1 KitX Dashboard/Converters/PluginInfoConverters.cs
+8 −7 KitX Dashboard/Generators/GreetingTextGenerator.cs
+0 −10 KitX Dashboard/Instances.cs
+4 −2 KitX Dashboard/KitX.Dashboard.csproj
+2 −2 KitX Dashboard/Managers/ActivityManager.cs
+3 −3 KitX Dashboard/Managers/AnouncementManager.cs
+0 −101 KitX Dashboard/Managers/CacheManager.cs
+4 −0 KitX Dashboard/Managers/ConfigManager.cs
+0 −355 KitX Dashboard/Managers/DevicesManager.cs
+8 −5 KitX Dashboard/Managers/PluginsManager.cs
+49 −14 KitX Dashboard/Managers/WebManager.cs
+15 −0 KitX Dashboard/Models/DeviceCase.cs
+0 −43 KitX Dashboard/Models/Network/WebManagerOperationInfo.cs
+0 −22 KitX Dashboard/Models/Plugin.cs
+22 −0 KitX Dashboard/Models/PluginInstallation.cs
+3 −8 KitX Dashboard/Names/PluginTagsNames.cs
+0 −249 KitX Dashboard/Network/DevicesClient.cs
+175 −146 KitX Dashboard/Network/DevicesNetwork/DevicesDiscoveryServer.cs
+263 −0 KitX Dashboard/Network/DevicesNetwork/DevicesOrganizer.cs
+127 −0 KitX Dashboard/Network/DevicesNetwork/DevicesServer.cs
+22 −0 KitX Dashboard/Network/DevicesNetwork/DevicesServerControllers/DeviceController.cs
+0 −273 KitX Dashboard/Network/DevicesServer.cs
+7 −5 KitX Dashboard/Network/NetworkHelper.cs
+10 −10 KitX Dashboard/Network/PluginsNetwork/PluginConnector.cs
+3 −3 KitX Dashboard/Network/PluginsNetwork/PluginsServer.cs
+1 −1 KitX Dashboard/Properties/PublishProfiles/linux-arm-single-cut.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/linux-arm-single.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/linux-arm64-single-cut.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/linux-arm64-single.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/linux-x64-runtime-relied.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/linux-x64-single-cut.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/linux-x64-single.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/linux-x64.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/osx-arm64-single.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/osx-x64-single-cut.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/osx-x64-single.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/win-arm-single.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/win-arm64-single.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/win-x64-runtime-relied.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/win-x64-single-cut.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/win-x64-single.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/win-x64.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/win-x86-single-cut.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/win-x86-single.pubxml
+1 −1 KitX Dashboard/Properties/PublishProfiles/win-x86.pubxml
+5 −5 KitX Dashboard/Services/EventService.cs
+8 −20 KitX Dashboard/ViewModels/AnouncementsWindowViewModel.cs
+6 −6 KitX Dashboard/ViewModels/AppViewModel.cs
+0 −129 KitX Dashboard/ViewModels/Pages/Controls/DeviceCardViewModel.cs
+3 −9 KitX Dashboard/ViewModels/Pages/Controls/Home_ActivityLogViewModel.cs
+34 −70 KitX Dashboard/ViewModels/Pages/Controls/Home_CountViewModel.cs
+1 −1 KitX Dashboard/ViewModels/Pages/Controls/Home_RecentUseViewModel.cs
+25 −30 KitX Dashboard/ViewModels/Pages/Controls/PluginBarViewModel.cs
+10 −20 KitX Dashboard/ViewModels/Pages/Controls/Settings_AboutViewModel.cs
+12 −18 KitX Dashboard/ViewModels/Pages/Controls/Settings_GeneralViewModel.cs
+73 −85 KitX Dashboard/ViewModels/Pages/Controls/Settings_PerformenceViewModel.cs
+16 −72 KitX Dashboard/ViewModels/Pages/Controls/Settings_PersonaliseViewModel.cs
+26 −57 KitX Dashboard/ViewModels/Pages/Controls/Settings_UpdateViewModel.cs
+18 −35 KitX Dashboard/ViewModels/Pages/DevicePageViewModel.cs
+7 −17 KitX Dashboard/ViewModels/Pages/HomePageViewModel.cs
+1 −1 KitX Dashboard/ViewModels/Pages/LibPageViewModel.cs
+12 −24 KitX Dashboard/ViewModels/Pages/RepoPageViewModel.cs
+7 −17 KitX Dashboard/ViewModels/Pages/SettingsPageViewModel.cs
+14 −14 KitX Dashboard/ViewModels/PluginDetailWindowViewModel.cs
+5 −5 KitX Dashboard/ViewModels/PluginsLaunchWindowViewModel.cs
+34 −31 KitX Dashboard/ViewModels/ViewModelBase.cs
+2 −1 KitX Dashboard/Views/AnouncementsWindow.axaml.cs
+2 −9 KitX Dashboard/Views/MainWindow.axaml.cs
+0 −81 KitX Dashboard/Views/Pages/Controls/DeviceCard.axaml
+0 −26 KitX Dashboard/Views/Pages/Controls/DeviceCard.axaml.cs
+2 −2 KitX Dashboard/Views/Pages/Controls/PluginBar.axaml.cs
+0 −45 KitX Dashboard/Views/Pages/Controls/Settings_Personalise.axaml
+82 −1 KitX Dashboard/Views/Pages/DevicePage.axaml
+3 −3 KitX Dashboard/Views/Pages/HomePage.axaml.cs
+2 −2 KitX Dashboard/Views/Pages/SettingsPage.axaml.cs
+0 −20 KitX Dashboard/Views/PluginDetailWindow.axaml
+1 −1 KitX Dashboard/Views/PluginDetailWindow.axaml.cs
+4 −4 KitX Dashboard/Views/ViewInstances.cs
2 changes: 1 addition & 1 deletion KitX Clients/KitX Installer
2 changes: 1 addition & 1 deletion KitX Clients/KitX Mobile
2 changes: 1 addition & 1 deletion KitX Clients/KitX Website
2 changes: 1 addition & 1 deletion KitX Docs
2 changes: 1 addition & 1 deletion KitX SDK
2 changes: 1 addition & 1 deletion KitX Standard
Submodule KitX Standard updated 137 files
Loading

0 comments on commit 5dae325

Please sign in to comment.