Merge branch 'release/3.0.0'

Author: pascalberger

.appveyor.yml

@@ -4,12 +4,21 @@
 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=CI
 

.github/dependabot.yml

@@ -8,14 +8,10 @@ updates:
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: Cake.Core
-    versions:
-    - "(,3.0)"
+    update-types: ["version-update:semver-minor"]
   - dependency-name: Cake.Testing
-    versions:
-    - "(,3.0)"
+    update-types: ["version-update:semver-minor"]
   - dependency-name: Cake.Issues
-    versions:
-    - "> 1.0.0, < 2"
+    update-types: ["version-update:semver-minor"]
   - dependency-name: Cake.Issues.Testing
-    versions:
-    - "> 1.0.0, < 2"
+    update-types: ["version-update:semver-minor"]

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "dotnet.defaultSolution": "src\\Cake.Issues.EsLint.sln"
+}

azure-pipelines.yml

@@ -14,5 +14,18 @@ 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'

nuspec/nuget/Cake.Issues.EsLint.nuspec

@@ -24,18 +24,15 @@ 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/2.0.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.ESLint/releases/tag/3.0.0</releaseNotes>
   </metadata>
   <files>
     <file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
-    <file src="netcoreapp3.1\Cake.Issues.EsLint.dll" target="lib\netcoreapp3.1" />
-    <file src="netcoreapp3.1\Cake.Issues.EsLint.pdb" target="lib\netcoreapp3.1" />
-    <file src="netcoreapp3.1\Cake.Issues.EsLint.xml" target="lib\netcoreapp3.1" />
-    <file src="net5.0\Cake.Issues.EsLint.dll" target="lib\net5.0" />
-    <file src="net5.0\Cake.Issues.EsLint.pdb" target="lib\net5.0" />
-    <file src="net5.0\Cake.Issues.EsLint.xml" target="lib\net5.0" />
     <file src="net6.0\Cake.Issues.EsLint.dll" target="lib\net6.0" />
     <file src="net6.0\Cake.Issues.EsLint.pdb" target="lib\net6.0" />
     <file src="net6.0\Cake.Issues.EsLint.xml" target="lib\net6.0" />
+    <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" />
   </files>
 </package>

recipe.cake

@@ -15,6 +15,7 @@ BuildParameters.SetParameters(
     repositoryName: "Cake.Issues.EsLint",
     appVeyorAccountName: "cakecontrib",
     shouldRunCoveralls: false, // Disabled because it's currently failing
+    shouldPostToGitter: false, // Disabled because it's currently failing
     shouldGenerateDocumentation: false);
 
 BuildParameters.PrintParameters(Context);

src/Cake.Issues.EsLint.Tests/Cake.Issues.EsLint.Tests.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Product>Cake.Issues</Product>
     <Copyright>Copyright © BBT Software AG and contributors</Copyright>
@@ -27,12 +27,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Cake.Testing" Version="2.0.0" />
-    <PackageReference Include="Cake.Issues.Testing" Version="2.0.0" />
-    <PackageReference Include="Shouldly" Version="4.0.3" />
+    <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="Shouldly" Version="4.2.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
   </ItemGroup>
 

src/Cake.Issues.EsLint/Cake.Issues.EsLint.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.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="2.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Issues" Version="2.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+    <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">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>