Skip to content

Commit 63c2ef0

Browse files
mo-esmpmo-esmp
authored
Merge branch 'master' into dependabot/npm_and_yarn/src/Serilog.Ui.Web/tough-cookie-4.1.3
2 parents 2e558b9 + 7f410db commit 63c2ef0

File tree

85 files changed

+2210
-1009
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+2210
-1009
lines changed

‎.github/workflows/DotNET-build.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,28 @@ jobs:
3131
name: ubuntu-latest
3232
runs-on: ubuntu-latest
3333
steps:
34+
35+
- uses: actions/setup-java@v3
36+
with:
37+
distribution: 'temurin'
38+
java-version: '17'
3439
- uses: actions/checkout@v3
3540
with:
3641
fetch-depth: 0
37-
- name: Cache .nuke/temp, ~/.nuget/packages
42+
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
3843
uses: actions/cache@v3
3944
with:
4045
path: |
4146
.nuke/temp
4247
~/.nuget/packages
43-
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
44-
- name: Run './build.cmd Backend_SonarScan_End'
48+
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
49+
- name: 'Run: Backend_SonarScan_End'
4550
run: ./build.cmd Backend_SonarScan_End
4651
env:
4752
SonarToken: ${{ secrets.SONAR_TOKEN }}
4853
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4954

50-
- uses: actions/upload-artifact@v2
55+
- uses: actions/upload-artifact@v3
5156
if: always()
5257
with:
5358
name: test-results

‎.github/workflows/DotNET-reporting-on-build.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
jobs:
1212
upload:
1313
runs-on: ubuntu-latest
14-
if: github.event.workflow_run.conclusion == 'success'
1514
steps:
1615
- uses: phoenix-actions/test-reporting@v9
1716
with:

‎.github/workflows/JS-build.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,22 @@ jobs:
3131
name: ubuntu-latest
3232
runs-on: ubuntu-latest
3333
steps:
34+
35+
- uses: actions/setup-java@v3
36+
with:
37+
distribution: 'temurin'
38+
java-version: '17'
3439
- uses: actions/checkout@v3
3540
with:
3641
fetch-depth: 0
37-
- name: Cache .nuke/temp, ~/.nuget/packages
42+
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
3843
uses: actions/cache@v3
3944
with:
4045
path: |
4146
.nuke/temp
4247
~/.nuget/packages
43-
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
44-
- name: Run './build.cmd Frontend_Tests_Ci'
48+
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
49+
- name: 'Run: Frontend_Tests_Ci'
4550
run: ./build.cmd Frontend_Tests_Ci
4651
env:
4752
SonarTokenUi: ${{ secrets.SONAR_TOKEN_UI }}
@@ -63,7 +68,7 @@ jobs:
6368
-Dsonar.test.inclusions=src/Serilog.Ui.Web/assets/__tests__/**/*
6469
-Dsonar.javascript.lcov.reportPaths=./src/Serilog.Ui.Web/coverage/lcov.info
6570
66-
- uses: actions/upload-artifact@v2
71+
- uses: actions/upload-artifact@v3
6772
if: always()
6873
with:
6974
name: test-results

‎.github/workflows/JS-reporting-on-build.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
jobs:
1212
upload:
1313
runs-on: ubuntu-latest
14-
if: github.event.workflow_run.conclusion == 'success'
1514
steps:
1615
- uses: phoenix-actions/test-reporting@v9
1716
with:

‎.github/workflows/Release.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,22 @@ jobs:
4343
name: ubuntu-latest
4444
runs-on: ubuntu-latest
4545
steps:
46+
47+
- uses: actions/setup-java@v3
48+
with:
49+
distribution: 'temurin'
50+
java-version: '17'
4651
- uses: actions/checkout@v3
4752
with:
4853
fetch-depth: 0
49-
- name: Cache .nuke/temp, ~/.nuget/packages
54+
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
5055
uses: actions/cache@v3
5156
with:
5257
path: |
5358
.nuke/temp
5459
~/.nuget/packages
55-
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
56-
- name: Run './build.cmd Publish'
60+
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
61+
- name: 'Run: Publish'
5762
run: ./build.cmd Publish
5863
env:
5964
ElasticProvider: ${{ github.event.inputs.ElasticProvider }}

‎.nuke/build.schema.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"title": "Build Schema",
43
"$ref": "#/definitions/build",
4+
"title": "Build Schema",
55
"definitions": {
66
"build": {
77
"type": "object",
@@ -161,4 +161,4 @@
161161
}
162162
}
163163
}
164-
}
164+
}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void ConfigureServices(IServiceCollection services)
6060
}
6161
```
6262

63-
In the `Startup.Configure` method, enable the middleware to serve the log UI pagee.
63+
In the `Startup.Configure` method, enable the middleware to serve the log UI page.
6464
Note: call to the `UseSerilogUi` middleware must be placed **_after_** any Authentication and Authorization middleware, otherwise the authentication may not work:
6565

6666
```csharp

‎build/Build.Backend.Tests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
partial class Build : NukeBuild
99
{
10-
[PackageExecutable(
10+
[NuGetPackage(
1111
packageId: "dotnet-coverage",
1212
packageExecutable: "dotnet-coverage.dll"
1313
)]
@@ -31,6 +31,6 @@ partial class Build : NukeBuild
3131
.Executes(() =>
3232
{
3333
DotnetCoverage?.Invoke(
34-
@"collect -f xml -o ""coverage.xml"" dotnet test --configuration Release --no-build --logger=""trx;LogFileName=test-results.trx""");
34+
@"collect -f xml -o coverage.xml dotnet test --configuration Release --no-build --logger=""trx;LogFileName=test-results.trx""");
3535
});
36-
}
36+
}

‎build/Build.Backend.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@
22
using Nuke.Common.IO;
33
using Nuke.Common.Tools.DotNet;
44
using Nuke.Common.Utilities.Collections;
5-
using System.Diagnostics.CodeAnalysis;
6-
using static Nuke.Common.IO.FileSystemTasks;
7-
using static Nuke.Common.IO.PathConstruction;
85
using static Nuke.Common.Tools.DotNet.DotNetTasks;
96

107
partial class Build : NukeBuild
118
{
12-
[SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Not necessary")]
139
Target Backend_Clean => _ => _
1410
.Executes(() =>
1511
{
16-
SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
17-
TestsDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
12+
SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(AbsolutePathExtensions.DeleteDirectory);
13+
TestsDirectory.GlobDirectories("**/bin", "**/obj").ForEach(AbsolutePathExtensions.DeleteDirectory);
1814
DotNetClean();
1915
});
2016

‎build/Build.CI.GithubActions.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Nuke.Common;
22
using Nuke.Common.CI.GitHubActions;
33
using Nuke.Common.Tooling;
4-
using Nuke.Common.Tools.GitHub;
54
using Nuke.Common.Tools.SonarScanner;
65
using static CustomGithubActionsAttribute;
76

@@ -88,7 +87,7 @@ partial class Build : NukeBuild
8887
SonarScannerTasks.SonarScannerBegin(new SonarScannerBeginSettings()
8988
.SetExcludeTestProjects(true)
9089
.SetFramework("net5.0")
91-
.SetLogin(SonarToken)
90+
.SetAdditionalParameter("sonar.token", SonarToken) // replace deprecated .login
9291
.SetOrganization(SonarCloudInfo.Organization)
9392
.SetProjectKey(SonarCloudInfo.BackendProjectKey)
9493
.SetServer("https://sonarcloud.io")
@@ -99,7 +98,7 @@ partial class Build : NukeBuild
9998
"src/Serilog.Ui.Web/node_modules/**/*",
10099
"src/Serilog.Ui.Web/*.js",
101100
"src/Serilog.Ui.Web/*.json")
102-
.SetVisualStudioCoveragePaths("**/coverage.xml")
101+
.SetVisualStudioCoveragePaths("coverage.xml", "**/coverage.xml", "./**/coverage.xml")
103102
.SetProcessEnvironmentVariable("GITHUB_TOKEN", GitHubActions.Instance.Token)
104103
.SetProcessEnvironmentVariable("SONAR_TOKEN", SonarToken)
105104
);
@@ -115,7 +114,7 @@ partial class Build : NukeBuild
115114
{
116115
SonarScannerTasks.SonarScannerEnd(new SonarScannerEndSettings()
117116
.SetFramework("net5.0")
118-
.SetLogin(SonarToken)
117+
.SetProcessArgumentConfigurator(_ => _.Add("/d:sonar.token={value}", SonarToken, secret: true))
119118
.SetProcessEnvironmentVariable("GITHUB_TOKEN", GitHubActions.Instance.Token)
120119
.SetProcessEnvironmentVariable("SONAR_TOKEN", SonarToken));
121120
});
@@ -124,4 +123,4 @@ partial class Build : NukeBuild
124123
public readonly record struct ReleaseParams(string Key, string ShouldPublish, string Project)
125124
{
126125
public bool Publish() => ShouldPublish.Equals("true");
127-
}
126+
}

0 commit comments

Comments
 (0)