Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
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
17 changes: 16 additions & 1 deletion .github/workflows/DotNET-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,22 @@ jobs:
ubuntu-latest:
name: ubuntu-latest
runs-on: ubuntu-latest

steps:
# temporary from here...
- name: Setup dotnet 6
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'
- name: Setup dotnet 7
uses: actions/setup-dotnet@v4
with:
dotnet-version: '7.0.x'
- name: Setup dotnet 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
# ...to here

- uses: actions/setup-java@v4
with:
Expand All @@ -52,7 +67,7 @@ jobs:
SonarToken: ${{ secrets.SONAR_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: test-results
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/JS-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:

- uses: actions/setup-java@v4
with:
distribution: 'temurin'
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@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: test-results
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,29 @@ 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
with:
distribution: 'temurin'
Expand Down
212 changes: 110 additions & 102 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
@@ -1,119 +1,68 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"properties": {
"Configuration": {
"type": "string",
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
"enum": [
"Debug",
"Release"
]
},
"ElasticProvider": {
"type": "string"
},
"MongoProvider": {
"type": "string"
},
"MsSqlProvider": {
"type": "string"
},
"MySqlProvider": {
"type": "string"
},
"NugetApiKey": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"PostgresProvider": {
"type": "string"
},
"Solution": {
"type": "string",
"description": "Path to a solution file that is automatically loaded"
},
"SonarToken": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"SonarTokenUi": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"Ui": {
"type": "string"
}
},
"$ref": "#/definitions/build",
"title": "Build Schema",
"definitions": {
"Host": {
"type": "string",
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"Rider",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI",
"VisualStudio",
"VSCode"
]
},
"ExecutableTarget": {
"type": "string",
"enum": [
"Backend_Clean",
"Backend_Compile",
"Backend_Report_Ci",
"Backend_Restore",
"Backend_SonarScan_End",
"Backend_SonarScan_Start",
"Backend_Test",
"Backend_Test_Ci",
"Clean",
"Frontend_Build",
"Frontend_Clean",
"Frontend_Restore",
"Frontend_Tests",
"Frontend_Tests_Ci",
"Pack",
"Publish"
]
},
"Verbosity": {
"type": "string",
"description": "",
"enum": [
"Verbose",
"Normal",
"Minimal",
"Quiet"
]
},
"NukeBuild": {
"build": {
"type": "object",
"properties": {
"Configuration": {
"type": "string",
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
"enum": [
"Debug",
"Release"
]
},
"Continue": {
"type": "boolean",
"description": "Indicates to continue a previously failed build attempt"
},
"ElasticProvider": {
"type": "string"
},
"Help": {
"type": "boolean",
"description": "Shows the help text for this build assembly"
},
"Host": {
"type": "string",
"description": "Host for execution. Default is 'automatic'",
"$ref": "#/definitions/Host"
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"Rider",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI",
"VisualStudio",
"VSCode"
]
},
"MongoProvider": {
"type": "string"
},
"MsSqlProvider": {
"type": "string"
},
"MySqlProvider": {
"type": "string"
},
"NoLogo": {
"type": "boolean",
"description": "Disables displaying the NUKE logo"
},
"NugetApiKey": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"Partition": {
"type": "string",
"description": "Partition to use on CI"
Expand All @@ -122,6 +71,9 @@
"type": "boolean",
"description": "Shows the execution plan (HTML)"
},
"PostgresProvider": {
"type": "string"
},
"Profile": {
"type": "array",
"description": "Defines the profiles to load",
Expand All @@ -137,22 +89,78 @@
"type": "array",
"description": "List of targets to be skipped. Empty list skips all dependencies",
"items": {
"$ref": "#/definitions/ExecutableTarget"
"type": "string",
"enum": [
"Backend_Clean",
"Backend_Compile",
"Backend_Report_Ci",
"Backend_Restore",
"Backend_SonarScan_End",
"Backend_SonarScan_Start",
"Backend_Test",
"Backend_Test_Ci",
"Clean",
"Frontend_Build",
"Frontend_Clean",
"Frontend_Restore",
"Frontend_Tests",
"Frontend_Tests_Ci",
"Pack",
"Publish"
]
}
},
"Solution": {
"type": "string",
"description": "Path to a solution file that is automatically loaded"
},
"SonarToken": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"SonarTokenUi": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"Target": {
"type": "array",
"description": "List of targets to be invoked. Default is '{default_target}'",
"items": {
"$ref": "#/definitions/ExecutableTarget"
"type": "string",
"enum": [
"Backend_Clean",
"Backend_Compile",
"Backend_Report_Ci",
"Backend_Restore",
"Backend_SonarScan_End",
"Backend_SonarScan_Start",
"Backend_Test",
"Backend_Test_Ci",
"Clean",
"Frontend_Build",
"Frontend_Clean",
"Frontend_Restore",
"Frontend_Tests",
"Frontend_Tests_Ci",
"Pack",
"Publish"
]
}
},
"Ui": {
"type": "string"
},
"Verbosity": {
"type": "string",
"description": "Logging verbosity during build execution. Default is 'Normal'",
"$ref": "#/definitions/Verbosity"
"enum": [
"Minimal",
"Normal",
"Quiet",
"Verbose"
]
}
}
}
},
"$ref": "#/definitions/NukeBuild"
}
}
2 changes: 1 addition & 1 deletion build/CustomGithubActionsAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public override void Write(CustomFileWriter writer)
{
writer.WriteLine(); // empty line to separate tasks

writer.WriteLine("- uses: actions/upload-artifact@v3");
writer.WriteLine("- uses: actions/upload-artifact@v4");

using (writer.Indent())
{
Expand Down
6 changes: 3 additions & 3 deletions build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</ItemGroup>

<ItemGroup>
<PackageDownload Include="dotnet-coverage" Version="[17.12.5]"/>
<PackageDownload Include="dotnet-reportgenerator-globaltool" Version="[5.3.10]"/>
<PackageDownload Include="dotnet-sonarscanner" Version="[8.0.3]" />
<PackageDownload Include="dotnet-coverage" Version="[17.14.2]"/>
<PackageDownload Include="dotnet-reportgenerator-globaltool" Version="[5.4.4]"/>
<PackageDownload Include="dotnet-sonarscanner" Version="[9.2.1]" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion samples/WebApi/WebApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<!-- Serilog UI packages -->
<ItemGroup>
<!-- comment/uncomment to directly reference Nuget release
<PackageReference Include="Serilog.UI" Version="3.1.0"/>
<PackageReference Include="Serilog.UI" Version="3.1.1"/>
<PackageReference Include="Serilog.UI.MsSqlServerProvider" Version="3.1.0"/>
<PackageReference Include="Serilog.UI.ElasticSearchProvider" Version="3.1.0"/>
-->
Expand Down
2 changes: 1 addition & 1 deletion samples/WebApp/WebApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<!-- Serilog UI packages -->
<ItemGroup>
<!-- comment/uncomment to directly reference Nuget release
<PackageReference Include="Serilog.UI" Version="3.1.0"/>
<PackageReference Include="Serilog.UI" Version="3.1.1"/>
<PackageReference Include="Serilog.UI.MongoDbProvider" Version="3.1.0"/>
-->

Expand Down
2 changes: 1 addition & 1 deletion src/Serilog.Ui.Web/Serilog.Ui.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PackageId>Serilog.UI</PackageId>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Version>3.1.0</Version>
<Version>3.1.1</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading
Loading