diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 831d039..da200cd 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"cake.tool": {
- "version": "3.0.0",
+ "version": "4.0.0",
"commands": [
"dotnet-cake"
]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fef76f2..871da9c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,14 +17,25 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
+
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
+ with:
+ dotnet-version: |
+ 6.0.x
+ 8.0.x
+
- name: Nerdbank.GitVersioning
uses: dotnet/nbgv@v0.4.0
with:
setAllVars: true
+
- name: Run the build script
uses: cake-build/cake-action@v1
with:
target: Pack
+ cake-version: tool-manifest
+
- name: Upload a Build Artifact
uses: actions/upload-artifact@v3.1.0
if: runner.os == 'Windows'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 47d214c..536cc1b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -19,7 +19,9 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v3
with:
- dotnet-version: 6.0.x
+ dotnet-version: |
+ 6.0.x
+ 8.0.x
- name: Nerdbank.GitVersioning
uses: dotnet/nbgv@v0.4.0
diff --git a/.gitignore b/.gitignore
index 71da47a..717fa99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -205,6 +205,89 @@ FakesAssemblies/
*.DotSettings
+### Rider ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+.idea
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn. Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+# End of https://www.toptal.com/developers/gitignore/api/rider
+
BenchmarkDotNet.Artifacts/
tools/*
coverage-results/*
diff --git a/Cake.Coverlet.sln b/Cake.Coverlet.sln
index fc44559..12c29f4 100644
--- a/Cake.Coverlet.sln
+++ b/Cake.Coverlet.sln
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
build.cake = build.cake
readme.md = readme.md
version.json = version.json
+ .gitignore = .gitignore
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EEC95ADF-2D7A-4B97-9D4E-27F2F198FFC6}"
diff --git a/src/Cake.Coverlet/Cake.Coverlet.csproj b/src/Cake.Coverlet/Cake.Coverlet.csproj
index c45b50c..d092141 100644
--- a/src/Cake.Coverlet/Cake.Coverlet.csproj
+++ b/src/Cake.Coverlet/Cake.Coverlet.csproj
@@ -2,7 +2,7 @@
Coverlet extensions for Cake Build
- net6.0
+ net6.0;net8.0
true
Cake.Coverlet
Cake.Coverlet
@@ -16,11 +16,12 @@
false
false
false
+ readme.md
https://github.com/romanx/Cake.Coverlet
licence.md
images\icon.png
https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/addin/cake-contrib-addin-medium.png
- portable
+ embedded
true
@@ -31,18 +32,23 @@
$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
+
+ true
+
+
-
+
all
runtime; build; native; contentfiles; analyzers
-
-
+
+
-
+
+
diff --git a/test/Cake.Coverlet.Tests/Cake.Coverlet.Tests.csproj b/test/Cake.Coverlet.Tests/Cake.Coverlet.Tests.csproj
index 426b89e..287b597 100644
--- a/test/Cake.Coverlet.Tests/Cake.Coverlet.Tests.csproj
+++ b/test/Cake.Coverlet.Tests/Cake.Coverlet.Tests.csproj
@@ -1,25 +1,25 @@
- net6.0
+ net6.0;net8.0
false
-
-
-
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/version.json b/version.json
index 8f03df9..6c85cbd 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
{
- "version": "3.0",
+ "version": "4.0",
"publicReleaseRefSpec": [
"^refs/tags/v\\d\\.\\d", // we also release tags starting with vN.N
"^refs/heads/main$"