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

Update to .NET 8.0 #190

Merged
merged 4 commits into from
Jun 13, 2024
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
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "6.0.25",
"version": "8.0.6",
"commands": [
"dotnet-ef"
]
Expand All @@ -27,7 +27,7 @@
]
},
"coverlet.console": {
"version": "6.0.0",
"version": "6.0.2",
"commands": [
"coverlet"
]
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ jobs:
env:
AKTABOOK_ENVIRONMENT: Test
AKTABOOK_INTEGRATION_TEST_ENVIRONMENT: Test
BUS_HOST_PID_FILE: src/Aktabook.Bus/bin/Release/net6.0/aktabook-bus.pid
BUS_BIN_DIR: src/Aktabook.Bus/bin/Release/net8.0/
BUS_HOST_PID_FILE: src/Aktabook.Bus/bin/Release/net8.0/aktabook-bus.pid
BUS_LOGS_DIR: src/Aktabook.Bus/bin/Release/net8.0/Logs/
RequesterServiceBus__RabbitMQConnectionOptions__HostName: localhost
RequesterServiceBus__RabbitMQConnectionOptions__Password: ${{ secrets.RABBITMQ_INTEGRATION_TEST_PASSWORD }}
RequesterServiceBus__RabbitMQConnectionOptions__PortNumber: 5672
Expand Down Expand Up @@ -240,7 +242,7 @@ jobs:
--background
coverage_session
./Aktabook.Bus
working-directory: src/Aktabook.Bus/bin/Release/net6.0/
working-directory: ${{ env.BUS_BIN_DIR }}

- name: Wait for bus readiness check
env:
Expand Down Expand Up @@ -339,15 +341,15 @@ jobs:
with:
if-no-files-found: error
name: bus-logs
path: src/Aktabook.Bus/bin/Release/net6.0/Logs
path: ${{ env.BUS_LOGS_DIR }}

- name: Upload public API logs
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
if-no-files-found: error
name: public-api-logs
path: src/Aktabook.Bus/bin/Release/net6.0/Logs
path: ${{ env.BUS_LOGS_DIR }}

unit_test:
name: Unit test
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/dotnet-security-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ jobs:
with:
persist-credentials: false

- name: Set up .NET SDK
uses: actions/setup-dotnet@v4
with:
cache: true
cache-dependency-path: |-
src/**/packages.lock.json
test/**/packages.lock.json
global-json-file: global.json

- name: Install scanner
run: >-
dotnet tool install security-scan
Expand All @@ -64,6 +73,15 @@ jobs:
with:
persist-credentials: false

- name: Set up .NET SDK
uses: actions/setup-dotnet@v4
with:
cache: true
cache-dependency-path: |-
src/**/packages.lock.json
test/**/packages.lock.json
global-json-file: global.json

- name: Restores dependencies
env:
DOTNET_NUGET_SIGNATURE_VERIFICATION: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
name: Publish for Ubuntu
runs-on: ubuntu-latest
env:
AKTABOOK_DOTNET_FRAMWORK: net6.0
AKTABOOK_DOTNET_RUNTIME_TARGET: ubuntu.22.04-x64
AKTABOOK_DOTNET_FRAMWORK: net8.0
AKTABOOK_DOTNET_RUNTIME_TARGET: linux-x64
AKTABOOK_PUBLISH_PATH_ROOT: ${{ github.workspace }}/publish
DOTNET_CLI_TELEMETRY_OPTOUT: true
DOTNET_NUGET_SIGNATURE_VERIFICATION: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/resharper-inspectcode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ jobs:
mono:
solution: ./Aktabook.sln
telemetry-optout: True
tool-version: "2024.1.0-rc01"
tool-version: "2024.1.3"
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<AnalysisMode>All</AnalysisMode>
<EnablePackageValidation>true</EnablePackageValidation>
<RuntimeIdentifiers>osx-arm64;osx-x64;ubuntu.22.04-x64;win-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>linux-x64;osx;win-x64</RuntimeIdentifiers>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>CA1014</NoWarn>
</PropertyGroup>
Expand Down
11 changes: 0 additions & 11 deletions Directory.Packages.props

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ deactivate msgproc
The following is a partial list of standards, practices, software,
and ideas leveraged by this project:

- .NET 6.0
- .NET 8.0
- .NET OpenAPI analyzers
- .NET static analyzers
- .NET Tools
Expand Down Expand Up @@ -98,7 +98,7 @@ and ideas leveraged by this project:
## License

This software is released under an [MIT-style license](LICENSE).
Copyright © 2023 Omar Boukli-Hacene.
Copyright © 2024 Omar Boukli-Hacene.

SPDX license identifier: MIT.

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.417",
"version": "8.0.302",
"rollForward": "latestFeature",
"allowPrerelease": false
}
Expand Down
6 changes: 1 addition & 5 deletions src/Aktabook.Application/Aktabook.Application.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
Expand All @@ -12,10 +12,6 @@
<PackageReference Include="NServiceBus" Version="8.1.6"/>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Aktabook.Domain\Aktabook.Domain.csproj"/>
</ItemGroup>

<ItemGroup>
<Folder Include="Messages"/>
</ItemGroup>
Expand Down
Loading
Loading