Skip to content
Open
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
19 changes: 9 additions & 10 deletions .github/workflows/DotNET-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,23 @@ jobs:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:

- uses: actions/setup-dotnet@v4
- uses: actions/setup-dotnet@v5
with:
dotnet-version: '6.0.x'
dotnet-version: '8.0.x'

- uses: actions/setup-dotnet@v4
- uses: actions/setup-dotnet@v5
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

- uses: actions/setup-java@v4
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '17'
- uses: actions/checkout@v4
java-version: '25'
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: |
.nuke/temp
Expand All @@ -60,7 +59,7 @@ jobs:
SonarToken: ${{ secrets.SONAR_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: always()
with:
name: test-results
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/DotNET-reporting-on-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
upload:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dorny/test-reporter@v2
- uses: actions/checkout@v6
- uses: dorny/test-reporter@v3
with:
artifact: test-results
name: DotNET - Tests
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/JS-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,15 @@ jobs:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:

- uses: actions/setup-java@v4
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '17'
- uses: actions/checkout@v4
java-version: '25'
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: |
.nuke/temp
Expand Down Expand Up @@ -68,7 +67,7 @@ jobs:
-Dsonar.test.inclusions=src/Serilog.Ui.Web/src/__tests__/**/*
-Dsonar.javascript.lcov.reportPaths=./src/Serilog.Ui.Web/src/reports/coverage/lcov.info

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: always()
with:
name: test-results
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/JS-reporting-on-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
report:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dorny/test-reporter@v2
- uses: actions/checkout@v6
- uses: dorny/test-reporter@v3
with:
artifact: test-results
name: JS - Tests
Expand Down
25 changes: 12 additions & 13 deletions .github/workflows/Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,39 +20,38 @@ on:
workflow_dispatch:
inputs:
ElasticProvider:
description: "Elastic Provider"
description: 'Elastic Provider'
required: true
MongoProvider:
description: "Mongo Provider"
description: 'Mongo Provider'
required: true
MsSqlProvider:
description: "Ms Sql Provider"
description: 'Ms Sql Provider'
required: true
MySqlProvider:
description: "My Sql Provider"
description: 'My Sql Provider'
required: true
PostgresProvider:
description: "Postgres Provider"
description: 'Postgres Provider'
required: true
Ui:
description: "Ui"
description: 'Ui'
required: true

jobs:
ubuntu-latest:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:

- uses: actions/setup-java@v4
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '17'
- uses: actions/checkout@v4
java-version: '25'
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: |
.nuke/temp
Expand All @@ -72,7 +71,7 @@ jobs:
NugetApiKey: ${{ secrets.NUGET_API_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- uses: dorny/test-reporter@v2
- uses: dorny/test-reporter@v3
if: always()
with:
name: DotNET - Tests
Expand All @@ -96,7 +95,7 @@ jobs:
-Dsonar.test.inclusions=src/Serilog.Ui.Web/src/__tests__/**/*
-Dsonar.javascript.lcov.reportPaths=./src/Serilog.Ui.Web/src/reports/coverage/lcov.info

- uses: dorny/test-reporter@v2
- uses: dorny/test-reporter@v3
if: always()
with:
name: JS - Tests
Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/code_quality.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .nuke/parameters.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"$schema": "./build.schema.json",
"Solution": "Serilog.Ui.sln"
"Solution": "Serilog.Ui.slnx"
}
8 changes: 2 additions & 6 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Ardalis.GuardClauses" Version="4.6.0"/>
<PackageReference Include="AsyncFixer" Version="1.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Tenekon.MSBuild.Packaging.ProjectBuildInPackage" Version="2.0.0">
<PackageReference Include="Ardalis.GuardClauses" Version="5.0.0"/>
<PackageReference Include="AsyncFixer" Version="2.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading
Loading