Skip to content

Commit

Permalink
Updated RavenDB client and .Net version
Browse files Browse the repository at this point in the history
  • Loading branch information
lukaszdobrzynski committed Dec 19, 2023
1 parent f9d4e2d commit 6b1f9df
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_back-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.302
dotnet-version: 8.0.100
- name: Install dependencies
run: dotnet restore
- name: Build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/db_migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.302
dotnet-version: 8.0.100

- name: Build
run: dotnet build tools/Database.Migration/Database.Migration.csproj --configuration Release

- name: Run migration
run: dotnet tools/Database.Migration/bin/Release/net6.0/Database.Migration.dll
run: dotnet tools/Database.Migration/bin/Release/net8.0/Database.Migration.dll
env:
Database__RavenDbUrls__0: ${{secrets.RavenDB_URL}}
Database__DbName: ${{secrets.RavenDB_DB_Name}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.302
dotnet-version: 8.0.100

- name: Build
run: dotnet build tools/Database.Migration/Database.Migration.csproj --configuration Release

- name: Run migration
run: dotnet tools/Database.Migration/bin/Release/net6.0/Database.Migration.dll
run: dotnet tools/Database.Migration/bin/Release/net8.0/Database.Migration.dll
env:
Database__RavenDbUrls__0: ${{secrets.RavenDB_URL}}
Database__DbName: ${{secrets.RavenDB_DB_Name}}
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<Features>strict</Features>
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
![Screenshot](./documentation/screenshot.png)

## Technologies
* ASP.NET Core 6
* RavenDB 5.3
* ASP.NET Core 8
* RavenDB 6.0.1
* Angular 12

It has minimum third-party dependencies and heaps of best practices.
Expand Down
4 changes: 2 additions & 2 deletions back-end/Database/Database.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="RavenDB.Client" Version="5.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="RavenDB.Client" Version="6.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion back-end/Domain/Domain.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="DomainResult.Common" Version="3.0.0" />
<PackageReference Include="RavenDB.Client" Version="5.4.1" />
<PackageReference Include="RavenDB.Client" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions back-end/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

## Technologies

- ASP .NET Core 6
- RavenDB 5.3
- ASP .NET Core 8
- RavenDB 6.0.1

It has minimum third-party dependencies and heaps of best practices like the [Domain Driven Design](https://en.wikipedia.org/wiki/Domain-driven_design) (DDD), [Command Query Responsibility Segregation](https://martinfowler.com/bliki/CQRS.html) (CQRS), etc.

Expand All @@ -28,8 +28,8 @@ Firstly, check out the GIT repo.

### Compile and run the tests

1. Install [.NET SDK](https://dotnet.microsoft.com/download) v6.x.<br>
Note that while the back-end would run on any version of .NET 6, the embedded _RavenDB_ used for the test project has a strong dependency on the _.NET SDK_ version. Check the required version in the [GitHub Action](../.github/workflows/dotnet-core.yml) used to run tests.
1. Install [.NET SDK](https://dotnet.microsoft.com/download) v8.x.<br>
Note that while the back-end would run on any version of .NET 8, the embedded _RavenDB_ used for the test project has a strong dependency on the _.NET SDK_ version. Check the required version in the [GitHub Action](../.github/workflows/dotnet-core.yml) used to run tests.

2. Open the solution and run the tests located under ['./tests'](../tests/) folder.<br>
The tests that work against a real embedded _RavenDB_ database and cover multiple scenarios.
Expand Down
4 changes: 2 additions & 2 deletions devops/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# See the list of tags at https://mcr.microsoft.com/v2/dotnet/sdk/tags/list
FROM mcr.microsoft.com/dotnet/sdk:6.0.302 as back-end-build
FROM mcr.microsoft.com/dotnet/sdk:8.0.100 as back-end-build

WORKDIR /build
COPY . /build
Expand All @@ -16,7 +16,7 @@ RUN npm install \
&& node_modules/.bin/ng build --prod

# See the list of tags at https://mcr.microsoft.com/v2/dotnet/aspnet/tags/list
FROM mcr.microsoft.com/dotnet/aspnet:6.0.7 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:8.0.0 AS runtime

COPY --from=back-end-build /publish /app
COPY --from=front-end-build /client/dist /app/wwwroot
Expand Down
1 change: 1 addition & 0 deletions tests/Domain.Tests/Domain.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

<ItemGroup>
<PackageReference Include="NSubstitute" Version="4.4.0" />
<PackageReference Update="RavenDB.TestDriver" Version="6.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Integration tests to ensure the expected behaviour around querying/filtering dat
## Technology
* xUnit, NSubstitute
* RavenDB.TestDriver
* .NET 6
* .NET 8

The tests that work against a real embedded _RavenDB_ database.

Expand Down
2 changes: 1 addition & 1 deletion tools/TicketImporter/TicketImporter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\back-end\Domain\Domain.csproj" />
Expand Down

0 comments on commit 6b1f9df

Please sign in to comment.