Skip to content

Commit a693fac

Browse files
GamerVII-NETGamer-VII
GamerVII-NET
and
Gamer-VII
authored
Update to v2025.3 (#131)
* Update unit test dependenties * Update submodule link Gml.Web.Api * Update submodule link Gml.Web.Client * Update submodule link Gml.Web.Proxy * Update submodule link Gml.Web.Skin.Service * Add empty line * Add volume for data * Update submodule link Gml.Web.Api * Update submodule link Gml.Web.Api * Update submodule link Gml.Web.Client * Update submodule link Gml.Web.Api * Refactor DTOs and domain models This commit deletes unused Data Transfer Objects (DTOs), domain classes, and related code across multiple namespaces. These removals aim to improve maintainability and reduce code clutter by retiring legacy or unnecessary components. * Update Dockerfile and solution file for new dependencies and project structure Modified Dockerfile to include additional .NET project dependencies and configure necessary installations (e.g., git). Updated Gml.Backend.sln to reflect the new project structure changes. These updates align the build setup with recent structural adjustments. * Update submodule link Gml.Web.Api * Update proxy configuration in Gml.Web.Proxy. * Update submodule link Gml.Web.Client * Update submodule link Gml.Web.Api * Update submodule link Gml.Web.Client * Update submodule link Gml.Web.Proxy * Update submodule link Gml.Web.Api * Update submodule link Gml.Web.Api * Update submodule link Gml.Web.Skin.Service * Update submodule link Gml.Web.Api * Update submodule link Gml.Web.Client --------- Co-authored-by: Terentev A. A. <terentev.a.a@recloud.tech>
1 parent 2983b59 commit a693fac

File tree

11 files changed

+44
-36
lines changed

11 files changed

+44
-36
lines changed

‎.run/Gml+Skins+Proxy.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@
4242
</rows>
4343
<method v="2" />
4444
</configuration>
45-
</component>
45+
</component>

‎Dockerfile‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
2-
USER $APP_UID
2+
USER root
33
WORKDIR /app
44
EXPOSE 8080
55
EXPOSE 8081
6+
RUN apt-get update && apt-get install -y git
7+
USER $APP_UID
68

79
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
810
ARG BUILD_CONFIGURATION=Release
911
WORKDIR /src
1012
COPY ["src/Gml.Web.Api/src/Gml.Web.Api/Gml.Web.Api.csproj", "src/Gml.Web.Api/src/Gml.Web.Api/"]
1113
COPY ["src/Gml.Web.Api/src/Gml.Core/src/Gml.Common/Gml.Common/Gml.Common.csproj", "src/Gml.Web.Api/src/Gml.Core/src/Gml.Common/Gml.Common/"]
12-
COPY ["src/Gml.Web.Api/src/Gml.Core/src/Gml.Core.Interfaces/Gml.Core.Interfaces.csproj", "src/Gml.Web.Api/src/Gml.Core/src/Gml.Core.Interfaces/"]
14+
COPY ["src/Gml.Web.Api/src/Gml.Core/src/Gml.Interfaces/Gml.Interfaces.csproj", "src/Gml.Web.Api/src/Gml.Core/src/Gml.Interfaces/"]
1315
COPY ["src/Gml.Web.Api/src/Gml.Core/src/Gml.Core/Gml.Core.csproj", "src/Gml.Web.Api/src/Gml.Core/src/Gml.Core/"]
1416
COPY ["src/Gml.Web.Api/src/Gml.Core/src/CmlLib.Core.Installer.Forge/CmlLib.Core.Installer.Forge/CmlLib.Core.Installer.Forge.csproj", "src/Gml.Web.Api/src/Gml.Core/src/CmlLib.Core.Installer.Forge/CmlLib.Core.Installer.Forge/"]
1517
COPY ["src/Gml.Web.Api/src/Gml.Core/src/CmlLib.ExtendedCore/src/CmlLib.Core.csproj", "src/Gml.Web.Api/src/Gml.Core/src/CmlLib.ExtendedCore/src/"]
1618
COPY ["src/Gml.Web.Api/src/Gml.Core/src/CmlLib.Core.Installer.NeoForge/CmlLib.Core.Installer.NeoForge/CmlLib.Core.Installer.NeoForge.csproj", "src/Gml.Web.Api/src/Gml.Core/src/CmlLib.Core.Installer.NeoForge/CmlLib.Core.Installer.NeoForge/"]
1719
COPY ["src/Gml.Web.Api/src/Gml.Core/src/Modrinth.Api/src/Modrinth.Api/Modrinth.Api.csproj", "src/Gml.Web.Api/src/Gml.Core/src/Modrinth.Api/src/Modrinth.Api/"]
20+
COPY ["src/Gml.Web.Api/src/Gml.Core/src/Modrinth.Api/src/Modrinth.Api.Domains/Modrinth.Api.Domains.csproj", "src/Gml.Web.Api/src/Gml.Core/src/Modrinth.Api/src/Modrinth.Api.Domains/"]
1821
COPY ["src/Gml.Web.Api/src/Gml.Core/src/Pingo/Pingo/Pingo.csproj", "src/Gml.Web.Api/src/Gml.Core/src/Pingo/Pingo/"]
19-
COPY ["src/Gml.Web.Api/src/Gml.Web.Api.Domains/Gml.Web.Api.Domains.csproj", "src/Gml.Web.Api/src/Gml.Web.Api.Domains/"]
20-
COPY ["src/Gml.Web.Api/src/Gml.Web.Api.Dto/Gml.Web.Api.Dto.csproj", "src/Gml.Web.Api/src/Gml.Web.Api.Dto/"]
21-
COPY ["src/Gml.Web.Api/src/plugins/Gml.Web.Api.EndpointSDK/Gml.Web.Api.EndpointSDK.csproj", "src/plugins/Gml.Web.Api/src/Gml.Web.Api.EndpointSDK/"]
22+
COPY ["src/Gml.Web.Api/src/Gml.Core/src/Gml.Domains/Gml.Domains.csproj", "src/Gml.Web.Api/src/Gml.Core/src/Gml.Domains/"]
23+
COPY ["src/Gml.Web.Api/src/Gml.Core/src/Gml.Dto/Gml.Dto.csproj", "src/Gml.Web.Api/src/Gml.Core/src/Gml.Dto/"]
24+
COPY ["src/Gml.Web.Api/src/plugins/Gml.Web.Api.EndpointSDK/Gml.Web.Api.EndpointSDK.csproj", "src/Gml.Web.Api/src/plugins/Gml.Web.Api.EndpointSDK/"]
2225
RUN dotnet restore "src/Gml.Web.Api/src/Gml.Web.Api/Gml.Web.Api.csproj"
2326
COPY . .
2427
WORKDIR "/src/src/Gml.Web.Api/src/Gml.Web.Api"

‎Gml.Backend.sln‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gml.Web.Api", "src\Gml.Web.
1616
EndProject
1717
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "domains", "domains", "{D6DE80A2-7856-4C10-A518-E9CF5BC10728}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gml.Web.Api.Domains", "src\Gml.Web.Api\src\Gml.Web.Api.Domains\Gml.Web.Api.Domains.csproj", "{DA7E93BC-B10F-433C-942E-0274E5AF4035}"
20-
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gml.Web.Api.Dto", "src\Gml.Web.Api\src\Gml.Web.Api.Dto\Gml.Web.Api.Dto.csproj", "{FF10341F-DCE5-4BA4-BEBE-C98711F1F08A}"
22-
EndProject
2319
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "submodules", "submodules", "{E2ED9D08-3137-4328-8544-CE413F2B73B8}"
2420
EndProject
2521
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gml.Core", "src\Gml.Web.Api\src\Gml.Core\src\Gml.Core\Gml.Core.csproj", "{4DAD3C4C-1B64-4EAA-96EF-1C60D145A743}"
2622
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gml.Core.Interfaces", "src\Gml.Web.Api\src\Gml.Core\src\Gml.Core.Interfaces\Gml.Core.Interfaces.csproj", "{130C2B3D-FD2F-4AAD-A89F-15F009A7B106}"
23+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gml.Interfaces", "src\Gml.Web.Api\src\Gml.Core\src\Gml.Interfaces\Gml.Interfaces.csproj", "{130C2B3D-FD2F-4AAD-A89F-15F009A7B106}"
2824
EndProject
2925
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "frontend", "frontend", "{56218D6F-5687-41CF-9D34-B76E0D1FB33B}"
3026
ProjectSection(SolutionItems) = preProject
@@ -49,6 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "backend", "backend", "{C8F5
4945
src\Gml.Web.Api\.gitignore = src\Gml.Web.Api\.gitignore
5046
docker-compose-external-debug.yml = docker-compose-external-debug.yml
5147
NuGet.config = NuGet.config
48+
src\Gml.Web.Api\Dockerfile = src\Gml.Web.Api\Dockerfile
5249
EndProjectSection
5350
EndProject
5451
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gml.Web.Skin.Service", "src\Gml.Web.Skin.Service\src\Gml.Web.Skin.Service\Gml.Web.Skin.Service.csproj", "{0ABC8234-6062-4EEE-81E4-D8051C14C4E6}"
@@ -94,6 +91,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gml.Web.Api.EndpointSDK", "
9491
EndProject
9592
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gml.Web.Proxy", "src\Gml.Web.Proxy\src\Gml.Web.Proxy\Gml.Web.Proxy.csproj", "{9A414B25-CCB8-4E2D-BEBA-B57C82266950}"
9693
EndProject
94+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gml.Domains", "src\Gml.Web.Api\src\Gml.Core\src\Gml.Domains\Gml.Domains.csproj", "{F5AFD6E3-7E94-4BF0-88B0-B564A36F5F43}"
95+
EndProject
96+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gml.Dto", "src\Gml.Web.Api\src\Gml.Core\src\Gml.Dto\Gml.Dto.csproj", "{3EEF8185-5231-4C8A-B7F5-A04FB6CF7D83}"
97+
EndProject
9798
Global
9899
GlobalSection(SolutionConfigurationPlatforms) = preSolution
99100
Debug|Any CPU = Debug|Any CPU
@@ -104,14 +105,6 @@ Global
104105
{B5994A47-B872-4E12-9A3B-26B60A711CFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
105106
{B5994A47-B872-4E12-9A3B-26B60A711CFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
106107
{B5994A47-B872-4E12-9A3B-26B60A711CFF}.Release|Any CPU.Build.0 = Release|Any CPU
107-
{DA7E93BC-B10F-433C-942E-0274E5AF4035}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
108-
{DA7E93BC-B10F-433C-942E-0274E5AF4035}.Debug|Any CPU.Build.0 = Debug|Any CPU
109-
{DA7E93BC-B10F-433C-942E-0274E5AF4035}.Release|Any CPU.ActiveCfg = Release|Any CPU
110-
{DA7E93BC-B10F-433C-942E-0274E5AF4035}.Release|Any CPU.Build.0 = Release|Any CPU
111-
{FF10341F-DCE5-4BA4-BEBE-C98711F1F08A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
112-
{FF10341F-DCE5-4BA4-BEBE-C98711F1F08A}.Debug|Any CPU.Build.0 = Debug|Any CPU
113-
{FF10341F-DCE5-4BA4-BEBE-C98711F1F08A}.Release|Any CPU.ActiveCfg = Release|Any CPU
114-
{FF10341F-DCE5-4BA4-BEBE-C98711F1F08A}.Release|Any CPU.Build.0 = Release|Any CPU
115108
{4DAD3C4C-1B64-4EAA-96EF-1C60D145A743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
116109
{4DAD3C4C-1B64-4EAA-96EF-1C60D145A743}.Debug|Any CPU.Build.0 = Debug|Any CPU
117110
{4DAD3C4C-1B64-4EAA-96EF-1C60D145A743}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -176,14 +169,20 @@ Global
176169
{9A414B25-CCB8-4E2D-BEBA-B57C82266950}.Debug|Any CPU.Build.0 = Debug|Any CPU
177170
{9A414B25-CCB8-4E2D-BEBA-B57C82266950}.Release|Any CPU.ActiveCfg = Release|Any CPU
178171
{9A414B25-CCB8-4E2D-BEBA-B57C82266950}.Release|Any CPU.Build.0 = Release|Any CPU
172+
{F5AFD6E3-7E94-4BF0-88B0-B564A36F5F43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
173+
{F5AFD6E3-7E94-4BF0-88B0-B564A36F5F43}.Debug|Any CPU.Build.0 = Debug|Any CPU
174+
{F5AFD6E3-7E94-4BF0-88B0-B564A36F5F43}.Release|Any CPU.ActiveCfg = Release|Any CPU
175+
{F5AFD6E3-7E94-4BF0-88B0-B564A36F5F43}.Release|Any CPU.Build.0 = Release|Any CPU
176+
{3EEF8185-5231-4C8A-B7F5-A04FB6CF7D83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
177+
{3EEF8185-5231-4C8A-B7F5-A04FB6CF7D83}.Debug|Any CPU.Build.0 = Debug|Any CPU
178+
{3EEF8185-5231-4C8A-B7F5-A04FB6CF7D83}.Release|Any CPU.ActiveCfg = Release|Any CPU
179+
{3EEF8185-5231-4C8A-B7F5-A04FB6CF7D83}.Release|Any CPU.Build.0 = Release|Any CPU
179180
EndGlobalSection
180181
GlobalSection(SolutionProperties) = preSolution
181182
HideSolutionNode = FALSE
182183
EndGlobalSection
183184
GlobalSection(NestedProjects) = preSolution
184185
{B5994A47-B872-4E12-9A3B-26B60A711CFF} = {173407F0-6602-48A5-BF49-E288C6043FE3}
185-
{DA7E93BC-B10F-433C-942E-0274E5AF4035} = {D6DE80A2-7856-4C10-A518-E9CF5BC10728}
186-
{FF10341F-DCE5-4BA4-BEBE-C98711F1F08A} = {D6DE80A2-7856-4C10-A518-E9CF5BC10728}
187186
{56218D6F-5687-41CF-9D34-B76E0D1FB33B} = {A2E6D9BD-8CCB-48FC-91B9-D935ED9188D5}
188187
{C8F55A92-E612-4AAE-9586-8E33D170A266} = {A2E6D9BD-8CCB-48FC-91B9-D935ED9188D5}
189188
{130C2B3D-FD2F-4AAD-A89F-15F009A7B106} = {D6DE80A2-7856-4C10-A518-E9CF5BC10728}
@@ -207,5 +206,7 @@ Global
207206
{3F58FC4F-5ED3-4B63-8657-B2DB76711F0F} = {D88B8B9C-307C-4A15-BCED-6AF8CD79B688}
208207
{9A414B25-CCB8-4E2D-BEBA-B57C82266950} = {173407F0-6602-48A5-BF49-E288C6043FE3}
209208
{0ABC8234-6062-4EEE-81E4-D8051C14C4E6} = {173407F0-6602-48A5-BF49-E288C6043FE3}
209+
{F5AFD6E3-7E94-4BF0-88B0-B564A36F5F43} = {D6DE80A2-7856-4C10-A518-E9CF5BC10728}
210+
{3EEF8185-5231-4C8A-B7F5-A04FB6CF7D83} = {D6DE80A2-7856-4C10-A518-E9CF5BC10728}
210211
EndGlobalSection
211212
EndGlobal

‎NuGet.config‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<configuration>
33
<packageSources>
44
<add key="Local"
5-
value="src\Gml.Web.Api\src\Gml.Core\src\Gml.Core.Interfaces\bin\Debug"/>
5+
value="src\Gml.Web.Api\src\Gml.Core\src\Gml.Interfaces\bin\Debug"/>
66
<add key="LocalDomains"
7-
value="src\Gml.Web.Api\src\Gml.Web.Api.Domains\bin\Debug"/>
7+
value="src\Gml.Web.Api\src\Gml.Domains\bin\Debug"/>
88
<add key="LocalDto"
9-
value="src\Gml.Web.Api\src\Gml.Web.Api.Dto\bin\Debug"/>
9+
value="src\Gml.Web.Api\src\Gml.Dto\bin\Debug"/>
10+
<add key="LocalWebSDK"
11+
value="src\Gml.Web.Api\src\plugins\Gml.Web.Api.EndpointSDK\bin\Debug"/>
1012
</packageSources>
1113
</configuration>

‎docker-compose.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ services:
1111
dockerfile: Dockerfile
1212
volumes:
1313
- ./data/GmlBackend:/root/${PROJECT_NAME}
14+
- gml-system-data:/app/database
1415
ports:
1516
- ":8082"
1617
environment:
@@ -80,6 +81,9 @@ services:
8081
volumes:
8182
- ./data/TextureService:/app/Storage
8283

84+
volumes:
85+
gml-system-data:
86+
8387
networks:
8488
gml-network:
8589
attachable: true

‎src/Gml.Web.Api‎

Submodule Gml.Web.Api updated 210 files

‎src/Gml.Web.Client‎

‎src/Gml.Web.Proxy‎

‎src/Gml.Web.Skin.Service‎

‎tests/Gml.Backend.Tests/Gml.Backend.Tests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<ProjectReference Include="..\..\src\Gml.Web.Api\src\Gml.Web.Api.Dto\Gml.Web.Api.Dto.csproj" />
3534
<ProjectReference Include="..\..\src\Gml.Web.Api\src\Gml.Web.Api\Gml.Web.Api.csproj" />
3635
</ItemGroup>
3736

0 commit comments

Comments
 (0)