Integrate with SonarCloud (#822)

* Add SonarCloud * zzzprojects * BranchName * bn + pr * JAVA_HOME_17_X64 * actions/setup-java@v4 * --- * debug? * cc * collect * <CollectCoverage>true</CollectCoverage> * ignore
zzzprojects · Jun 24, 2024 · 40fab25 · 40fab25
1 parent f0c3073
commit 40fab25
Show file tree

Hide file tree

Showing 26 changed files with 30,971 additions and 64 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,28 +28,48 @@ jobs:
 
     env:
       IsRunningOnGitHubActions: 'true'
+      BranchName: ${{ github.head_ref || github.ref_name }}
 
     steps:  
     - uses: actions/checkout@v4
 
-    - uses: actions/setup-dotnet@v4
+    - uses: actions/setup-java@v4
       with:
-       dotnet-version: |
-         6.0.x
-         7.0.x
-         8.0.x
+        distribution: 'temurin' # See 'Supported distributions' for available options
+        java-version: '17'
+
+    - name: Set JAVA_HOME to JDK 17
+      shell: pwsh
+      run: |
+        $jdkPath = $env:JAVA_HOME_17_X64
+        echo "JAVA_HOME=$jdkPath" >> $GITHUB_ENV
+
+    - name: Install dotnet tools
+      run: |
+        dotnet tool install --global dotnet-sonarscanner
+        dotnet tool install --global dotnet-coverage
+
+    - name: Begin analysis on SonarCloud
+      if: github.event_name != 'pull_request'
+      run: |
+        dotnet sonarscanner begin /k:"zzzprojects_System.Linq.Dynamic.Core" /o:"zzzprojects" /d:sonar.branch.name=$BranchName /d:sonar.host.url="https://sonarcloud.io" /d:sonar.token=${{ secrets.SONAR_TOKEN }} /d:sonar.pullrequest.provider=github /d:sonar.dotnet.excludeTestProjects=true /d:sonar.cs.vscoveragexml.reportsPaths=**/dynamic-coverage-*.xml /d:sonar.verbose=true
               
     - name: Build
       run: |
-        dotnet build ./src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj -c Release -p:buildType=azure-pipelines-ci
+        dotnet build ./src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj -c Debug -p:buildType=azure-pipelines-ci
 
-    - name: Run Tests EF net8.0
+    - name: Run Tests EF net8.0 (with Coverage)
       run: |
-        dotnet test ./test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj -c Release -f net8.0 -p:buildType=azure-pipelines-ci
-
-    - name: Run Tests EFCore net8.0
+        dotnet-coverage collect 'dotnet test ./test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj --configuration Debug --framework net8.0 -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-ef.xml
+        
+    - name: Run Tests EFCore net8.0 (with Coverage)
       run: |
-        dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj -c Release -p:buildType=azure-pipelines-ci
+        dotnet-coverage collect 'dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj --configuration Debug -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-efcore.xml
+        
+    - name: End analysis on SonarCloud
+      if: github.event_name != 'pull_request'
+      run: |
+        dotnet sonarscanner end /d:sonar.token=${{ secrets.SONAR_TOKEN }}
 
     - name: Run Tests EFCore net7.0
       run: |

diff --git a/.gitignore b/.gitignore
@@ -236,3 +236,5 @@ _Pvt_Extensions
 .fake/
 
 /coverage.xml
+/dynamic-coverage-*.xml
+/test/**/coverage.net8.0.opencover.xml
diff --git a/System.Linq.Dynamic.Core.sln b/System.Linq.Dynamic.Core.sln
@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.0.31606.5
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8463ED7E-69FB-49AE-85CF-0791AFD98E38}"
+	ProjectSection(SolutionItems) = preProject
+		test\Directory.Build.props = test\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DBD7D9B6-FCC7-4650-91AF-E6457573A68F}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/src-console/ConsoleAppEF2.0.2_InMemory/ConsoleApp_netcore2.0_EF2.0.2_InMemory.csproj b/src-console/ConsoleAppEF2.0.2_InMemory/ConsoleApp_netcore2.0_EF2.0.2_InMemory.csproj
@@ -19,7 +19,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.2" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.2" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src-console/ConsoleAppEF2.0/ConsoleApp_netcore2.0_EF2.0.1.csproj b/src-console/ConsoleAppEF2.0/ConsoleApp_netcore2.0_EF2.0.1.csproj
@@ -12,7 +12,7 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.1" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src-console/ConsoleAppEF2.1.1/ConsoleApp_netcore2.1_EF2.1.1.csproj b/src-console/ConsoleAppEF2.1.1/ConsoleApp_netcore2.1_EF2.1.1.csproj
@@ -18,7 +18,7 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.1" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src-console/ConsoleAppEF2.1/ConsoleApp_netcore2.0_EF2.1.csproj b/src-console/ConsoleAppEF2.1/ConsoleApp_netcore2.0_EF2.1.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src-console/ConsoleAppEF3.1/ConsoleApp_netcore3.1_EF3.1.csproj b/src-console/ConsoleAppEF3.1/ConsoleApp_netcore3.1_EF3.1.csproj
@@ -20,7 +20,7 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src-console/ConsoleAppEF5/ConsoleApp_net5.0_EF5.csproj b/src-console/ConsoleAppEF5/ConsoleApp_net5.0_EF5.csproj
@@ -19,7 +19,7 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src-console/ConsoleAppEF5_InMemory/ConsoleApp_net5.0_EF5_InMemory.csproj b/src-console/ConsoleAppEF5_InMemory/ConsoleApp_net5.0_EF5_InMemory.csproj
@@ -14,7 +14,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src-console/ConsoleAppEF6_InMemory/ConsoleApp_net6.0_EF6_InMemory.csproj b/src-console/ConsoleAppEF6_InMemory/ConsoleApp_net6.0_EF6_InMemory.csproj
@@ -14,7 +14,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src-console/ConsoleAppEF6_Sqlite/ConsoleApp_net6.0_EF6_Sqlite.csproj b/src-console/ConsoleAppEF6_Sqlite/ConsoleApp_net6.0_EF6_Sqlite.csproj
@@ -14,7 +14,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.28" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src-console/ConsoleApp_net452_CosmosDb/ConsoleApp_net452_CosmosDb.csproj b/src-console/ConsoleApp_net452_CosmosDb/ConsoleApp_net452_CosmosDb.csproj
@@ -42,7 +42,7 @@
       <HintPath>..\..\packages\Microsoft.Azure.DocumentDB.2.5.1\lib\net45\Microsoft.Azure.Documents.Client.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src-console/ConsoleApp_net452_CosmosDb/packages.config b/src-console/ConsoleApp_net452_CosmosDb/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Azure.DocumentDB" version="2.5.1" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
   <package id="System.Net.Http" version="4.3.4" targetFramework="net452" />
 </packages>
diff --git a/src-console/ConsoleApp_net452_EF6/ConsoleApp_net452_EF6.csproj b/src-console/ConsoleApp_net452_EF6/ConsoleApp_net452_EF6.csproj
@@ -67,7 +67,7 @@
       <HintPath>..\..\packages\Linq.Expression.Optimizer.1.0.9\lib\net45\Linq.Expression.Optimizer.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />

diff --git a/src-console/ConsoleApp_net452_EF6/packages.config b/src-console/ConsoleApp_net452_EF6/packages.config
@@ -3,5 +3,5 @@
   <package id="EntityFramework" version="6.5.0" targetFramework="net452" />
   <package id="FSharp.Core" version="4.2.3" targetFramework="net452" />
   <package id="Linq.Expression.Optimizer" version="1.0.9" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
 </packages>
diff --git a/src-console/ConsoleApp_net452_EF6_Effort/ConsoleApp_net452_EF6_Effort.csproj b/src-console/ConsoleApp_net452_EF6_Effort/ConsoleApp_net452_EF6_Effort.csproj
@@ -70,7 +70,7 @@
       <HintPath>..\..\packages\Linq.Expression.Optimizer.1.0.9\lib\net45\Linq.Expression.Optimizer.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NMemory, Version=3.0.0.0, Culture=neutral, PublicKeyToken=afc61983f100d280, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NMemory.3.1.4\lib\net45\NMemory.dll</HintPath>

diff --git a/src-console/ConsoleApp_net452_EF6_Effort/packages.config b/src-console/ConsoleApp_net452_EF6_Effort/packages.config
@@ -4,6 +4,6 @@
   <package id="EntityFramework" version="6.5.0" targetFramework="net452" />
   <package id="FSharp.Core" version="4.2.3" targetFramework="net452" />
   <package id="Linq.Expression.Optimizer" version="1.0.9" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
   <package id="NMemory" version="3.1.4" targetFramework="net452" />
 </packages>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -1,5 +1,10 @@
 <Project>
     <PropertyGroup>
         <LangVersion>12</LangVersion>
+
+        <!-- https://github.com/coverlet-coverage/coverlet/issues/1391 -->
+        <CollectCoverage>true</CollectCoverage>
+        <ExcludeByAttribute>GeneratedCodeAttribute</ExcludeByAttribute>
+        <CoverletOutputFormat>opencover</CoverletOutputFormat>
     </PropertyGroup>
 </Project>
diff --git a/test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj b/test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <Authors>Stef Heyenrath</Authors>
         <TargetFrameworks>net461;net8.0</TargetFrameworks>
-        <LangVersion>10</LangVersion>
+        <DebugType>full</DebugType>
         <DefineConstants>EF;NET461</DefineConstants>
         <AssemblyName>EntityFramework.DynamicLinq.Tests</AssemblyName>
         <PackageId>EntityFramework.DynamicLinq.Tests</PackageId>
@@ -35,18 +35,25 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="coverlet.msbuild" Version="6.0.2">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="6.0.2">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-        <PackageReference Include="MongoDB.Driver" Version="2.19.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="NodaTime" Version="2.4.7" />
-        <PackageReference Include="Testcontainers.MsSql" Version="3.8.0" />
+        <PackageReference Include="Testcontainers.MsSql" Version="3.9.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Linq.PropertyTranslator.Core" Version="1.0.5" />
-        <PackageReference Include="QueryInterceptor.Core" Version="1.0.7" />
+        <PackageReference Include="QueryInterceptor.Core" Version="1.0.9" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="NFluent" Version="2.8.0" />
         <PackageReference Include="Moq" Version="4.13.1" />