From 5624405f37c4164e8a8839b360e1123e7e57b1ab Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 10 Dec 2023 02:28:09 +0000 Subject: [PATCH 1/4] fix: update packages --- .../Aguacongas.AspNetCore.Authentication.TestBase.csproj | 6 +++--- ...as.AspNetCore.Authentication.EntityFramework.Test.csproj | 2 +- ...Aguacongas.AspNetCore.Authentication.RavenDb.Test.csproj | 2 +- .../Aguacongas.AspNetCore.Authentication.Redis.Test.csproj | 2 +- .../Aguacongas.AspNetCore.Authentication.Test.csproj | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Aguacongas.AspNetCore.Authentication.TestBase/Aguacongas.AspNetCore.Authentication.TestBase.csproj b/src/Aguacongas.AspNetCore.Authentication.TestBase/Aguacongas.AspNetCore.Authentication.TestBase.csproj index 6c2d32a..79c984b 100644 --- a/src/Aguacongas.AspNetCore.Authentication.TestBase/Aguacongas.AspNetCore.Authentication.TestBase.csproj +++ b/src/Aguacongas.AspNetCore.Authentication.TestBase/Aguacongas.AspNetCore.Authentication.TestBase.csproj @@ -39,9 +39,9 @@ - - - + + + diff --git a/test/Aguacongas.AspNetCore.Authentication.EntityFramework.Test/Aguacongas.AspNetCore.Authentication.EntityFramework.Test.csproj b/test/Aguacongas.AspNetCore.Authentication.EntityFramework.Test/Aguacongas.AspNetCore.Authentication.EntityFramework.Test.csproj index 224dc61..246e8a4 100644 --- a/test/Aguacongas.AspNetCore.Authentication.EntityFramework.Test/Aguacongas.AspNetCore.Authentication.EntityFramework.Test.csproj +++ b/test/Aguacongas.AspNetCore.Authentication.EntityFramework.Test/Aguacongas.AspNetCore.Authentication.EntityFramework.Test.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/test/Aguacongas.AspNetCore.Authentication.RavenDb.Test/Aguacongas.AspNetCore.Authentication.RavenDb.Test.csproj b/test/Aguacongas.AspNetCore.Authentication.RavenDb.Test/Aguacongas.AspNetCore.Authentication.RavenDb.Test.csproj index 1e055cb..430e3c5 100644 --- a/test/Aguacongas.AspNetCore.Authentication.RavenDb.Test/Aguacongas.AspNetCore.Authentication.RavenDb.Test.csproj +++ b/test/Aguacongas.AspNetCore.Authentication.RavenDb.Test/Aguacongas.AspNetCore.Authentication.RavenDb.Test.csproj @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/test/Aguacongas.AspNetCore.Authentication.Redis.Test/Aguacongas.AspNetCore.Authentication.Redis.Test.csproj b/test/Aguacongas.AspNetCore.Authentication.Redis.Test/Aguacongas.AspNetCore.Authentication.Redis.Test.csproj index 98910bf..de9fd3d 100644 --- a/test/Aguacongas.AspNetCore.Authentication.Redis.Test/Aguacongas.AspNetCore.Authentication.Redis.Test.csproj +++ b/test/Aguacongas.AspNetCore.Authentication.Redis.Test/Aguacongas.AspNetCore.Authentication.Redis.Test.csproj @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/test/Aguacongas.AspNetCore.Authentication.Test/Aguacongas.AspNetCore.Authentication.Test.csproj b/test/Aguacongas.AspNetCore.Authentication.Test/Aguacongas.AspNetCore.Authentication.Test.csproj index 8f7c418..1dddfa5 100644 --- a/test/Aguacongas.AspNetCore.Authentication.Test/Aguacongas.AspNetCore.Authentication.Test.csproj +++ b/test/Aguacongas.AspNetCore.Authentication.Test/Aguacongas.AspNetCore.Authentication.Test.csproj @@ -15,8 +15,8 @@ - - + + all runtime; build; native; contentfiles; analyzers From bbc45df8c07bde15b3b120dd935095a2e36d8cb5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 10 Dec 2023 15:27:00 +0100 Subject: [PATCH 2/4] ci: update build.ps1 --- build.ps1 | 27 +++------------------------ coverletArgs.runsettings | 13 +++++++++++++ 2 files changed, 16 insertions(+), 24 deletions(-) create mode 100644 coverletArgs.runsettings diff --git a/build.ps1 b/build.ps1 index 6d63ec0..4c3d204 100644 --- a/build.ps1 +++ b/build.ps1 @@ -3,19 +3,7 @@ $result = 0 if ($isLinux) { dotnet build -c Release - Get-ChildItem -rec ` - | Where-Object { $_.Name -like "*.IntegrationTest.csproj" ` - -Or $_.Name -like "*.Test.csproj" ` - } ` - | ForEach-Object { - Set-Location $_.DirectoryName - - dotnet test -c Release --no-build - - if ($LASTEXITCODE -ne 0) { - $result = $LASTEXITCODE - } - } + dotnet test -c Release --no-build } else { $prNumber = $env:APPVEYOR_PULL_REQUEST_NUMBER if ($prNumber) { @@ -32,17 +20,8 @@ if ($isLinux) { dotnet build -c Release - Get-ChildItem -rec ` - | Where-Object { $_.Name -like "*.IntegrationTest.csproj" ` - -Or $_.Name -like "*.Test.csproj" ` - } ` - | ForEach-Object { - &('dotnet') ('test', $_.FullName, '--logger', "trx;LogFileName=$_.trx", '--no-build', '-c', 'Release', '--collect:"XPlat Code Coverage"') - if ($LASTEXITCODE -ne 0) { - $result = $LASTEXITCODE - } - } - + dotnet test -c Release --no-build --collect:"XPlat Code Coverage" --settings coverletArgs.runsettings -v q + $merge = "" Get-ChildItem -rec ` | Where-Object { $_.Name -like "coverage.cobertura.xml" } ` diff --git a/coverletArgs.runsettings b/coverletArgs.runsettings new file mode 100644 index 0000000..50b4fdc --- /dev/null +++ b/coverletArgs.runsettings @@ -0,0 +1,13 @@ + + + + + + + cobertura + **/*.razor + + + + + From da469cf325801ee3c870669b0f0a49029f2d26f1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 10 Dec 2023 15:36:26 +0100 Subject: [PATCH 3/4] ci: update report generator path --- build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.ps1 b/build.ps1 index 4c3d204..a7389bc 100644 --- a/build.ps1 +++ b/build.ps1 @@ -30,7 +30,7 @@ if ($isLinux) { $merge = "$merge;$path" } Write-Host $merge - ReportGenerator\tools\net5.0\ReportGenerator.exe "-reports:$merge" "-targetdir:coverage" "-reporttypes:SonarQube" + ReportGenerator\tools\net8.0\ReportGenerator.exe "-reports:$merge" "-targetdir:coverage" "-reporttypes:SonarQube" if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) { dotnet sonarscanner end -d:sonar.login=$env:sonarqube From 7bd64129f967489a24bda68276961ca9b4f58a15 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 10 Dec 2023 15:50:17 +0100 Subject: [PATCH 4/4] ci: bump jdk --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a610c35..29108fb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,12 +10,12 @@ branches: - /release\/*/ image: - Ubuntu2004 -- Visual Studio 2019 +- Visual Studio 2022 environment: GH_TOKEN: secure: 0NJdORJRFjpB0dwUYv7bVNsbkldkoBhnvWik/CTOwAF/k9kP+/uTWMFnDcpEpt8E donetsdk: 8.0.100 - JAVA_HOME: C:\Program Files\Java\jdk14 + JAVA_HOME: C:\Program Files\Java\jdk19 init: - cmd: git config --global core.autocrlf true install: