Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/ci-pr-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
- name: Check out source
uses: actions/checkout@v3
- name: Set up .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 10.0.x
- name: Set up Node.js
uses: actions/setup-node@v3
with:
Expand All @@ -38,5 +38,11 @@ jobs:
run: dotnet restore
- name: Build .NET solution
run: dotnet build --no-restore
- name: Install React dependencies
run: npm ci
working-directory: src/caretogether-pwa
- name: Install Playwright browsers
run: npx playwright install --with-deps
working-directory: src/caretogether-pwa
- name: Test .NET solution
run: dotnet test --no-build --verbosity normal
60 changes: 60 additions & 0 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Playwright Tests

on:
push:
branches: [main, master]
paths:
- "src/CareTogether.Api/**"
- "src/CareTogether.AppHost/**"
- "src/CareTogether.ServiceDefaults/**"
- "src/caretogether-pwa/**"
- "test/CareTogether.AppHost.Tests/**"
- ".github/workflows/playwright.yml"
pull_request:
branches: [main, master]
paths:
- "src/CareTogether.Api/**"
- "src/CareTogether.AppHost/**"
- "src/CareTogether.ServiceDefaults/**"
- "src/caretogether-pwa/**"
- "test/CareTogether.AppHost.Tests/**"
- ".github/workflows/playwright.yml"

jobs:
test:
timeout-minutes: 60
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: 10.0.x
- uses: actions/setup-node@v4
with:
node-version: 24.x
cache: npm
cache-dependency-path: src/caretogether-pwa/package-lock.json
- name: Install Azurite storage emulator
run: npm install -g azurite
- name: Start Azurite storage emulator
shell: bash
run: azurite &
- name: Restore .NET dependencies
run: dotnet restore
- name: Build .NET solution
run: dotnet build --no-restore
- name: Install dependencies
run: npm ci
working-directory: src/caretogether-pwa
- name: Install Playwright browsers
run: npx playwright install --with-deps
working-directory: src/caretogether-pwa
- name: Run Playwright tests
run: dotnet test test/CareTogether.AppHost.Tests/CareTogether.AppHost.Tests.csproj --no-build --verbosity normal
- uses: actions/upload-artifact@v4
if: ${{ !cancelled() }}
with:
name: playwright-report
path: src/caretogether-pwa/playwright-report/
retention-days: 30
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ Generated\ Files/
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# Playwright
test-results/
playwright-report/
playwright/.auth/

# NUnit
*.VisualState.xml
TestResult.xml
Expand Down
112 changes: 105 additions & 7 deletions CareTogetherCMS.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deploy", "deploy", "{B04053C5-CA17-41B1-BC52-8B5393090D45}"
ProjectSection(SolutionItems) = preProject
.github\workflows\cd-prod-dotnet.yml = .github\workflows\cd-prod-dotnet.yml
.github\workflows\cd-prod-react.yml = .github\workflows\cd-prod-react.yml
.github\workflows\ci-pr-dotnet.yml = .github\workflows\ci-pr-dotnet.yml
.github\workflows\ci-pr-react.yml = .github\workflows\ci-pr-react.yml
.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
EndProjectSection
EndProject
.github\workflows\cd-prod-dotnet.yml = .github\workflows\cd-prod-dotnet.yml
.github\workflows\cd-prod-react.yml = .github\workflows\cd-prod-react.yml
.github\workflows\ci-pr-dotnet.yml = .github\workflows\ci-pr-dotnet.yml
.github\workflows\ci-pr-react.yml = .github\workflows\ci-pr-react.yml
.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
.github\workflows\playwright.yml = .github\workflows\playwright.yml
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CareTogether.Api", "src\CareTogether.Api\CareTogether.Api.csproj", "{67F0E369-C927-4278-A7D0-DDFBE029003F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{465BA74E-CEF3-4608-8809-8C7A2E979DAC}"
Expand Down Expand Up @@ -60,36 +61,130 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Timelines", "src\Timelines\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Timelines.Test", "test\Timelines.Test\Timelines.Test.csproj", "{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CareTogether.AppHost", "src\CareTogether.AppHost\CareTogether.AppHost.csproj", "{7AB05778-70B4-4B95-BE67-D07802D0B57B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CareTogether.ServiceDefaults", "src\CareTogether.ServiceDefaults\CareTogether.ServiceDefaults.csproj", "{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CareTogether.AppHost.Tests", "test\CareTogether.AppHost.Tests\CareTogether.AppHost.Tests.csproj", "{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{67F0E369-C927-4278-A7D0-DDFBE029003F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{67F0E369-C927-4278-A7D0-DDFBE029003F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{67F0E369-C927-4278-A7D0-DDFBE029003F}.Debug|x64.ActiveCfg = Debug|Any CPU
{67F0E369-C927-4278-A7D0-DDFBE029003F}.Debug|x64.Build.0 = Debug|Any CPU
{67F0E369-C927-4278-A7D0-DDFBE029003F}.Debug|x86.ActiveCfg = Debug|Any CPU
{67F0E369-C927-4278-A7D0-DDFBE029003F}.Debug|x86.Build.0 = Debug|Any CPU
{67F0E369-C927-4278-A7D0-DDFBE029003F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{67F0E369-C927-4278-A7D0-DDFBE029003F}.Release|Any CPU.Build.0 = Release|Any CPU
{67F0E369-C927-4278-A7D0-DDFBE029003F}.Release|x64.ActiveCfg = Release|Any CPU
{67F0E369-C927-4278-A7D0-DDFBE029003F}.Release|x64.Build.0 = Release|Any CPU
{67F0E369-C927-4278-A7D0-DDFBE029003F}.Release|x86.ActiveCfg = Release|Any CPU
{67F0E369-C927-4278-A7D0-DDFBE029003F}.Release|x86.Build.0 = Release|Any CPU
{82B69D6F-DA25-452B-883D-71B9AE91DF23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{82B69D6F-DA25-452B-883D-71B9AE91DF23}.Debug|Any CPU.Build.0 = Debug|Any CPU
{82B69D6F-DA25-452B-883D-71B9AE91DF23}.Debug|x64.ActiveCfg = Debug|Any CPU
{82B69D6F-DA25-452B-883D-71B9AE91DF23}.Debug|x64.Build.0 = Debug|Any CPU
{82B69D6F-DA25-452B-883D-71B9AE91DF23}.Debug|x86.ActiveCfg = Debug|Any CPU
{82B69D6F-DA25-452B-883D-71B9AE91DF23}.Debug|x86.Build.0 = Debug|Any CPU
{82B69D6F-DA25-452B-883D-71B9AE91DF23}.Release|Any CPU.ActiveCfg = Release|Any CPU
{82B69D6F-DA25-452B-883D-71B9AE91DF23}.Release|Any CPU.Build.0 = Release|Any CPU
{82B69D6F-DA25-452B-883D-71B9AE91DF23}.Release|x64.ActiveCfg = Release|Any CPU
{82B69D6F-DA25-452B-883D-71B9AE91DF23}.Release|x64.Build.0 = Release|Any CPU
{82B69D6F-DA25-452B-883D-71B9AE91DF23}.Release|x86.ActiveCfg = Release|Any CPU
{82B69D6F-DA25-452B-883D-71B9AE91DF23}.Release|x86.Build.0 = Release|Any CPU
{B2CA1F10-216E-404E-A3C2-70423D5BCF5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B2CA1F10-216E-404E-A3C2-70423D5BCF5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B2CA1F10-216E-404E-A3C2-70423D5BCF5D}.Debug|x64.ActiveCfg = Debug|Any CPU
{B2CA1F10-216E-404E-A3C2-70423D5BCF5D}.Debug|x64.Build.0 = Debug|Any CPU
{B2CA1F10-216E-404E-A3C2-70423D5BCF5D}.Debug|x86.ActiveCfg = Debug|Any CPU
{B2CA1F10-216E-404E-A3C2-70423D5BCF5D}.Debug|x86.Build.0 = Debug|Any CPU
{B2CA1F10-216E-404E-A3C2-70423D5BCF5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B2CA1F10-216E-404E-A3C2-70423D5BCF5D}.Release|Any CPU.Build.0 = Release|Any CPU
{B2CA1F10-216E-404E-A3C2-70423D5BCF5D}.Release|x64.ActiveCfg = Release|Any CPU
{B2CA1F10-216E-404E-A3C2-70423D5BCF5D}.Release|x64.Build.0 = Release|Any CPU
{B2CA1F10-216E-404E-A3C2-70423D5BCF5D}.Release|x86.ActiveCfg = Release|Any CPU
{B2CA1F10-216E-404E-A3C2-70423D5BCF5D}.Release|x86.Build.0 = Release|Any CPU
{7DC7327F-6F01-4561-943D-D385FB5637E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DC7327F-6F01-4561-943D-D385FB5637E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DC7327F-6F01-4561-943D-D385FB5637E1}.Debug|x64.ActiveCfg = Debug|Any CPU
{7DC7327F-6F01-4561-943D-D385FB5637E1}.Debug|x64.Build.0 = Debug|Any CPU
{7DC7327F-6F01-4561-943D-D385FB5637E1}.Debug|x86.ActiveCfg = Debug|Any CPU
{7DC7327F-6F01-4561-943D-D385FB5637E1}.Debug|x86.Build.0 = Debug|Any CPU
{7DC7327F-6F01-4561-943D-D385FB5637E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DC7327F-6F01-4561-943D-D385FB5637E1}.Release|Any CPU.Build.0 = Release|Any CPU
{7DC7327F-6F01-4561-943D-D385FB5637E1}.Release|x64.ActiveCfg = Release|Any CPU
{7DC7327F-6F01-4561-943D-D385FB5637E1}.Release|x64.Build.0 = Release|Any CPU
{7DC7327F-6F01-4561-943D-D385FB5637E1}.Release|x86.ActiveCfg = Release|Any CPU
{7DC7327F-6F01-4561-943D-D385FB5637E1}.Release|x86.Build.0 = Release|Any CPU
{97B1250A-5BD6-4C12-8D9B-63EEBAFB8DC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{97B1250A-5BD6-4C12-8D9B-63EEBAFB8DC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{97B1250A-5BD6-4C12-8D9B-63EEBAFB8DC9}.Debug|x64.ActiveCfg = Debug|Any CPU
{97B1250A-5BD6-4C12-8D9B-63EEBAFB8DC9}.Debug|x64.Build.0 = Debug|Any CPU
{97B1250A-5BD6-4C12-8D9B-63EEBAFB8DC9}.Debug|x86.ActiveCfg = Debug|Any CPU
{97B1250A-5BD6-4C12-8D9B-63EEBAFB8DC9}.Debug|x86.Build.0 = Debug|Any CPU
{97B1250A-5BD6-4C12-8D9B-63EEBAFB8DC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{97B1250A-5BD6-4C12-8D9B-63EEBAFB8DC9}.Release|Any CPU.Build.0 = Release|Any CPU
{97B1250A-5BD6-4C12-8D9B-63EEBAFB8DC9}.Release|x64.ActiveCfg = Release|Any CPU
{97B1250A-5BD6-4C12-8D9B-63EEBAFB8DC9}.Release|x64.Build.0 = Release|Any CPU
{97B1250A-5BD6-4C12-8D9B-63EEBAFB8DC9}.Release|x86.ActiveCfg = Release|Any CPU
{97B1250A-5BD6-4C12-8D9B-63EEBAFB8DC9}.Release|x86.Build.0 = Release|Any CPU
{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA}.Debug|x64.ActiveCfg = Debug|Any CPU
{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA}.Debug|x64.Build.0 = Debug|Any CPU
{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA}.Debug|x86.ActiveCfg = Debug|Any CPU
{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA}.Debug|x86.Build.0 = Debug|Any CPU
{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA}.Release|Any CPU.Build.0 = Release|Any CPU
{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA}.Release|x64.ActiveCfg = Release|Any CPU
{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA}.Release|x64.Build.0 = Release|Any CPU
{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA}.Release|x86.ActiveCfg = Release|Any CPU
{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA}.Release|x86.Build.0 = Release|Any CPU
{7AB05778-70B4-4B95-BE67-D07802D0B57B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7AB05778-70B4-4B95-BE67-D07802D0B57B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7AB05778-70B4-4B95-BE67-D07802D0B57B}.Debug|x64.ActiveCfg = Debug|Any CPU
{7AB05778-70B4-4B95-BE67-D07802D0B57B}.Debug|x64.Build.0 = Debug|Any CPU
{7AB05778-70B4-4B95-BE67-D07802D0B57B}.Debug|x86.ActiveCfg = Debug|Any CPU
{7AB05778-70B4-4B95-BE67-D07802D0B57B}.Debug|x86.Build.0 = Debug|Any CPU
{7AB05778-70B4-4B95-BE67-D07802D0B57B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7AB05778-70B4-4B95-BE67-D07802D0B57B}.Release|Any CPU.Build.0 = Release|Any CPU
{7AB05778-70B4-4B95-BE67-D07802D0B57B}.Release|x64.ActiveCfg = Release|Any CPU
{7AB05778-70B4-4B95-BE67-D07802D0B57B}.Release|x64.Build.0 = Release|Any CPU
{7AB05778-70B4-4B95-BE67-D07802D0B57B}.Release|x86.ActiveCfg = Release|Any CPU
{7AB05778-70B4-4B95-BE67-D07802D0B57B}.Release|x86.Build.0 = Release|Any CPU
{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4}.Debug|x64.ActiveCfg = Debug|Any CPU
{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4}.Debug|x64.Build.0 = Debug|Any CPU
{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4}.Debug|x86.ActiveCfg = Debug|Any CPU
{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4}.Debug|x86.Build.0 = Debug|Any CPU
{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4}.Release|Any CPU.Build.0 = Release|Any CPU
{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4}.Release|x64.ActiveCfg = Release|Any CPU
{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4}.Release|x64.Build.0 = Release|Any CPU
{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4}.Release|x86.ActiveCfg = Release|Any CPU
{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4}.Release|x86.Build.0 = Release|Any CPU
{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220}.Debug|x64.ActiveCfg = Debug|Any CPU
{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220}.Debug|x64.Build.0 = Debug|Any CPU
{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220}.Debug|x86.ActiveCfg = Debug|Any CPU
{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220}.Debug|x86.Build.0 = Debug|Any CPU
{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220}.Release|Any CPU.Build.0 = Release|Any CPU
{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220}.Release|x64.ActiveCfg = Release|Any CPU
{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220}.Release|x64.Build.0 = Release|Any CPU
{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220}.Release|x86.ActiveCfg = Release|Any CPU
{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -105,6 +200,9 @@ Global
{7DC7327F-6F01-4561-943D-D385FB5637E1} = {42D43EAF-EE89-479A-B304-3B5DF56A3494}
{97B1250A-5BD6-4C12-8D9B-63EEBAFB8DC9} = {465BA74E-CEF3-4608-8809-8C7A2E979DAC}
{3C0F8F56-17BB-4BF7-8D59-51D8A5F635CA} = {42D43EAF-EE89-479A-B304-3B5DF56A3494}
{7AB05778-70B4-4B95-BE67-D07802D0B57B} = {465BA74E-CEF3-4608-8809-8C7A2E979DAC}
{3C6180D9-8BFB-45CE-AD0F-967EBDE7C0F4} = {465BA74E-CEF3-4608-8809-8C7A2E979DAC}
{E0AB6E03-C1C4-490F-A56A-8EE45C0C7220} = {42D43EAF-EE89-479A-B304-3B5DF56A3494}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E09CB79A-6E5B-4BAD-B356-64D949892A7E}
Expand Down
2 changes: 2 additions & 0 deletions mise.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[tools]
dotnet = "10"
10 changes: 5 additions & 5 deletions src/CareTogether.Api/CareTogether.Api.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<UserSecretsId>aspnet-CareTogether.Api-0706AF60-30BE-4CB4-868D-366CBB379CA7</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
Expand All @@ -21,8 +21,8 @@
<PackageReference Include="Microsoft.PowerBI.Api" Version="4.22.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NSwag.AspNetCore" Version="14.0.8" />
<PackageReference Include="NSwag.MSBuild" Version="14.0.8">
<PackageReference Include="NSwag.AspNetCore" Version="14.7.1" />
<PackageReference Include="NSwag.MSBuild" Version="14.7.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -38,8 +38,8 @@
</PropertyGroup>

<Target Name="NSwag" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Debug'">
<Exec WorkingDirectory="$(ProjectDir)" Command="$(NSwagExe_Net80) aspnetcore2openapi /NoBuild:true /Project:$(ProjectDir) /output:$(ProjectDir)..\..\swagger.json" EnvironmentVariables="ASPNETCORE_ENVIRONMENT=Development;OpenApiGen=true" />
<Exec WorkingDirectory="$(ProjectDir)" Command="$(NSwagExe_Net80) openapi2tsclient /Input:$(ProjectDir)..\..\swagger.json /output:$(ProjectDir)..\caretogether-pwa\src\GeneratedClient.ts" />
<Exec WorkingDirectory="$(ProjectDir)" Command="$(NSwagExe_Net100) aspnetcore2openapi /NoBuild:true /Project:$(ProjectDir) /output:$(ProjectDir)..\..\swagger.json" EnvironmentVariables="ASPNETCORE_ENVIRONMENT=Development;OpenApiGen=true" />
<Exec WorkingDirectory="$(ProjectDir)" Command="$(NSwagExe_Net100) openapi2tsclient /Input:$(ProjectDir)..\..\swagger.json /output:$(ProjectDir)..\caretogether-pwa\src\GeneratedClient.ts" />
</Target>

</Project>
6 changes: 3 additions & 3 deletions src/CareTogether.Api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
# More info at https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/docker/building-net-docker-images?view=aspnetcore-6.0

FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine-amd64 AS base
FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine-amd64 AS base
RUN apk add --no-cache tzdata
WORKDIR /app

FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine-amd64 AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine-amd64 AS build
WORKDIR /src
COPY ["src/CareTogether.Api/CareTogether.Api.csproj", "src/CareTogether.Api/"]
COPY ["test/CareTogether.TestData/CareTogether.TestData.csproj", "test/CareTogether.TestData/"]
Expand All @@ -22,4 +22,4 @@ RUN dotnet publish "CareTogether.Api.csproj" -c Release -o /app/publish -r linux
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "CareTogether.Api.dll"]
ENTRYPOINT ["dotnet", "CareTogether.Api.dll"]
Loading