Merge branch 'release/4.0.0'

pascalberger · pascalberger · commit 38c03666a2d6 · 2023-12-23T21:25:50.000+01:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -11,8 +11,9 @@ install:
   - 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:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.417 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 7.0.404 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 8.0.100 -InstallDir $env:DOTNET_INSTALL_DIR'
   - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
   - ps: dotnet --info
 
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "github>cake-contrib/renovate-presets:cake-issues"
+  ]
+}
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -27,5 +27,9 @@ jobs:
     inputs:
       version: '7.x'
     displayName: 'Install .NET 7'
+  - task: UseDotNet@2
+    inputs:
+      version: '8.x'
+    displayName: 'Install .NET 8'
   - powershell: ./build.ps1
     displayName: 'Cake Build'
diff --git a/global.json b/global.json
@@ -0,0 +1,7 @@
+{
+    "sdk": {
+        "allowPrerelease": true,
+        "version": "8.0.100",
+        "rollForward": "latestFeature"
+    }
+}
diff --git a/nuspec/nuget/Cake.Issues.EsLint.nuspec b/nuspec/nuget/Cake.Issues.EsLint.nuspec
@@ -24,7 +24,7 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
     <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.EsLint.git"/>
     <copyright>Copyright © BBT Software AG and contributors</copyright>
     <tags>cake cake-addin cake-issues cake-issueprovider code-analysis javascript linting eslint</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.ESLint/releases/tag/3.0.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.ESLint/releases/tag/4.0.0</releaseNotes>
   </metadata>
   <files>
     <file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
@@ -34,5 +34,8 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
     <file src="net7.0\Cake.Issues.EsLint.dll" target="lib\net7.0" />
     <file src="net7.0\Cake.Issues.EsLint.pdb" target="lib\net7.0" />
     <file src="net7.0\Cake.Issues.EsLint.xml" target="lib\net7.0" />
+    <file src="net8.0\Cake.Issues.EsLint.dll" target="lib\net8.0" />
+    <file src="net8.0\Cake.Issues.EsLint.pdb" target="lib\net8.0" />
+    <file src="net8.0\Cake.Issues.EsLint.xml" target="lib\net8.0" />
   </files>
 </package>
diff --git a/recipe.cake b/recipe.cake
@@ -1,4 +1,4 @@
-#load nuget:https://pkgs.dev.azure.com/cake-contrib/Home/_packaging/addins/nuget/v3/index.json?package=Cake.Recipe&version=3.0.0-beta0001-0007&prerelease
+#load nuget:?package=Cake.Recipe&version=3.1.1
 
 //*************************************************************************************************
 // Settings
diff --git a/src/Cake.Issues.EsLint.Tests/Cake.Issues.EsLint.Tests.csproj b/src/Cake.Issues.EsLint.Tests/Cake.Issues.EsLint.Tests.csproj
@@ -27,13 +27,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
-    <PackageReference Include="Cake.Testing" Version="3.0.0" />
-    <PackageReference Include="Cake.Issues.Testing" Version="3.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Cake.Testing" Version="4.0.0" />
+    <PackageReference Include="Cake.Issues.Testing" Version="4.0.0" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Cake.Issues.EsLint/Cake.Issues.EsLint.csproj b/src/Cake.Issues.EsLint/Cake.Issues.EsLint.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Description>EsLint support for the Cake.Issues Addin for Cake Build Automation System</Description>
     <Authors>BBT Software AG</Authors>
     <Company>BBT Software AG</Company>
@@ -19,9 +19,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Issues" Version="3.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1">
+    <PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Issues" Version="4.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Cake.Issues.EsLint/EsLintIssuesProvider.cs b/src/Cake.Issues.EsLint/EsLintIssuesProvider.cs
@@ -5,24 +5,17 @@
     /// <summary>
     /// Provider for issues reported by ESLint.
     /// </summary>
-    public class EsLintIssuesProvider : BaseMultiFormatIssueProvider<EsLintIssuesSettings, EsLintIssuesProvider>
+    /// <param name="log">The Cake log context.</param>
+    /// <param name="settings">Settings for reading the log file.</param>
+    public class EsLintIssuesProvider(ICakeLog log, EsLintIssuesSettings settings)
+        : BaseMultiFormatIssueProvider<EsLintIssuesSettings, EsLintIssuesProvider>(log, settings)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EsLintIssuesProvider"/> class.
-        /// </summary>
-        /// <param name="log">The Cake log context.</param>
-        /// <param name="settings">Settings for reading the log file.</param>
-        public EsLintIssuesProvider(ICakeLog log, EsLintIssuesSettings settings)
-            : base(log, settings)
-        {
-        }
-
         /// <summary>
         /// Gets the name of the ESLint issue provider.
         /// This name can be used to identify issues based on the <see cref="IIssue.ProviderType"/> property.
         /// </summary>
         public static string ProviderTypeName => typeof(EsLintIssuesProvider).FullName;
-        
+
         /// <inheritdoc />
         public override string ProviderName => "ESLint";
     }
diff --git a/src/Cake.Issues.EsLint/EsLintRuleUrlResolver.cs b/src/Cake.Issues.EsLint/EsLintRuleUrlResolver.cs
@@ -8,7 +8,7 @@
     internal class EsLintRuleUrlResolver : BaseRuleUrlResolver<BaseRuleDescription>
     {
         private static readonly Lazy<EsLintRuleUrlResolver> InstanceValue =
-            new Lazy<EsLintRuleUrlResolver>(() => new EsLintRuleUrlResolver());
+            new(() => new EsLintRuleUrlResolver());
 
         /// <summary>
         /// Initializes a new instance of the <see cref="EsLintRuleUrlResolver"/> class.
diff --git a/src/Cake.Issues.EsLint/LogFileFormat/JsonLogFileFormat.cs b/src/Cake.Issues.EsLint/LogFileFormat/JsonLogFileFormat.cs
@@ -10,17 +10,10 @@
     /// <summary>
     /// ESLint Json format.
     /// </summary>
-    internal class JsonLogFileFormat : BaseEsLintLogFileFormat
+    /// <param name="log">The Cake log instance.</param>
+    internal class JsonLogFileFormat(ICakeLog log)
+        : BaseEsLintLogFileFormat(log)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonLogFileFormat"/> class.
-        /// </summary>
-        /// <param name="log">The Cake log instance.</param>
-        public JsonLogFileFormat(ICakeLog log)
-            : base(log)
-        {
-        }
-
         /// <inheritdoc />
         public override IEnumerable<IIssue> ReadIssues(
             EsLintIssuesProvider issueProvider,
@@ -90,20 +83,13 @@ private static IIssue GetIssue(
         /// <returns>Priority.</returns>
         private static IssuePriority GetPriority(int severity)
         {
-            switch (severity)
+            return severity switch
             {
-                case 0:
-                    return IssuePriority.Hint;
-
-                case 1:
-                    return IssuePriority.Warning;
-
-                case 2:
-                    return IssuePriority.Error;
-
-                default:
-                    return IssuePriority.Undefined;
-            }
+                0 => IssuePriority.Hint,
+                1 => IssuePriority.Warning,
+                2 => IssuePriority.Error,
+                _ => IssuePriority.Undefined,
+            };
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#load nuget:https://pkgs.dev.azure.com/cake-contrib/Home/_packaging/addins/nuget/v3/index.json?package=Cake.Recipe&version=3.0.0-beta0001-0007&prerelease`
	`1`	`+#load nuget:?package=Cake.Recipe&version=3.1.1`
`2`	`2`
`3`	`3`	`//*************************************************************************************************`
`4`	`4`	`// Settings`