Skip to content

Commit

Permalink
Move photon plugin into component (#648)
Browse files Browse the repository at this point in the history
Split PhotonStateManager and PhotonPlugin components
  • Loading branch information
SapiensAnatis authored Feb 15, 2024
1 parent c17b7f4 commit f3e39b4
Show file tree
Hide file tree
Showing 88 changed files with 32 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
uses: ./.github/workflows/publish.yaml
with:
ref: ${{ github.ref_name }}
dockerfile: "DragaliaAPI/Dockerfile"
dockerfile: "DragaliaAPI/DragaliaAPI/Dockerfile"
image-name: "dragalia-api"
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/publish-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
args:
[
{
dockerfile: "DragaliaAPI/DragaliaAPI.Photon.StateManager/Dockerfile",
dockerfile: "PhotonStateManager/DragaliaAPI.Photon.StateManager/Dockerfile",
image: "photon-state-manager",
},
{ dockerfile: "DragaliaAPI/DragaliaAPI/Dockerfile", image: "dragalia-api" }
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-statemanager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
uses: ./.github/workflows/publish.yaml
with:
ref: ${{ github.ref_name }}
dockerfile: "DragaliaAPI.Photon.StateManager/Dockerfile"
dockerfile: "PhotonStateManager/DragaliaAPI.Photon.StateManager/Dockerfile"
image-name: "photon-state-manager"
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
"DragaliaAPI/DragaliaAPI.Integration.Test",
"DragaliaAPI/DragaliaAPI.Database.Test",
"DragaliaAPI/DragaliaAPI.Shared.Test",
"Photon/DragaliaAPI.Photon.StateManager.Test",
"PhotonStateManager/DragaliaAPI.Photon.StateManager.Test",
]

services:
Expand Down
33 changes: 24 additions & 9 deletions DragaliaAPI.sln
Original file line number Diff line number Diff line change
Expand Up @@ -46,28 +46,34 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "github", "github", "{1A23D4
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragaliaAPI.Test.Utils", "DragaliaAPI\DragaliaAPI.Test.Utils\DragaliaAPI.Test.Utils.csproj", "{41916B7C-6304-4504-99C0-B24D23982F7E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragaliaAPI.Photon.StateManager", "Photon\DragaliaAPI.Photon.StateManager\DragaliaAPI.Photon.StateManager.csproj", "{8E4D9C20-3914-4A8A-ACC0-22997F2947AB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragaliaAPI.Photon.StateManager", "PhotonStateManager\DragaliaAPI.Photon.StateManager\DragaliaAPI.Photon.StateManager.csproj", "{8E4D9C20-3914-4A8A-ACC0-22997F2947AB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragaliaAPI.Photon.Plugin", "Photon\DragaliaAPI.Photon.Plugin\DragaliaAPI.Photon.Plugin.csproj", "{D9AC51A5-38F6-4DD1-8839-9FE881396A6B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragaliaAPI.Photon.Plugin", "PhotonPlugin\DragaliaAPI.Photon.Plugin\DragaliaAPI.Photon.Plugin.csproj", "{D9AC51A5-38F6-4DD1-8839-9FE881396A6B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Photon", "Photon", "{8B4B2FE9-B1FC-44FC-BC49-0E277731A68A}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PhotonStateManager", "PhotonStateManager", "{8B4B2FE9-B1FC-44FC-BC49-0E277731A68A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragaliaAPI.Integration.Test", "DragaliaAPI\DragaliaAPI.Integration.Test\DragaliaAPI.Integration.Test.csproj", "{CA0AE7C5-2742-4FC9-B668-BC7459E4BCE5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragaliaAPI.Photon.Shared", "Photon\DragaliaAPI.Photon.Shared\DragaliaAPI.Photon.Shared.csproj", "{7394DCE5-7E1B-44C7-B3CA-735885D97695}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragaliaAPI.Photon.Shared", "Shared\DragaliaAPI.Photon.Shared\DragaliaAPI.Photon.Shared.csproj", "{7394DCE5-7E1B-44C7-B3CA-735885D97695}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragaliaAPI.Photon.StateManager.Test", "Photon\DragaliaAPI.Photon.StateManager.Test\DragaliaAPI.Photon.StateManager.Test.csproj", "{D940A00F-39CC-48C5-996E-DF0EC55FD140}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragaliaAPI.Photon.StateManager.Test", "PhotonStateManager\DragaliaAPI.Photon.StateManager.Test\DragaliaAPI.Photon.StateManager.Test.csproj", "{D940A00F-39CC-48C5-996E-DF0EC55FD140}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".husky", ".husky", "{7D333F35-F74C-4A63-AB6E-5F0EE4590ADB}"
ProjectSection(SolutionItems) = preProject
.husky\pre-commit = .husky\pre-commit
.husky\task-runner.json = .husky\task-runner.json
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragaliaAPI.Photon.Plugin.Test", "Photon\DragaliaAPI.Photon.Plugin.Test\DragaliaAPI.Photon.Plugin.Test.csproj", "{64D07506-1978-4981-AF90-B73C4B6AFCE5}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragaliaAPI.Photon.Plugin.Test", "PhotonPlugin\DragaliaAPI.Photon.Plugin.Test\DragaliaAPI.Photon.Plugin.Test.csproj", "{64D07506-1978-4981-AF90-B73C4B6AFCE5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragaliaAPI.MissionDesigner", "DragaliaAPI\DragaliaAPI.MissionDesigner\DragaliaAPI.MissionDesigner.csproj", "{00908D51-DB79-4A9C-AFBF-501F9981E6F1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{F6545B66-0303-4E4C-B872-7E89091885A8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PhotonPlugin", "PhotonPlugin", "{5A97773C-C23E-4CFE-8B1F-15D8244D2134}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DragaliaAPI", "DragaliaAPI", "{F0C76530-C14A-4601-829B-EE0F4C7E24E6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -141,11 +147,20 @@ Global
GlobalSection(NestedProjects) = preSolution
{1A23D473-87C4-40FB-8DF0-43F4B0FE7414} = {BC72B633-A158-4169-9B47-3CB9C689A57E}
{8E4D9C20-3914-4A8A-ACC0-22997F2947AB} = {8B4B2FE9-B1FC-44FC-BC49-0E277731A68A}
{D9AC51A5-38F6-4DD1-8839-9FE881396A6B} = {8B4B2FE9-B1FC-44FC-BC49-0E277731A68A}
{7394DCE5-7E1B-44C7-B3CA-735885D97695} = {8B4B2FE9-B1FC-44FC-BC49-0E277731A68A}
{D940A00F-39CC-48C5-996E-DF0EC55FD140} = {8B4B2FE9-B1FC-44FC-BC49-0E277731A68A}
{7D333F35-F74C-4A63-AB6E-5F0EE4590ADB} = {BC72B633-A158-4169-9B47-3CB9C689A57E}
{64D07506-1978-4981-AF90-B73C4B6AFCE5} = {8B4B2FE9-B1FC-44FC-BC49-0E277731A68A}
{7394DCE5-7E1B-44C7-B3CA-735885D97695} = {F6545B66-0303-4E4C-B872-7E89091885A8}
{D9AC51A5-38F6-4DD1-8839-9FE881396A6B} = {5A97773C-C23E-4CFE-8B1F-15D8244D2134}
{64D07506-1978-4981-AF90-B73C4B6AFCE5} = {5A97773C-C23E-4CFE-8B1F-15D8244D2134}
{161BE542-C5B4-441D-BEA1-5F3553BFD839} = {F0C76530-C14A-4601-829B-EE0F4C7E24E6}
{3B1A86CE-A656-453B-BC3F-EA42DF9E3FC6} = {F0C76530-C14A-4601-829B-EE0F4C7E24E6}
{BF6A04DC-56FE-491F-A73B-F54A3E7BAA4B} = {F0C76530-C14A-4601-829B-EE0F4C7E24E6}
{CA0AE7C5-2742-4FC9-B668-BC7459E4BCE5} = {F0C76530-C14A-4601-829B-EE0F4C7E24E6}
{00908D51-DB79-4A9C-AFBF-501F9981E6F1} = {F0C76530-C14A-4601-829B-EE0F4C7E24E6}
{A8051BCA-7E23-417C-986A-943DE4F81E1B} = {F0C76530-C14A-4601-829B-EE0F4C7E24E6}
{283F16C6-1EB5-4062-90C6-663D975977FE} = {F0C76530-C14A-4601-829B-EE0F4C7E24E6}
{A1E6C76A-4D4F-427D-80AF-CF289CBBAF00} = {F0C76530-C14A-4601-829B-EE0F4C7E24E6}
{41916B7C-6304-4504-99C0-B24D23982F7E} = {F0C76530-C14A-4601-829B-EE0F4C7E24E6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D86831A9-C572-4B8D-BD12-EF0768BC9E4F}
Expand Down
2 changes: 1 addition & 1 deletion DragaliaAPI/DragaliaAPI.Shared/DragaliaAPI.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Photon\DragaliaAPI.Photon.Shared\DragaliaAPI.Photon.Shared.csproj"/>
<ProjectReference Include="..\..\Shared\DragaliaAPI.Photon.Shared\DragaliaAPI.Photon.Shared.csproj"/>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion DragaliaAPI/DragaliaAPI/DragaliaAPI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

<ItemGroup>
<ProjectReference Include="..\DragaliaAPI.Database\DragaliaAPI.Database.csproj" />
<ProjectReference Include="..\..\Photon\DragaliaAPI.Photon.Shared\DragaliaAPI.Photon.Shared.csproj" />
<ProjectReference Include="..\..\Shared\DragaliaAPI.Photon.Shared\DragaliaAPI.Photon.Shared.csproj" />
<ProjectReference Include="..\DragaliaAPI.Shared\DragaliaAPI.Shared.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DragaliaAPI.Photon.Shared\DragaliaAPI.Photon.Shared.csproj" />
<ProjectReference Include="..\..\Shared\DragaliaAPI.Photon.Shared\DragaliaAPI.Photon.Shared.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DragaliaAPI.Photon.Shared\DragaliaAPI.Photon.Shared.csproj"/>
<ProjectReference Include="..\..\Shared\DragaliaAPI.Photon.Shared\DragaliaAPI.Photon.Shared.csproj"/>
</ItemGroup>

</Project>

0 comments on commit f3e39b4

Please sign in to comment.