Merge branch 'dev'

GeorgDangl · Jul 1, 2022 · 86d7caa · 86d7caa
2 parents 9ac8c56 + b50c7c9
commit 86d7caa
Show file tree

Hide file tree

Showing 30 changed files with 13,006 additions and 22,298 deletions.
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -0,0 +1,155 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Build Schema",
+  "$ref": "#/definitions/build",
+  "definitions": {
+    "build": {
+      "type": "object",
+      "properties": {
+        "Configuration": {
+          "type": "string"
+        },
+        "Continue": {
+          "type": "boolean",
+          "description": "Indicates to continue a previously failed build attempt"
+        },
+        "DanglCiCdTeamsWebhookUrl": {
+          "type": "string"
+        },
+        "DocuApiKey": {
+          "type": "string"
+        },
+        "DocuBaseUrl": {
+          "type": "string"
+        },
+        "GitHubAuthenticationToken": {
+          "type": "string"
+        },
+        "Help": {
+          "type": "boolean",
+          "description": "Shows the help text for this build assembly"
+        },
+        "Host": {
+          "type": "string",
+          "description": "Host for execution. Default is 'automatic'",
+          "enum": [
+            "AppVeyor",
+            "AzurePipelines",
+            "Bamboo",
+            "Bitrise",
+            "GitHubActions",
+            "GitLab",
+            "Jenkins",
+            "Rider",
+            "SpaceAutomation",
+            "TeamCity",
+            "Terminal",
+            "TravisCI",
+            "VisualStudio",
+            "VSCode"
+          ]
+        },
+        "KeyVault": {
+          "type": "string"
+        },
+        "KeyVaultBaseUrl": {
+          "type": "string"
+        },
+        "KeyVaultClientId": {
+          "type": "string"
+        },
+        "KeyVaultClientSecret": {
+          "type": "string"
+        },
+        "NoLogo": {
+          "type": "boolean",
+          "description": "Disables displaying the NUKE logo"
+        },
+        "NuGetApiKey": {
+          "type": "string"
+        },
+        "Partition": {
+          "type": "string",
+          "description": "Partition to use on CI"
+        },
+        "Plan": {
+          "type": "boolean",
+          "description": "Shows the execution plan (HTML)"
+        },
+        "Profile": {
+          "type": "array",
+          "description": "Defines the profiles to load",
+          "items": {
+            "type": "string"
+          }
+        },
+        "PublicMyGetApiKey": {
+          "type": "string"
+        },
+        "PublicMyGetSource": {
+          "type": "string"
+        },
+        "Root": {
+          "type": "string",
+          "description": "Root directory during build execution"
+        },
+        "Skip": {
+          "type": "array",
+          "description": "List of targets to be skipped. Empty list skips all dependencies",
+          "items": {
+            "type": "string",
+            "enum": [
+              "BuildDocFxMetadata",
+              "BuildDocumentation",
+              "Clean",
+              "Compile",
+              "Coverage",
+              "NgLibraryPublish",
+              "NgLibraryTest",
+              "Pack",
+              "PublishGitHubRelease",
+              "Push",
+              "Restore",
+              "UploadDocumentation"
+            ]
+          }
+        },
+        "Solution": {
+          "type": "string",
+          "description": "Path to a solution file that is automatically loaded. Default is LightQuery.sln"
+        },
+        "Target": {
+          "type": "array",
+          "description": "List of targets to be invoked. Default is '{default_target}'",
+          "items": {
+            "type": "string",
+            "enum": [
+              "BuildDocFxMetadata",
+              "BuildDocumentation",
+              "Clean",
+              "Compile",
+              "Coverage",
+              "NgLibraryPublish",
+              "NgLibraryTest",
+              "Pack",
+              "PublishGitHubRelease",
+              "Push",
+              "Restore",
+              "UploadDocumentation"
+            ]
+          }
+        },
+        "Verbosity": {
+          "type": "string",
+          "description": "Logging verbosity during build execution. Default is 'Normal'",
+          "enum": [
+            "Minimal",
+            "Normal",
+            "Quiet",
+            "Verbose"
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to **LightQuery** are documented here.
 
+## v2.2.0:
+- Added a dedicated target for .NET 6 for the Entity Framework Core projects
+- Added tests for .NET 6
+- Dropped tests for `netcoreapp2.1`
+- The Angular client was updated to Angular v14
+
 ## v2.1.0:
 - The Angular client was updated to Angular v12
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -38,20 +38,12 @@ pipeline {
                             xUnitDotNet(deleteOutputFiles: true, failIfNotNew: true, pattern: '**/*testresults.xml', stopProcessingIfError: false)
                         ])
                     cobertura(
-                        coberturaReportFile: 'output/cobertura_coverage.xml',
+                        coberturaReportFile: 'output/Cobertura.xml',
                         failUnhealthy: false,
                         failUnstable: false,
                         maxNumberOfBuilds: 0,
                         onlyStable: false,
                         zoomCoverageChart: false)
-                    publishHTML([
-                        allowMissing: false,
-                        alwaysLinkToLastBuild: false,
-                        keepAll: false,
-                        reportDir: 'output/CoverageReport',
-                        reportFiles: 'index.htm',
-                        reportName: 'Coverage Report',
-                        reportTitles: ''])
                 }
             }
         }
@@ -80,7 +72,12 @@ pipeline {
         always {
             step([$class: 'Mailer',
                 notifyEveryUnstableBuild: true,
-                recipients: "[email protected]",
+                recipients: [
+                    emailextrecipients([
+                        [$class: 'CulpritsRecipientProvider'],
+                        [$class: 'RequesterRecipientProvider']
+                        ])
+                    ].join(' '),
                 sendToIndividuals: true])
             cleanWs()
         }

diff --git a/build/.build.csproj b/build/.build.csproj
@@ -7,20 +7,16 @@
     <RootNamespace></RootNamespace>
     <IsPackable>False</IsPackable>
     <NoWarn>CS0649;CS0169</NoWarn>
+    <NukeTelemetryVersion>1</NukeTelemetryVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageDownload Include="GitVersion.Tool" Version="[5.6.7]" />
-    <PackageReference Include="Dangl.Nuke.CoberturaConverter" Version="2.0.0" />
-    <PackageReference Include="Nuke.Common" Version="5.3.0" />
-    <PackageReference Include="Nuke.WebDocu" Version="3.0.1" />
-    <PackageReference Include="Nuke.GitHub" Version="2.0.0" />
-    <PackageReference Include="JetBrains.dotCover.CommandLineTools" Version="2021.2.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="ReportGenerator" Version="4.8.12" />
-    <PackageReference Include="docfx.console" Version="2.58.2">
+    <PackageDownload Include="GitVersion.Tool" Version="[5.10.3]" />
+    <PackageReference Include="Nuke.Common" Version="6.1.1" />
+    <PackageReference Include="Nuke.WebDocu" Version="4.0.0" />
+    <PackageReference Include="Nuke.GitHub" Version="3.0.0" />
+    <PackageReference Include="ReportGenerator" Version="5.1.9" />
+    <PackageReference Include="docfx.console" Version="2.59.2">
       <ExcludeAssets>build</ExcludeAssets>
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; native; contentfiles; analyzers</IncludeAssets>