Skip to content

Commit

Permalink
Restructure as a monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
ddaspit committed May 16, 2024
1 parent 7e95188 commit 82793de
Show file tree
Hide file tree
Showing 348 changed files with 8,782 additions and 8,770 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
dotnet-version: 6.0.x
- name: Pack
run: dotnet pack src/Serval.Grpc/Serval.Grpc.csproj -c Release -o artifacts
run: dotnet pack src/Serval/src/Serval.Grpc/Serval.Grpc.csproj -c Release -o artifacts
- name: Upload package
uses: actions/upload-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
dotnet-version: 6.0.x
- name: Pack
run: dotnet pack src/Serval.Client/Serval.Client.csproj -c Release -o artifacts
run: dotnet pack src/Serval/src/Serval.Client/Serval.Client.csproj -c Release -o artifacts
- name: Upload package
uses: actions/upload-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-data-access.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
dotnet-version: 6.0.x
- name: Pack
run: dotnet pack src/SIL.DataAccess/SIL.DataAccess.csproj -c Release -o artifacts
run: dotnet pack src/Serval/src/SIL.DataAccess/SIL.DataAccess.csproj -c Release -o artifacts
- name: Upload package
uses: actions/upload-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ lib/
.vs
appsettings.user.json
artifacts

*.zip
.db
8 changes: 4 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Serval.ApiServer/bin/Debug/net8.0/Serval.ApiServer.dll",
"program": "${workspaceFolder}/src/Serval/src/Serval.ApiServer/bin/Debug/net8.0/Serval.ApiServer.dll",
"args": [],
"cwd": "${workspaceFolder}/src/Serval.ApiServer",
"cwd": "${workspaceFolder}/src/Serval/src/Serval.ApiServer",
"stopAtEntry": false,
"console": "internalConsole",
"justMyCode": false,
Expand All @@ -48,9 +48,9 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/samples/EchoTranslationEngine/bin/Debug/net8.0/EchoTranslationEngine.dll",
"program": "${workspaceFolder}/src/Echo/src/EchoTranslationEngine/bin/Debug/net8.0/EchoTranslationEngine.dll",
"args": [],
"cwd": "${workspaceFolder}/samples/EchoTranslationEngine",
"cwd": "${workspaceFolder}/src/Echo/src/EchoTranslationEngine",
"stopAtEntry": false,
"console": "internalConsole",
"justMyCode": false,
Expand Down
109 changes: 61 additions & 48 deletions Serval.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,50 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.32126.317
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{31B4F5EB-E148-4A51-84B5-B90BB8F38AD3}"
ProjectSection(SolutionItems) = preProject
src\AssemblyInfo.props = src\AssemblyInfo.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{66246A1C-8D45-40FB-A660-C58577122CA7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C2CEC737-240C-4FE7-9BD4-B7548E8F5829}"
ProjectSection(SolutionItems) = preProject
.csharpierrc.yaml = .csharpierrc.yaml
.editorconfig = .editorconfig
.gitattributes = .gitattributes
.gitignore = .gitignore
src\AssemblyInfo.props = src\AssemblyInfo.props
README.md = README.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Grpc", "src\Serval.Grpc\Serval.Grpc.csproj", "{443D8A33-62F5-4FE0-A972-E32E280E15C8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Grpc", "src\Serval\src\Serval.Grpc\Serval.Grpc.csproj", "{443D8A33-62F5-4FE0-A972-E32E280E15C8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.ApiServer", "src\Serval.ApiServer\Serval.ApiServer.csproj", "{7FAE5F93-C1BA-4280-8086-7E6207FE335E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.ApiServer", "src\Serval\src\Serval.ApiServer\Serval.ApiServer.csproj", "{7FAE5F93-C1BA-4280-8086-7E6207FE335E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Client", "src\Serval.Client\Serval.Client.csproj", "{EF43AA91-4FA2-4F96-8EEB-C1D03943FD2B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Client", "src\Serval\src\Serval.Client\Serval.Client.csproj", "{EF43AA91-4FA2-4F96-8EEB-C1D03943FD2B}"
ProjectSection(ProjectDependencies) = postProject
{7FAE5F93-C1BA-4280-8086-7E6207FE335E} = {7FAE5F93-C1BA-4280-8086-7E6207FE335E}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.DataAccess", "src\SIL.DataAccess\SIL.DataAccess.csproj", "{C5F942A3-8534-43FD-A75C-0160624FD456}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Shared", "src\Serval.Shared\Serval.Shared.csproj", "{31106018-56D7-4E52-A438-8FD2E12D2D47}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.DataAccess", "src\DataAccess\src\SIL.DataAccess\SIL.DataAccess.csproj", "{C5F942A3-8534-43FD-A75C-0160624FD456}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Translation", "src\Serval.Translation\Serval.Translation.csproj", "{9ADE4727-79F3-4A7E-912A-5DBA7219DC4E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Shared", "src\Serval\src\Serval.Shared\Serval.Shared.csproj", "{31106018-56D7-4E52-A438-8FD2E12D2D47}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Webhooks", "src\Serval.Webhooks\Serval.Webhooks.csproj", "{B3BAEC3C-0E95-422A-A8CF-D91F9874985F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Translation", "src\Serval\src\Serval.Translation\Serval.Translation.csproj", "{9ADE4727-79F3-4A7E-912A-5DBA7219DC4E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Webhooks.Tests", "tests\Serval.Webhooks.Tests\Serval.Webhooks.Tests.csproj", "{8FC30758-37FC-4819-805D-8EFF3DEDF05F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Webhooks", "src\Serval\src\Serval.Webhooks\Serval.Webhooks.csproj", "{B3BAEC3C-0E95-422A-A8CF-D91F9874985F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Translation.Tests", "tests\Serval.Translation.Tests\Serval.Translation.Tests.csproj", "{539598C5-8634-4273-8714-A684622DDCFC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Webhooks.Tests", "src\Serval\test\Serval.Webhooks.Tests\Serval.Webhooks.Tests.csproj", "{8FC30758-37FC-4819-805D-8EFF3DEDF05F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.DataFiles", "src\Serval.DataFiles\Serval.DataFiles.csproj", "{4375A7BF-E3CE-4785-91E3-2ED6FCEB074F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Translation.Tests", "src\Serval\test\Serval.Translation.Tests\Serval.Translation.Tests.csproj", "{539598C5-8634-4273-8714-A684622DDCFC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{EBC89079-E3EB-4310-859F-25FF4FE3DEC1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.DataFiles", "src\Serval\src\Serval.DataFiles\Serval.DataFiles.csproj", "{4375A7BF-E3CE-4785-91E3-2ED6FCEB074F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EchoTranslationEngine", "samples\EchoTranslationEngine\EchoTranslationEngine.csproj", "{A9D08CA2-3CF7-4BB7-A47F-5A567FFDB2CC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.ApiServer.IntegrationTests", "src\Serval\test\Serval.ApiServer.IntegrationTests\Serval.ApiServer.IntegrationTests.csproj", "{0C3DF75B-B022-4EFC-882C-F276F1EC8435}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.ApiServer.IntegrationTests", "tests\Serval.ApiServer.IntegrationTests\Serval.ApiServer.IntegrationTests.csproj", "{0C3DF75B-B022-4EFC-882C-F276F1EC8435}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.E2ETests", "src\Serval\test\Serval.E2ETests\Serval.E2ETests.csproj", "{1F020042-D7B8-4541-9691-26ECFD1FFC73}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.E2ETests", "tests\Serval.E2ETests\Serval.E2ETests.csproj", "{1F020042-D7B8-4541-9691-26ECFD1FFC73}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.DataFiles.Tests", "src\Serval\test\Serval.DataFiles.Tests\Serval.DataFiles.Tests.csproj", "{63E4D71B-11BE-4D68-A876-5B1B5F0A4C88}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.DataFiles.Tests", "tests\Serval.DataFiles.Tests\Serval.DataFiles.Tests.csproj", "{63E4D71B-11BE-4D68-A876-5B1B5F0A4C88}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.DataAccess.Tests", "src\DataAccess\test\SIL.DataAccess.Tests\SIL.DataAccess.Tests.csproj", "{71151518-8774-44D0-8E69-D77FA447BEFA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.DataAccess.Tests", "tests\SIL.DataAccess.Tests\SIL.DataAccess.Tests.csproj", "{71151518-8774-44D0-8E69-D77FA447BEFA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Shared.Tests", "src\Serval\test\Serval.Shared.Tests\Serval.Shared.Tests.csproj", "{0E220C65-AA88-450E-AFB2-844E49060B3F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Shared.Tests", "tests\Serval.Shared.Tests\Serval.Shared.Tests.csproj", "{0E220C65-AA88-450E-AFB2-844E49060B3F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Assessment", "src\Serval.Assessment\Serval.Assessment.csproj", "{9BD2B817-300F-4E8B-83AD-450B11C82093}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Assessment", "src\Serval\src\Serval.Assessment\Serval.Assessment.csproj", "{9BD2B817-300F-4E8B-83AD-450B11C82093}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Aqua.Shared", "src\Aqua\src\Serval.Aqua.Shared\Serval.Aqua.Shared.csproj", "{A04C0C7B-BACA-4BE3-8E5A-02AF53BC0E6A}"
EndProject
Expand All @@ -68,6 +58,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Aqua.EngineServer",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Aqua.JobServer", "src\Aqua\src\Serval.Aqua.JobServer\Serval.Aqua.JobServer.csproj", "{D5CA4451-B638-475F-8843-38352B6D84D1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Echo", "Echo", "{58D776DD-72F3-4B58-B217-134815031B75}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E329EEB2-1C53-4789-89AE-3EE78B51F9DE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EchoTranslationEngine", "src\Echo\src\EchoTranslationEngine\EchoTranslationEngine.csproj", "{723D0076-014F-414B-AA73-C2DF9A974079}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serval", "Serval", "{FE931395-DBB2-4AAA-852F-F67883D1C1CF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C79B77B9-F4FE-404F-AB88-B7903EA17C6C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{82D8CDC1-1A2B-407E-A14C-DA4EBBC2F142}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataAccess", "DataAccess", "{1E85D1B6-10A3-4EB4-93CF-9B6D247956D5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BDE23FF7-1514-4B37-BFB1-B1A16FA4A505}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B0258FB5-5E75-4D97-AF5C-42DDF7C59237}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -114,10 +122,6 @@ Global
{4375A7BF-E3CE-4785-91E3-2ED6FCEB074F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4375A7BF-E3CE-4785-91E3-2ED6FCEB074F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4375A7BF-E3CE-4785-91E3-2ED6FCEB074F}.Release|Any CPU.Build.0 = Release|Any CPU
{A9D08CA2-3CF7-4BB7-A47F-5A567FFDB2CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A9D08CA2-3CF7-4BB7-A47F-5A567FFDB2CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A9D08CA2-3CF7-4BB7-A47F-5A567FFDB2CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A9D08CA2-3CF7-4BB7-A47F-5A567FFDB2CC}.Release|Any CPU.Build.0 = Release|Any CPU
{0C3DF75B-B022-4EFC-882C-F276F1EC8435}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0C3DF75B-B022-4EFC-882C-F276F1EC8435}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0C3DF75B-B022-4EFC-882C-F276F1EC8435}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -154,32 +158,41 @@ Global
{D5CA4451-B638-475F-8843-38352B6D84D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D5CA4451-B638-475F-8843-38352B6D84D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D5CA4451-B638-475F-8843-38352B6D84D1}.Release|Any CPU.Build.0 = Release|Any CPU
{723D0076-014F-414B-AA73-C2DF9A974079}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{723D0076-014F-414B-AA73-C2DF9A974079}.Debug|Any CPU.Build.0 = Debug|Any CPU
{723D0076-014F-414B-AA73-C2DF9A974079}.Release|Any CPU.ActiveCfg = Release|Any CPU
{723D0076-014F-414B-AA73-C2DF9A974079}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{443D8A33-62F5-4FE0-A972-E32E280E15C8} = {31B4F5EB-E148-4A51-84B5-B90BB8F38AD3}
{7FAE5F93-C1BA-4280-8086-7E6207FE335E} = {31B4F5EB-E148-4A51-84B5-B90BB8F38AD3}
{EF43AA91-4FA2-4F96-8EEB-C1D03943FD2B} = {31B4F5EB-E148-4A51-84B5-B90BB8F38AD3}
{C5F942A3-8534-43FD-A75C-0160624FD456} = {31B4F5EB-E148-4A51-84B5-B90BB8F38AD3}
{31106018-56D7-4E52-A438-8FD2E12D2D47} = {31B4F5EB-E148-4A51-84B5-B90BB8F38AD3}
{9ADE4727-79F3-4A7E-912A-5DBA7219DC4E} = {31B4F5EB-E148-4A51-84B5-B90BB8F38AD3}
{B3BAEC3C-0E95-422A-A8CF-D91F9874985F} = {31B4F5EB-E148-4A51-84B5-B90BB8F38AD3}
{8FC30758-37FC-4819-805D-8EFF3DEDF05F} = {66246A1C-8D45-40FB-A660-C58577122CA7}
{539598C5-8634-4273-8714-A684622DDCFC} = {66246A1C-8D45-40FB-A660-C58577122CA7}
{4375A7BF-E3CE-4785-91E3-2ED6FCEB074F} = {31B4F5EB-E148-4A51-84B5-B90BB8F38AD3}
{A9D08CA2-3CF7-4BB7-A47F-5A567FFDB2CC} = {EBC89079-E3EB-4310-859F-25FF4FE3DEC1}
{0C3DF75B-B022-4EFC-882C-F276F1EC8435} = {66246A1C-8D45-40FB-A660-C58577122CA7}
{1F020042-D7B8-4541-9691-26ECFD1FFC73} = {66246A1C-8D45-40FB-A660-C58577122CA7}
{63E4D71B-11BE-4D68-A876-5B1B5F0A4C88} = {66246A1C-8D45-40FB-A660-C58577122CA7}
{71151518-8774-44D0-8E69-D77FA447BEFA} = {66246A1C-8D45-40FB-A660-C58577122CA7}
{0E220C65-AA88-450E-AFB2-844E49060B3F} = {66246A1C-8D45-40FB-A660-C58577122CA7}
{9BD2B817-300F-4E8B-83AD-450B11C82093} = {31B4F5EB-E148-4A51-84B5-B90BB8F38AD3}
{443D8A33-62F5-4FE0-A972-E32E280E15C8} = {C79B77B9-F4FE-404F-AB88-B7903EA17C6C}
{7FAE5F93-C1BA-4280-8086-7E6207FE335E} = {C79B77B9-F4FE-404F-AB88-B7903EA17C6C}
{EF43AA91-4FA2-4F96-8EEB-C1D03943FD2B} = {C79B77B9-F4FE-404F-AB88-B7903EA17C6C}
{C5F942A3-8534-43FD-A75C-0160624FD456} = {BDE23FF7-1514-4B37-BFB1-B1A16FA4A505}
{31106018-56D7-4E52-A438-8FD2E12D2D47} = {C79B77B9-F4FE-404F-AB88-B7903EA17C6C}
{9ADE4727-79F3-4A7E-912A-5DBA7219DC4E} = {C79B77B9-F4FE-404F-AB88-B7903EA17C6C}
{B3BAEC3C-0E95-422A-A8CF-D91F9874985F} = {C79B77B9-F4FE-404F-AB88-B7903EA17C6C}
{8FC30758-37FC-4819-805D-8EFF3DEDF05F} = {82D8CDC1-1A2B-407E-A14C-DA4EBBC2F142}
{539598C5-8634-4273-8714-A684622DDCFC} = {82D8CDC1-1A2B-407E-A14C-DA4EBBC2F142}
{4375A7BF-E3CE-4785-91E3-2ED6FCEB074F} = {C79B77B9-F4FE-404F-AB88-B7903EA17C6C}
{0C3DF75B-B022-4EFC-882C-F276F1EC8435} = {82D8CDC1-1A2B-407E-A14C-DA4EBBC2F142}
{1F020042-D7B8-4541-9691-26ECFD1FFC73} = {82D8CDC1-1A2B-407E-A14C-DA4EBBC2F142}
{63E4D71B-11BE-4D68-A876-5B1B5F0A4C88} = {82D8CDC1-1A2B-407E-A14C-DA4EBBC2F142}
{71151518-8774-44D0-8E69-D77FA447BEFA} = {B0258FB5-5E75-4D97-AF5C-42DDF7C59237}
{0E220C65-AA88-450E-AFB2-844E49060B3F} = {82D8CDC1-1A2B-407E-A14C-DA4EBBC2F142}
{9BD2B817-300F-4E8B-83AD-450B11C82093} = {C79B77B9-F4FE-404F-AB88-B7903EA17C6C}
{A04C0C7B-BACA-4BE3-8E5A-02AF53BC0E6A} = {4113CEC0-D7D4-4F23-866F-A7A70A285343}
{4113CEC0-D7D4-4F23-866F-A7A70A285343} = {16B0A3F6-32CC-4465-8FFE-348AD3763A5C}
{E83674D8-4A8C-4357-9543-8639BFF171CA} = {4113CEC0-D7D4-4F23-866F-A7A70A285343}
{D5CA4451-B638-475F-8843-38352B6D84D1} = {4113CEC0-D7D4-4F23-866F-A7A70A285343}
{E329EEB2-1C53-4789-89AE-3EE78B51F9DE} = {58D776DD-72F3-4B58-B217-134815031B75}
{723D0076-014F-414B-AA73-C2DF9A974079} = {E329EEB2-1C53-4789-89AE-3EE78B51F9DE}
{C79B77B9-F4FE-404F-AB88-B7903EA17C6C} = {FE931395-DBB2-4AAA-852F-F67883D1C1CF}
{82D8CDC1-1A2B-407E-A14C-DA4EBBC2F142} = {FE931395-DBB2-4AAA-852F-F67883D1C1CF}
{BDE23FF7-1514-4B37-BFB1-B1A16FA4A505} = {1E85D1B6-10A3-4EB4-93CF-9B6D247956D5}
{B0258FB5-5E75-4D97-AF5C-42DDF7C59237} = {1E85D1B6-10A3-4EB4-93CF-9B6D247956D5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9F18C25E-E140-43C3-B177-D562E1628370}
Expand Down
4 changes: 2 additions & 2 deletions dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ COPY . ./
# Restore as distinct layers
RUN dotnet restore
# Build and publish a release
RUN dotnet publish ./src/Serval.ApiServer/Serval.ApiServer.csproj -c Release -o out_api_server
RUN dotnet publish ./samples/EchoTranslationEngine/EchoTranslationEngine.csproj -c Release -o out_echo_server
RUN dotnet publish ./src/Serval/src/Serval.ApiServer/Serval.ApiServer.csproj -c Release -o out_api_server
RUN dotnet publish ./src/Echo/src/EchoTranslationEngine/EchoTranslationEngine.csproj -c Release -o out_echo_server

# Build runtime image
FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy as production
Expand Down
22 changes: 0 additions & 22 deletions samples/EchoTranslationEngine/EchoTranslationEngine.csproj

This file was deleted.

4 changes: 2 additions & 2 deletions src/Aqua/src/Serval.Aqua.Shared/Serval.Aqua.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Serval.Grpc\Serval.Grpc.csproj" />
<ProjectReference Include="..\..\..\SIL.DataAccess\SIL.DataAccess.csproj" />
<ProjectReference Include="..\..\..\DataAccess\src\SIL.DataAccess\SIL.DataAccess.csproj" />
<ProjectReference Include="..\..\..\Serval\src\Serval.Grpc\Serval.Grpc.csproj" />
<ProjectReference Include="..\..\..\..\..\machine\src\SIL.Machine\SIL.Machine.csproj" Condition="Exists('..\..\..\..\..\machine\src\SIL.Machine\SIL.Machine.csproj')" />
</ItemGroup>

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<NoWarn>$(NoWarn);CS1591;CS1573</NoWarn>
</PropertyGroup>

<Import Project="../AssemblyInfo.props" />
<Import Project="../../../AssemblyInfo.props" />

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
Expand Down
File renamed without changes.
File renamed without changes.
22 changes: 22 additions & 0 deletions src/Echo/src/EchoTranslationEngine/EchoTranslationEngine.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);CS1591;CS1573</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" Version="2.52.0" />
<PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.52.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Serval\src\Serval.Grpc\Serval.Grpc.csproj" />
</ItemGroup>

</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<NoWarn>$(NoWarn);CS1591;CS1573</NoWarn>
</PropertyGroup>

<Import Project="../AssemblyInfo.props" />
<Import Project="../../../AssemblyInfo.props" />

<ItemGroup>
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="6.4.0" />
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<NoWarn>8618</NoWarn>
</PropertyGroup>

<Import Project="../AssemblyInfo.props" />
<Import Project="../../../AssemblyInfo.props" />

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 82793de

Please sign in to comment.