Merge pull request #233 from Aguafrommars/fix/dependencies

update packages
Aguafrommars · Dec 10, 2023 · 6ba2cff · 6ba2cff
2 parents 889bf9c + 7bd6412
commit 6ba2cff
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 35 deletions.
diff --git 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:

diff --git 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" } `
@@ -51,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

diff --git a/coverletArgs.runsettings b/coverletArgs.runsettings
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="XPlat code coverage">
+        <Configuration>
+          <Format>cobertura</Format>
+          <ExcludeByFile>**/*.razor</ExcludeByFile>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
diff --git a/...s.AspNetCore.Authentication.TestBase/Aguacongas.AspNetCore.Authentication.TestBase.csproj b/...s.AspNetCore.Authentication.TestBase/Aguacongas.AspNetCore.Authentication.TestBase.csproj
@@ -39,9 +39,9 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit.analyzers" Version="1.6.0" />
-    <PackageReference Include="xunit.assert" Version="2.6.2" />
-    <PackageReference Include="xunit.core" Version="2.6.2" />
+    <PackageReference Include="xunit.analyzers" Version="1.7.0" />
+    <PackageReference Include="xunit.assert" Version="2.6.3" />
+    <PackageReference Include="xunit.core" Version="2.6.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ion.EntityFramework.Test/Aguacongas.AspNetCore.Authentication.EntityFramework.Test.csproj b/...ion.EntityFramework.Test/Aguacongas.AspNetCore.Authentication.EntityFramework.Test.csproj
@@ -13,7 +13,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23503-02" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/...Core.Authentication.RavenDb.Test/Aguacongas.AspNetCore.Authentication.RavenDb.Test.csproj b/...Core.Authentication.RavenDb.Test/Aguacongas.AspNetCore.Authentication.RavenDb.Test.csproj
@@ -14,7 +14,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23503-02" />
     <PackageReference Include="RavenDB.TestDriver" Version="6.0.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/...pNetCore.Authentication.Redis.Test/Aguacongas.AspNetCore.Authentication.Redis.Test.csproj b/...pNetCore.Authentication.Redis.Test/Aguacongas.AspNetCore.Authentication.Redis.Test.csproj
@@ -14,7 +14,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23503-02" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/...guacongas.AspNetCore.Authentication.Test/Aguacongas.AspNetCore.Authentication.Test.csproj b/...guacongas.AspNetCore.Authentication.Test/Aguacongas.AspNetCore.Authentication.Test.csproj
@@ -15,8 +15,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23503-02" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>