es-wolters-kluwer · es-wolters-kluwer · Apr 26, 2024 · Mar 15, 2024 · Mar 15, 2024 · Mar 15, 2024
diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml
@@ -15,10 +15,10 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - name: Setup .NET 6.0.x
+    - name: Setup .NET 8.0.x
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Install GitVersion
       uses: gittools/actions/gitversion/[email protected]
       with:
@@ -28,13 +28,9 @@ jobs:
       with:
         useConfigFile: true
         configFilePath: GitVersion.yml
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 6.0.x        
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
-      run: dotnet build --configuration Release --no-restore --framework net6.0 /p:Version=$GitVersion_SemVer /p:FileVersion=$GitVersion_SemVer /p:AssemblyVersion=$GitVersion_MajorMinorPatch
+      run: dotnet build --configuration Release --no-restore --framework net8.0 /p:Version=$GitVersion_SemVer /p:FileVersion=$GitVersion_SemVer /p:AssemblyVersion=$GitVersion_MajorMinorPatch
     - name: Test
       run: dotnet test --no-build --no-restore --verbosity normal --configuration Release 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -52,7 +52,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/Importia.SDK/.BuildDefinitions/azure-pipeline.yml b/Importia.SDK/.BuildDefinitions/azure-pipeline.yml
@@ -65,6 +65,13 @@ stages:
           script: |
             Write-Host "Versioning to: $(GitVersion.SemVer)"
           failOnStderr: true
+
+      - task: JavaToolInstaller@0
+        displayName: 'Install Java'
+        inputs:
+          versionSpec: '17'
+          jdkArchitectureOption: 'x64'
+          jdkSourceOption: 'PreInstalled'
 
       - task: SonarQubePrepare@5
         displayName: 'Prepare SonarQube Analysis'
@@ -101,14 +108,8 @@ stages:
         inputs:
           command: 'test'
           projects: a3innuva.Importia.SDK.sln
-          arguments: '--filter "FullyQualifiedName~.tests"  -c $(BuildConfiguration) --no-build --no-restore --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover'
+          arguments: '--filter "FullyQualifiedName~.tests"  -c $(BuildConfiguration) --no-build --no-restore --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover'
           testRunTitle: 'BackendTests'
-
-      - script: 'dotnet tool install --global dotnet-reportgenerator-globaltool --version 5.1.6'
-        displayName: 'Install ReportGenerator tool'
-
-      - script: 'reportgenerator -reports:**/coverage.opencover.xml -targetdir:$(Agent.TempDirectory) -reporttypes:"Cobertura"'
-        displayName: 'Create reports'
 
       - task: SonarQubeAnalyze@5
         displayName: 'SonarQube analyze'
@@ -117,10 +118,4 @@ stages:
       - task: SonarQubePublish@5
         displayName: 'SonarQube publish'
         inputs:
-          pollingTimeoutSec: '300'
-
-      - task: PublishCodeCoverageResults@1
-        displayName: 'Publish code coverage'
-        inputs:
-          codeCoverageTool: 'Cobertura'
-          summaryFileLocation: '$(Agent.TempDirectory)/*.xml'
+          pollingTimeoutSec: '300'
diff --git a/.../Implementations/a3innuva.Importia.SDK.Extensions/a3innuva.Importia.SDK.Extensions.csproj b/.../Implementations/a3innuva.Importia.SDK.Extensions/a3innuva.Importia.SDK.Extensions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net451;net461;net471;net48;net5.0;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net451;net461;net471;net48;net5.0;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
     <AssemblyName>a3innuva.TAA.Migration.SDK.Extensions</AssemblyName>
     <RootNamespace>a3innuva.TAA.Migration.SDK.Extensions</RootNamespace>
     <Version>2.17.2</Version>

diff --git a/...ations/a3innuva.Importia.SDK.Implementations/a3innuva.Importia.SDK.Implementations.csproj b/...ations/a3innuva.Importia.SDK.Implementations/a3innuva.Importia.SDK.Implementations.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net451;net461;net471;net48;net5.0;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net451;net461;net471;net48;net5.0;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
     <AssemblyName>a3innuva.TAA.Migration.SDK.Implementations</AssemblyName>
     <RootNamespace>a3innuva.TAA.Migration.SDK.Implementations</RootNamespace>
     <Version>2.17.2</Version>

diff --git a/...mentations/a3innuva.Importia.SDK.Serialization/a3innuva.Importia.SDK.Serialization.csproj b/...mentations/a3innuva.Importia.SDK.Serialization/a3innuva.Importia.SDK.Serialization.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net451;net461;net471;net48;net5.0;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net451;net461;net471;net48;net5.0;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
     <AssemblyName>a3innuva.TAA.Migration.SDK.Serialization</AssemblyName>
     <RootNamespace>a3innuva.TAA.Migration.SDK.Serialization</RootNamespace>
     <Version>2.17.2</Version>
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...a.SDK/Interfaces/a3innuva.Importia.SDK.Interfaces/a3innuva.Importia.SDK.Interfaces.csproj b/...a.SDK/Interfaces/a3innuva.Importia.SDK.Interfaces/a3innuva.Importia.SDK.Interfaces.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net451;net461;net471;net48;net5.0;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net451;net461;net471;net48;net5.0;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
     <AssemblyName>a3innuva.TAA.Migration.SDK.Interfaces</AssemblyName>
     <RootNamespace>a3innuva.TAA.Migration.SDK.Interfaces</RootNamespace>
     <Version>2.17.2</Version>

diff --git a/...uva.TAA.Migration.SDK.Extensions.Tests/a3innuva.TAA.Migration.SDK.Extensions.Tests.csproj b/...uva.TAA.Migration.SDK.Extensions.Tests/a3innuva.TAA.Migration.SDK.Extensions.Tests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...gration.SDK.Implementations.Tests/a3innuva.TAA.Migration.SDK.Implementations.Tests.csproj b/...gration.SDK.Implementations.Tests/a3innuva.TAA.Migration.SDK.Implementations.Tests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...A.Migration.SDK.Serialization.Tests/a3innuva.TAA.Migration.SDK.Serialization.Tests.csproj b/...A.Migration.SDK.Serialization.Tests/a3innuva.TAA.Migration.SDK.Serialization.Tests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>								
 
   <ItemGroup>
-	  <PackageReference Include="coverlet.msbuild" Version="3.1.2">
-	    <PrivateAssets>all</PrivateAssets>
-	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	  </PackageReference>
-	  <PackageReference Include="FluentAssertions" Version="6.2.0" />
-	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-	  <PackageReference Include="xunit" Version="2.4.1" />
-	  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PackageReference Include="coverlet.collector" Version="6.0.0">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+	  <PackageReference Include="FluentAssertions" Version="6.12.0" />
+	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+	  <PackageReference Include="xunit" Version="2.7.0" />
+	  <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>