Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade packages #63

Merged
merged 7 commits into from
Dec 19, 2023
Merged
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
8 changes: 6 additions & 2 deletions .github/workflows/build_back-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core
- name: Setup .NET Core 8
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.302
dotnet-version: 8.0.100
- name: Setup .NET Core 7
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.404
- name: Install dependencies
run: dotnet restore
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_front-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
- name: npm install and build
run: |
npm install
npm run build -- --prod
npm run build -- --configuration production
working-directory: front-end
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not Angular 14 now?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes - we will update that in separate PR

* 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 front-end/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ speed-measure-plugin*.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
19 changes: 4 additions & 15 deletions front-end/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,19 +111,6 @@
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**", "**/app/models/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
Expand All @@ -138,6 +125,8 @@
}
}
}
},
"defaultProject": "yabt"
},
"cli": {
"analytics": false
}
}
Loading
Loading