diff --git a/.appveyor.yml b/.appveyor.yml
index 5fbd13a..f7f80b0 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,14 +4,23 @@
image: Visual Studio 2022
#---------------------------------#
-# Build Script #
+# Install .NET #
#---------------------------------#
install:
- # Update to latest NuGet version since we require 5.3.0 for embedded icon
- - ps: nuget update -self
+ - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
+ - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
+ - ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
+ - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 5.0.408 -InstallDir $env:DOTNET_INSTALL_DIR'
+ - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.405 -InstallDir $env:DOTNET_INSTALL_DIR'
+ - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 7.0.102 -InstallDir $env:DOTNET_INSTALL_DIR'
+ - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
+ - ps: dotnet --info
+#---------------------------------#
+# Build Script #
+#---------------------------------#
build_script:
- - ps: .\build.ps1 -Target AppVeyor
+ - ps: .\build.ps1 --target=CI
# Tests
test: off
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 0000000..0037d90
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+ "version": 1,
+ "isRoot": true,
+ "tools": {
+ "cake.tool": {
+ "version": "1.3.0",
+ "commands": [
+ "dotnet-cake"
+ ]
+ }
+ }
+ }
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7c4b8eb..02465a6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -15,6 +15,19 @@ jobs:
pool:
vmImage: 'windows-2022'
steps:
+ # .NET 5 required for GitVersion
+ - task: UseDotNet@2
+ inputs:
+ version: '5.x'
+ displayName: 'Install .NET 5'
+ - task: UseDotNet@2
+ inputs:
+ version: '6.x'
+ displayName: 'Install .NET 6'
+ - task: UseDotNet@2
+ inputs:
+ version: '7.x'
+ displayName: 'Install .NET 7'
- powershell: ./build.ps1
displayName: 'Cake Build'
- publish: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
@@ -102,12 +115,12 @@ jobs:
- publish: $(Build.SourcesDirectory)/tests/output/report.html
artifact: Integration Tests macOS 11 (.NET Core tool)
displayName: 'Publish generated reports as build artifact'
-# Integration Tests macOS 12 (.NET Core tool)
-- job: Test_macOS_12_DotNetCoreTool
- displayName: Integration Tests macOS 12 (.NET Core tool)
+# Integration Tests macOS 13 (.NET Core tool)
+- job: Test_macOS_13_DotNetCoreTool
+ displayName: Integration Tests macOS 13 (.NET Core tool)
dependsOn: Build
pool:
- vmImage: 'macOS-12'
+ vmImage: 'macOS-13'
steps:
- task: NodeTool@0
inputs:
@@ -128,19 +141,19 @@ jobs:
workingDirectory: ./tests/
displayName: 'Run integration tests'
- publish: $(Build.SourcesDirectory)/tests/output/report.html
- artifact: Integration Tests macOS 12 (.NET Core tool)
+ artifact: Integration Tests macOS 13 (.NET Core tool)
displayName: 'Publish generated reports as build artifact'
-# Integration Tests Ubuntu 18.04 (.NET Core tool)
-- job: Test_ubuntu_18_04_DotNetCoreTool
- displayName: Integration Tests Ubuntu 18.04 (.NET Core tool)
+# Integration Tests Ubuntu 20.04 (.NET Core tool)
+- job: Test_ubuntu_20_04_DotNetCoreTool
+ displayName: Integration Tests Ubuntu 20.04 (.NET Core tool)
dependsOn: Build
pool:
- vmImage: 'ubuntu-18.04'
+ vmImage: 'ubuntu-20.04'
steps:
- task: NodeTool@0
inputs:
- versionSpec: '16.x'
- displayName: 'Install NodeJs 16.x'
+ versionSpec: '18.x'
+ displayName: 'Install NodeJs 18.x'
- bash: |
npm install -g markdownlint-cli
displayName: 'Install required tools'
@@ -156,19 +169,19 @@ jobs:
workingDirectory: ./tests/
displayName: 'Run integration tests'
- publish: $(Build.SourcesDirectory)/tests/output/report.html
- artifact: Integration Tests Ubuntu 18.04 (.NET Core tool)
+ artifact: Integration Tests Ubuntu 20.04 (.NET Core tool)
displayName: 'Publish generated reports as build artifact'
-# Integration Tests Ubuntu 20.04 (.NET Core tool)
-- job: Test_ubuntu_20_04_DotNetCoreTool
- displayName: Integration Tests Ubuntu 20.04 (.NET Core tool)
+# Integration Tests Ubuntu 22.04 (.NET Core tool)
+- job: Test_ubuntu_22_04_DotNetCoreTool
+ displayName: Integration Tests Ubuntu 22.04 (.NET Core tool)
dependsOn: Build
pool:
- vmImage: 'ubuntu-20.04'
+ vmImage: 'ubuntu-22.04'
steps:
- task: NodeTool@0
inputs:
- versionSpec: '18.x'
- displayName: 'Install NodeJs 18.x'
+ versionSpec: '16.x'
+ displayName: 'Install NodeJs 16.x'
- bash: |
npm install -g markdownlint-cli
displayName: 'Install required tools'
@@ -184,5 +197,5 @@ jobs:
workingDirectory: ./tests/
displayName: 'Run integration tests'
- publish: $(Build.SourcesDirectory)/tests/output/report.html
- artifact: Integration Tests Ubuntu 20.04 (.NET Core tool)
+ artifact: Integration Tests Ubuntu 22.04 (.NET Core tool)
displayName: 'Publish generated reports as build artifact'
diff --git a/build.ps1 b/build.ps1
index faee428..0940a31 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,235 +1,15 @@
-##########################################################################
-# This is the Cake bootstrapper script for PowerShell.
-# This file was downloaded from https://github.com/cake-build/resources
-# Feel free to change this file to fit your needs.
-##########################################################################
+$ErrorActionPreference = 'Stop'
-<#
+$SCRIPT_NAME = "recipe.cake"
-.SYNOPSIS
-This is a Powershell script to bootstrap a Cake build.
+Write-Host "Restoring .NET Core tools"
+dotnet tool restore
+if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-.DESCRIPTION
-This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
-and execute your Cake build script with the parameters you provide.
+Write-Host "Bootstrapping Cake"
+dotnet cake $SCRIPT_NAME --bootstrap
+if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-.PARAMETER Script
-The build script to execute.
-.PARAMETER Target
-The build script target to run.
-.PARAMETER Configuration
-The build configuration to use.
-.PARAMETER Verbosity
-Specifies the amount of information to be displayed.
-.PARAMETER ShowDescription
-Shows description about tasks.
-.PARAMETER DryRun
-Performs a dry run.
-.PARAMETER Experimental
-Uses the nightly builds of the Roslyn script engine.
-.PARAMETER Mono
-Uses the Mono Compiler rather than the Roslyn script engine.
-.PARAMETER SkipToolPackageRestore
-Skips restoring of packages.
-.PARAMETER ScriptArgs
-Remaining arguments are added here.
-
-.LINK
-https://cakebuild.net
-
-#>
-
-[CmdletBinding()]
-Param(
- [string]$Script = "recipe.cake",
- [string]$Target = "Default",
- [ValidateSet("Release", "Debug")]
- [string]$Configuration = "Release",
- [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
- [string]$Verbosity = "Verbose",
- [switch]$ShowDescription,
- [Alias("WhatIf", "Noop")]
- [switch]$DryRun,
- [switch]$Experimental,
- [switch]$Mono,
- [switch]$SkipToolPackageRestore,
- [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
- [string[]]$ScriptArgs
-)
-
-[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
-function MD5HashFile([string] $filePath)
-{
- if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
- {
- return $null
- }
-
- [System.IO.Stream] $file = $null;
- [System.Security.Cryptography.MD5] $md5 = $null;
- try
- {
- $md5 = [System.Security.Cryptography.MD5]::Create()
- $file = [System.IO.File]::OpenRead($filePath)
- return [System.BitConverter]::ToString($md5.ComputeHash($file))
- }
- finally
- {
- if ($file -ne $null)
- {
- $file.Dispose()
- }
- }
-}
-
-function GetProxyEnabledWebClient
-{
- $wc = New-Object System.Net.WebClient
- $proxy = [System.Net.WebRequest]::GetSystemWebProxy()
- $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials
- $wc.Proxy = $proxy
- return $wc
-}
-
-Write-Host "Preparing to run build script..."
-
-if(!$PSScriptRoot){
- $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
-}
-
-$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
-$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins"
-$MODULES_DIR = Join-Path $TOOLS_DIR "Modules"
-$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
-$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
-$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
-$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
-$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
-$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config"
-$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config"
-
-# Make sure tools folder exists
-if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
- Write-Verbose -Message "Creating tools directory..."
- New-Item -Path $TOOLS_DIR -Type directory | out-null
-}
-
-# Make sure that packages.config exist.
-if (!(Test-Path $PACKAGES_CONFIG)) {
- Write-Verbose -Message "Downloading packages.config..."
- try {
- $wc = GetProxyEnabledWebClient
- $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch {
- Throw "Could not download packages.config."
- }
-}
-
-# Try find NuGet.exe in path if not exists
-if (!(Test-Path $NUGET_EXE)) {
- Write-Verbose -Message "Trying to find nuget.exe in PATH..."
- $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) }
- $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
- if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
- Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
- $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
- }
-}
-
-# Try download NuGet.exe if not exists
-if (!(Test-Path $NUGET_EXE)) {
- Write-Verbose -Message "Downloading NuGet.exe..."
- try {
- $wc = GetProxyEnabledWebClient
- $wc.DownloadFile($NUGET_URL, $NUGET_EXE)
- } catch {
- Throw "Could not download NuGet.exe."
- }
-}
-
-# Save nuget.exe path to environment to be available to child processed
-$ENV:NUGET_EXE = $NUGET_EXE
-
-# Restore tools from NuGet?
-if(-Not $SkipToolPackageRestore.IsPresent) {
- Push-Location
- Set-Location $TOOLS_DIR
-
- # Check for changes in packages.config and remove installed tools if true.
- [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
- if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
- ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
- Write-Verbose -Message "Missing or changed package.config hash..."
- Remove-Item * -Recurse -Exclude packages.config,nuget.exe
- }
-
- Write-Verbose -Message "Restoring tools from NuGet..."
- $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
-
- if ($LASTEXITCODE -ne 0) {
- Throw "An error occurred while restoring NuGet tools."
- }
- else
- {
- $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
- }
- Write-Verbose -Message ($NuGetOutput | out-string)
-
- Pop-Location
-}
-
-# Restore addins from NuGet
-if (Test-Path $ADDINS_PACKAGES_CONFIG) {
- Push-Location
- Set-Location $ADDINS_DIR
-
- Write-Verbose -Message "Restoring addins from NuGet..."
- $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`""
-
- if ($LASTEXITCODE -ne 0) {
- Throw "An error occurred while restoring NuGet addins."
- }
-
- Write-Verbose -Message ($NuGetOutput | out-string)
-
- Pop-Location
-}
-
-# Restore modules from NuGet
-if (Test-Path $MODULES_PACKAGES_CONFIG) {
- Push-Location
- Set-Location $MODULES_DIR
-
- Write-Verbose -Message "Restoring modules from NuGet..."
- $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`""
-
- if ($LASTEXITCODE -ne 0) {
- Throw "An error occurred while restoring NuGet modules."
- }
-
- Write-Verbose -Message ($NuGetOutput | out-string)
-
- Pop-Location
-}
-
-# Make sure that Cake has been installed.
-if (!(Test-Path $CAKE_EXE)) {
- Throw "Could not find Cake.exe at $CAKE_EXE"
-}
-
-
-
-# Build Cake arguments
-$cakeArguments = @("$Script");
-if ($Target) { $cakeArguments += "-target=$Target" }
-if ($Configuration) { $cakeArguments += "-configuration=$Configuration" }
-if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" }
-if ($ShowDescription) { $cakeArguments += "-showdescription" }
-if ($DryRun) { $cakeArguments += "-dryrun" }
-if ($Experimental) { $cakeArguments += "-experimental" }
-if ($Mono) { $cakeArguments += "-mono" }
-$cakeArguments += $ScriptArgs
-
-# Start Cake
-Write-Host "Running build script..."
-&$CAKE_EXE $cakeArguments
-exit $LASTEXITCODE
\ No newline at end of file
+Write-Host "Running Build"
+dotnet cake $SCRIPT_NAME @args
+if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 4b690aa..ba5d0c9 100755
--- a/build.sh
+++ b/build.sh
@@ -1,103 +1,11 @@
-#!/usr/bin/env bash
-##########################################################################
-# This is the Cake bootstrapper script for Linux and OS X.
-# This file was downloaded from https://github.com/cake-build/resources
-# Feel free to change this file to fit your needs.
-##########################################################################
+#!/bin/bash
+SCRIPT_NAME="recipe.cake"
-# Define directories.
-SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-TOOLS_DIR=$SCRIPT_DIR/tools
-NUGET_EXE=$TOOLS_DIR/nuget.exe
-NUGET_URL=https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
-CAKE_VERSION=0.32.1
-CAKE_EXE=$TOOLS_DIR/Cake.$CAKE_VERSION/Cake.exe
+echo "Restoring .NET Core tools"
+dotnet tool restore
-# Temporarily skip verification of addins.
-export CAKE_SETTINGS_SKIPVERIFICATION='true'
+echo "Bootstrapping Cake"
+dotnet cake $SCRIPT_NAME --bootstrap
-# Define default arguments.
-SCRIPT="recipe.cake"
-TARGET="Default"
-CONFIGURATION="Release"
-VERBOSITY="verbose"
-DRYRUN=
-SCRIPT_ARGUMENTS=()
-
-# Parse arguments.
-for i in "$@"; do
- case $1 in
- -t|--target) TARGET="$2"; shift ;;
- -c|--configuration) CONFIGURATION="$2"; shift ;;
- -v|--verbosity) VERBOSITY="$2"; shift ;;
- -d|--dryrun) DRYRUN="-dryrun" ;;
- --) shift; SCRIPT_ARGUMENTS+=("$@"); break ;;
- *) SCRIPT_ARGUMENTS+=("$1") ;;
- esac
- shift
-done
-
-# Make sure the tools folder exist.
-if [ ! -d "$TOOLS_DIR" ]; then
- mkdir "$TOOLS_DIR"
-fi
-
-# Print Mono version.
-echo "Mono version:"
-mono --version
-echo ""
-
-###########################################################################
-# INSTALL .NET CORE CLI
-###########################################################################
-
-echo "Installing .NET CLI..."
-if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then
- mkdir "$SCRIPT_DIR/.dotnet"
-fi
-curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" https://dot.net/v1/dotnet-install.sh
-sudo bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version 2.1.400 --install-dir .dotnet --no-path
-export PATH="$SCRIPT_DIR/.dotnet":$PATH
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-export DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0
-"$SCRIPT_DIR/.dotnet/dotnet" --info
-
-###########################################################################
-# INSTALL NUGET
-###########################################################################
-
-# Download NuGet if it does not exist.
-if [ ! -f "$NUGET_EXE" ]; then
- echo "Downloading NuGet..."
- curl -Lsfo "$NUGET_EXE" $NUGET_URL
- if [ $? -ne 0 ]; then
- echo "An error occurred while downloading nuget.exe."
- exit 1
- fi
-fi
-
-###########################################################################
-# INSTALL CAKE
-###########################################################################
-
-if [ ! -f "$CAKE_EXE" ]; then
- mono "$NUGET_EXE" install Cake -Version $CAKE_VERSION -OutputDirectory "$TOOLS_DIR"
- if [ $? -ne 0 ]; then
- echo "An error occurred while installing Cake."
- exit 1
- fi
-fi
-
-# Make sure that Cake has been installed.
-if [ ! -f "$CAKE_EXE" ]; then
- echo "Could not find Cake.exe at '$CAKE_EXE'."
- exit 1
-fi
-
-###########################################################################
-# RUN BUILD SCRIPT
-###########################################################################
-
-# Start Cake
-exec mono "$CAKE_EXE" $SCRIPT --verbosity=$VERBOSITY --configuration=$CONFIGURATION --target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}"
+echo "Running Build"
+dotnet cake $SCRIPT_NAME "$@"
\ No newline at end of file
diff --git a/nuspec/nuget/Cake.Issues.Markdownlint.nuspec b/nuspec/nuget/Cake.Issues.Markdownlint.nuspec
index 0042b58..75daa99 100644
--- a/nuspec/nuget/Cake.Issues.Markdownlint.nuspec
+++ b/nuspec/nuget/Cake.Issues.Markdownlint.nuspec
@@ -24,18 +24,15 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
Copyright © BBT Software AG and contributors
cake cake-addin cake-issues cake-issueprovider linting markdown markdownlint
- https://github.com/cake-contrib/Cake.Issues.Markdownlint/releases/tag/2.0.0
+ https://github.com/cake-contrib/Cake.Issues.Markdownlint/releases/tag/3.0.0
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/recipe.cake b/recipe.cake
index e40b4d1..7af0f12 100644
--- a/recipe.cake
+++ b/recipe.cake
@@ -1,4 +1,8 @@
-#load nuget:?package=Cake.Recipe&version=1.0.0
+#load nuget:?package=Cake.Recipe&version=3.0.1
+
+//*************************************************************************************************
+// Settings
+//*************************************************************************************************
Environment.SetVariableNames();
@@ -10,23 +14,20 @@ BuildParameters.SetParameters(
repositoryOwner: "cake-contrib",
repositoryName: "Cake.Issues.Markdownlint",
appVeyorAccountName: "cakecontrib",
- shouldGenerateDocumentation: false,
- shouldPublishMyGet: false,
- shouldRunCodecov: false,
- shouldRunGitVersion: true);
+ shouldRunCoveralls: false, // Disabled because it's currently failing
+ shouldPostToGitter: false, // Disabled because it's currently failing
+ shouldGenerateDocumentation: false);
BuildParameters.PrintParameters(Context);
ToolSettings.SetToolSettings(
context: Context,
- dupFinderExcludePattern: new string[]
- {
- BuildParameters.RootDirectoryPath + "/src/Cake.Issues.Markdownlint.Tests/*.cs",
- BuildParameters.RootDirectoryPath + "/src/Cake.Issues.Markdownlint.Tests/LogFileFormat/*.cs",
- BuildParameters.RootDirectoryPath + "/src/Cake.Issues.Markdownlint*/**/*.AssemblyInfo.cs"
- },
testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[Cake.Issues]* -[Cake.Issues.Testing]* -[Shouldly]* -[DiffEngine]* -[EmptyFiles]*",
testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
+//*************************************************************************************************
+// Execution
+//*************************************************************************************************
+
Build.RunDotNetCore();
diff --git a/src/Cake.Issues.Markdownlint.Tests/Cake.Issues.Markdownlint.Tests.csproj b/src/Cake.Issues.Markdownlint.Tests/Cake.Issues.Markdownlint.Tests.csproj
index e5e9443..ef9f6e6 100644
--- a/src/Cake.Issues.Markdownlint.Tests/Cake.Issues.Markdownlint.Tests.csproj
+++ b/src/Cake.Issues.Markdownlint.Tests/Cake.Issues.Markdownlint.Tests.csproj
@@ -1,8 +1,8 @@
-
+
Library
- netcoreapp3.1
+ net6.0
false
Tests for the Cake.Issues.Markdownlint addin
BBT Software AG
@@ -52,25 +52,25 @@
- 2.0.0
+ 3.0.0
- 2.0.0
+ 3.0.0
- 2.0.0
+ 3.0.0
- 4.0.3
+ 4.1.0
1.1.118
runtime; build; native; contentfiles; analyzers
all
-
+
- 2.4.1
+ 2.4.2
2.4.5
diff --git a/src/Cake.Issues.Markdownlint.Tests/Properties/AssemblyInfo.cs b/src/Cake.Issues.Markdownlint.Tests/Properties/ProjectInfo.cs
similarity index 100%
rename from src/Cake.Issues.Markdownlint.Tests/Properties/AssemblyInfo.cs
rename to src/Cake.Issues.Markdownlint.Tests/Properties/ProjectInfo.cs
diff --git a/src/Cake.Issues.Markdownlint/Cake.Issues.Markdownlint.csproj b/src/Cake.Issues.Markdownlint/Cake.Issues.Markdownlint.csproj
index 3f05df5..c5905ba 100644
--- a/src/Cake.Issues.Markdownlint/Cake.Issues.Markdownlint.csproj
+++ b/src/Cake.Issues.Markdownlint/Cake.Issues.Markdownlint.csproj
@@ -2,7 +2,7 @@
Library
- netcoreapp3.1;net5.0;net6.0
+ net6.0;net7.0
Markdownlint support for the Cake.Issues Addin for Cake Build Automation System
BBT Software AG
BBT Software AG
@@ -26,12 +26,12 @@
- 2.0.0
+ 3.0.0
- 2.0.0
+ 3.0.0
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Cake.Issues.Markdownlint/LogFileFormat/MarkdownlintCliJsonLogFileFormat.cs b/src/Cake.Issues.Markdownlint/LogFileFormat/MarkdownlintCliJsonLogFileFormat.cs
index 965030b..e888d50 100644
--- a/src/Cake.Issues.Markdownlint/LogFileFormat/MarkdownlintCliJsonLogFileFormat.cs
+++ b/src/Cake.Issues.Markdownlint/LogFileFormat/MarkdownlintCliJsonLogFileFormat.cs
@@ -79,7 +79,7 @@ private static IIssue GetIssue(
GetFilePath(logFileEntry.fileName, repositorySettings),
logFileEntry.lineNumber,
logFileEntry.errorRange != null ? logFileEntry.lineNumber : null,
- logFileEntry.errorRange != null ? logFileEntry.errorRange[0] : null,
+ logFileEntry.errorRange?[0],
logFileEntry.errorRange != null ? logFileEntry.errorRange[0] + logFileEntry.errorRange[1] : null)
.WithPriority(IssuePriority.Warning)
.OfRule(logFileEntry.ruleNames.First(), new Uri(logFileEntry.ruleInformation))
diff --git a/src/Cake.Issues.Markdownlint/LogFileFormat/MarkdownlintCliLogFileFormat.cs b/src/Cake.Issues.Markdownlint/LogFileFormat/MarkdownlintCliLogFileFormat.cs
index 5972955..af15ccd 100644
--- a/src/Cake.Issues.Markdownlint/LogFileFormat/MarkdownlintCliLogFileFormat.cs
+++ b/src/Cake.Issues.Markdownlint/LogFileFormat/MarkdownlintCliLogFileFormat.cs
@@ -48,6 +48,7 @@ public override IEnumerable ReadIssues(
{
columnNumber = int.Parse(groups["columnNumber"].Value);
}
+
var ruleId = groups["ruleId"].Value;
var message = groups["message"].Value;
@@ -80,7 +81,7 @@ private bool TryGetFile(
// Validate file path and make relative to repository root.
bool result;
- (result, fileName) = filePath.IsValideRepositoryFilePath(repositorySettings);
+ (result, fileName) = filePath.IsValidRepositoryFilePath(repositorySettings);
if (!result)
{
diff --git a/src/Cake.Issues.Markdownlint/MarkdownlintRuleUrlResolver.cs b/src/Cake.Issues.Markdownlint/MarkdownlintRuleUrlResolver.cs
index 1787325..aa8b70b 100644
--- a/src/Cake.Issues.Markdownlint/MarkdownlintRuleUrlResolver.cs
+++ b/src/Cake.Issues.Markdownlint/MarkdownlintRuleUrlResolver.cs
@@ -9,7 +9,7 @@
internal class MarkdownlintRuleUrlResolver : BaseRuleUrlResolver
{
private static readonly Lazy InstanceValue =
- new Lazy(() => new MarkdownlintRuleUrlResolver());
+ new(() => new MarkdownlintRuleUrlResolver());
///
/// Initializes a new instance of the class.
diff --git a/src/Cake.Issues.Markdownlint/Properties/AssemblyInfo.cs b/src/Cake.Issues.Markdownlint/Properties/ProjectInfo.cs
similarity index 100%
rename from src/Cake.Issues.Markdownlint/Properties/AssemblyInfo.cs
rename to src/Cake.Issues.Markdownlint/Properties/ProjectInfo.cs
diff --git a/tests/.config/dotnet-tools.json b/tests/.config/dotnet-tools.json
index 31e896e..831d039 100644
--- a/tests/.config/dotnet-tools.json
+++ b/tests/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"cake.tool": {
- "version": "2.0.0",
+ "version": "3.0.0",
"commands": [
"dotnet-cake"
]
diff --git a/tools/packages.config b/tools/packages.config
deleted file mode 100644
index 997c0e1..0000000
--- a/tools/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-