From 65d3131def651a03dd46d35ec4d8d6de2be9bbc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 05:46:22 +0000 Subject: [PATCH 1/6] Bump Microsoft.EntityFrameworkCore.Tools from 7.0.18 to 7.0.20 Bumps [Microsoft.EntityFrameworkCore.Tools](https://github.com/dotnet/efcore) from 7.0.18 to 7.0.20. - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v7.0.18...v7.0.20) --- updated-dependencies: - dependency-name: Microsoft.EntityFrameworkCore.Tools dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- GetIntoTeachingApi/GetIntoTeachingApi.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GetIntoTeachingApi/GetIntoTeachingApi.csproj b/GetIntoTeachingApi/GetIntoTeachingApi.csproj index eb0caa0d5..30fe1bae7 100644 --- a/GetIntoTeachingApi/GetIntoTeachingApi.csproj +++ b/GetIntoTeachingApi/GetIntoTeachingApi.csproj @@ -24,7 +24,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 2bb14ad2f0641c3d53d179153504a32ca4f47c13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 05:49:16 +0000 Subject: [PATCH 2/6] Bump Hangfire.PostgreSql from 1.20.8 to 1.20.9 Bumps Hangfire.PostgreSql from 1.20.8 to 1.20.9. --- updated-dependencies: - dependency-name: Hangfire.PostgreSql dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- GetIntoTeachingApi/GetIntoTeachingApi.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GetIntoTeachingApi/GetIntoTeachingApi.csproj b/GetIntoTeachingApi/GetIntoTeachingApi.csproj index eb0caa0d5..495b9e54b 100644 --- a/GetIntoTeachingApi/GetIntoTeachingApi.csproj +++ b/GetIntoTeachingApi/GetIntoTeachingApi.csproj @@ -61,7 +61,7 @@ - + From 23d9173ec624919510adc52c988e822e0cf323f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 05:58:51 +0000 Subject: [PATCH 3/6] Bump xunit.runner.visualstudio from 2.8.0 to 2.8.2 Bumps xunit.runner.visualstudio from 2.8.0 to 2.8.2. --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- GetIntoTeachingApiTests/GetIntoTeachingApiTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GetIntoTeachingApiTests/GetIntoTeachingApiTests.csproj b/GetIntoTeachingApiTests/GetIntoTeachingApiTests.csproj index a6784f672..41013808c 100644 --- a/GetIntoTeachingApiTests/GetIntoTeachingApiTests.csproj +++ b/GetIntoTeachingApiTests/GetIntoTeachingApiTests.csproj @@ -32,7 +32,7 @@ - runtime; build; native; contentfiles; analyzers; buildtransitive + runtime; build; native; contentfiles; analyzers; buildtransitive all runtime; build; native; contentfiles; analyzers; buildtransitive From daba17ff7985d013daca00a1bf36141ed550fa9c Mon Sep 17 00:00:00 2001 From: Martyn Whitwell Date: Fri, 9 Aug 2024 15:17:53 +0100 Subject: [PATCH 4/6] update docker-compose to docker compose --- .github/workflows/pull_request.yml | 2 +- .github/workflows/sonarcloud.yml | 2 +- README.md | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 9e809153a..b3d24d441 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -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 diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index d72acc82b..3ca646c72 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -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: diff --git a/README.md b/README.md index e77352b72..bbe3481ae 100644 --- a/README.md +++ b/README.md @@ -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`). @@ -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. From 2bc251941e22c2983cabdf39b5fa664615f7213f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 08:21:30 +0000 Subject: [PATCH 5/6] Bump Microsoft.AspNetCore.DataProtection.StackExchangeRedis Bumps Microsoft.AspNetCore.DataProtection.StackExchangeRedis from 8.0.3 to 8.0.7. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.DataProtection.StackExchangeRedis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- GetIntoTeachingApi/GetIntoTeachingApi.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GetIntoTeachingApi/GetIntoTeachingApi.csproj b/GetIntoTeachingApi/GetIntoTeachingApi.csproj index dcaf2e093..7794bfc0c 100644 --- a/GetIntoTeachingApi/GetIntoTeachingApi.csproj +++ b/GetIntoTeachingApi/GetIntoTeachingApi.csproj @@ -65,7 +65,7 @@ - + From c6978a1cff8a8e47b64309669995ecb10a8d36ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 08:56:54 +0000 Subject: [PATCH 6/6] Bump Swashbuckle.AspNetCore from 6.5.0 to 6.7.0 Bumps [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 6.5.0 to 6.7.0. - [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases) - [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v6.5.0...v6.7.0) --- updated-dependencies: - dependency-name: Swashbuckle.AspNetCore dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- GetIntoTeachingApi/GetIntoTeachingApi.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GetIntoTeachingApi/GetIntoTeachingApi.csproj b/GetIntoTeachingApi/GetIntoTeachingApi.csproj index 7794bfc0c..d3b0e9976 100644 --- a/GetIntoTeachingApi/GetIntoTeachingApi.csproj +++ b/GetIntoTeachingApi/GetIntoTeachingApi.csproj @@ -39,7 +39,7 @@ - +