Skip to content

Commit

Permalink
Merge branch 'dependabot/nuget/Swashbuckle.AspNetCore-6.7.0' of https…
Browse files Browse the repository at this point in the history
…://github.com/DFE-Digital/get-into-teaching-api into dependabot/nuget/Swashbuckle.AspNetCore-6.7.0
  • Loading branch information
martyn-w committed Aug 12, 2024
2 parents 2120dfe + c6978a1 commit 2b71906
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: dotnet build --configuration Release --no-restore /warnaserror

- name: Spin Up Stack
run: docker-compose up -d
run: docker compose up -d

- name: Test
run: dotnet test --no-restore --verbosity normal
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
run: dotnet restore

- name: Spin Up Stack
run: docker-compose up -d
run: docker compose up -d

- name: SonarCloud
env:
Expand Down
6 changes: 3 additions & 3 deletions GetIntoTeachingApi/GetIntoTeachingApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.18">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.20">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down Expand Up @@ -61,11 +61,11 @@
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.20" />
<PackageReference Include="Hangfire.PostgreSql" Version="1.20.8" />
<PackageReference Include="Hangfire.PostgreSql" Version="1.20.9" />
<PackageReference Include="Microsoft.PowerPlatform.Dataverse.Client" Version="1.1.17" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.3" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.7" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion GetIntoTeachingApiTests/GetIntoTeachingApiTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="WireMock.Net" Version="1.5.53" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ When the client is configured to point to the API, we need to ensure it uses the

The API is an ASP.NET Core web application; to get up and running clone the repository and open `GetIntoTeachingApi.sln` in Visual Studio.

You will need to set up the environment before booting up the dependent services in Docker with `docker-compose up`.
You will need to set up the environment before booting up the dependent services in Docker with `docker compose up`.

When the application runs in development it will open the Swagger documentation by default (the development shared secret for the admin client is `secret-admin`).

Expand All @@ -101,13 +101,13 @@ Quick start steps:
- `az login`
- `make setup-local-env`
- Set properties of the created env.local to "Always copy"
- `docker-compose up`
- `docker compose up`
- Run the application in Visual Studio
- Open the Swagger UI at `/swagger/index/html` or view the job queue at `/hangfire`

### Building and testing locally

This project is known to run in Mono, Microsoft Visual Studio and JetBrains Rider, including on a macos platform. The project must be built for .NET version 7.0. When running locally, be sure to start the docker-compose container prior to running the project.
This project is known to run in Mono, Microsoft Visual Studio and JetBrains Rider, including on a macos platform. The project must be built for .NET version 7.0. When running locally, be sure to start the docker compose container prior to running the project.

Configure a local instance of the Get Into Teaching application to connect to a local instance of the API by setting the application's environment variables to match the API, e.g.

Expand Down

0 comments on commit 2b71906

Please sign in to comment.