Merge branch 'release/3.0'

.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/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "github>cake-contrib/renovate-presets:cake-issues"
+  ]
+}

.vscode/settings.json

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

azure-pipelines.yml

@@ -15,18 +15,35 @@ 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: 'Build'
   - publish: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
     artifact: NuGet Package
     displayName: 'Publish NuGet packages as build artifact'
-# Integration Tests Frosting Windows (.NET 5)
-- job: Test_Frosting_Windows_Net5
-  displayName: Integration Tests Frosting Windows (.NET 5)
+# Integration Tests Frosting Windows (.NET 6)
+- job: Test_Frosting_Windows_Net6
+  displayName: Integration Tests Frosting Windows (.NET 6)
   dependsOn: Build
   pool:
     vmImage: 'windows-2019'
   steps:
+  - task: UseDotNet@2
+    inputs:
+      version: '6.x'
+    displayName: 'Install .NET 6'
   - download: current
     artifact: NuGet Package
     displayName: 'Download build artifact'
@@ -36,7 +53,7 @@ jobs:
       targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
     displayName: 'Copy build artifact for test run'
   - powershell: ./build.ps1 --verbosity=diagnostic
-    workingDirectory: ./tests/frosting/net5.0
+    workingDirectory: ./tests/frosting/net6.0
     displayName: 'Run integration tests'
 # Integration Tests Script Runner Windows (.NET tool)
 - job: Test_Script_Runner_Windows_DotNetTool
@@ -45,6 +62,10 @@ jobs:
   pool:
     vmImage: 'windows-2019'
   steps:
+  - task: UseDotNet@2
+    inputs:
+      version: '6.x'
+    displayName: 'Install .NET 6'
   - download: current
     artifact: NuGet Package
     displayName: 'Download build artifact'
@@ -54,5 +75,5 @@ jobs:
       targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
     displayName: 'Copy build artifact for test run'
   - powershell: ./build.ps1 --verbosity=diagnostic
-    workingDirectory: ./tests/frosting/net5.0
+    workingDirectory: ./tests/script-runner
     displayName: 'Run integration tests'

nuspec/nuget/Cake.Frosting.Issues.Reporting.Console.nuspec

@@ -28,26 +28,29 @@ The addin requires Cake Frosting 1.2.0 or higher.
     <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.Reporting.Console.git"/>
     <copyright>Copyright © Pascal Berger</copyright>
     <tags>cake cake-addin cake-issues cake-reportformat issues reporting console</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.Reporting.Console/releases/tag/2.0.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.Reporting.Console/releases/tag/3.0.0</releaseNotes>
     <dependencies>
-      <group targetFramework=".NETStandard2.0">
-        <dependency id="Cake.Core" version="[1.2,2.0)" exclude="Build,Analyzers" />
-        <dependency id="Cake.Issues" version="[1.0,2.0)" exclude="Build,Analyzers" />
-        <dependency id="Cake.Issues.Reporting" version="[1.0,2.0)" exclude="Build,Analyzers" />
-        <dependency id="Errata" version="0.6.0" exclude="Build,Analyzers" />
+      <group targetFramework="net6.0">
+        <dependency id="Cake.Core" version="3.0" exclude="Build,Analyzers" />
+        <dependency id="Cake.Issues" version="[3.0.0-*,4.0)" exclude="Build,Analyzers" />
+        <dependency id="Cake.Issues.Reporting" version="[3.0.0-*,4.0)" exclude="Build,Analyzers" />
+        <dependency id="Errata" version="0.10.0" exclude="Build,Analyzers" />
+      </group>
+      <group targetFramework="net7.0">
+        <dependency id="Cake.Core" version="3.0" exclude="Build,Analyzers" />
+        <dependency id="Cake.Issues" version="[3.0.0-*,4.0)" exclude="Build,Analyzers" />
+        <dependency id="Cake.Issues.Reporting" version="[3.0.0-*,4.0)" exclude="Build,Analyzers" />
+        <dependency id="Errata" version="0.10.0" exclude="Build,Analyzers" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <file src="icon.png" target="" />
-    <file src="..\..\src\Cake.Issues.Reporting.Console\bin\Release\netcoreapp3.1\Cake.Issues.Reporting.Console.dll" target="lib\netcoreapp3.1" />
-    <file src="..\..\src\Cake.Issues.Reporting.Console\bin\Release\netcoreapp3.1\Cake.Issues.Reporting.Console.pdb" target="lib\netcoreapp3.1" />
-    <file src="..\..\src\Cake.Issues.Reporting.Console\bin\Release\netcoreapp3.1\Cake.Issues.Reporting.Console.xml" target="lib\netcoreapp3.1" />
-    <file src="..\..\src\Cake.Issues.Reporting.Console\bin\Release\net5.0\Cake.Issues.Reporting.Console.dll" target="lib\net5.0" />
-    <file src="..\..\src\Cake.Issues.Reporting.Console\bin\Release\net5.0\Cake.Issues.Reporting.Console.pdb" target="lib\net5.0" />
-    <file src="..\..\src\Cake.Issues.Reporting.Console\bin\Release\net5.0\Cake.Issues.Reporting.Console.xml" target="lib\net5.0" />
     <file src="..\..\src\Cake.Issues.Reporting.Console\bin\Release\net6.0\Cake.Issues.Reporting.Console.dll" target="lib\net6.0" />
     <file src="..\..\src\Cake.Issues.Reporting.Console\bin\Release\net6.0\Cake.Issues.Reporting.Console.pdb" target="lib\net6.0" />
     <file src="..\..\src\Cake.Issues.Reporting.Console\bin\Release\net6.0\Cake.Issues.Reporting.Console.xml" target="lib\net6.0" />
+    <file src="..\..\src\Cake.Issues.Reporting.Console\bin\Release\net7.0\Cake.Issues.Reporting.Console.dll" target="lib\net7.0" />
+    <file src="..\..\src\Cake.Issues.Reporting.Console\bin\Release\net7.0\Cake.Issues.Reporting.Console.pdb" target="lib\net7.0" />
+    <file src="..\..\src\Cake.Issues.Reporting.Console\bin\Release\net7.0\Cake.Issues.Reporting.Console.xml" target="lib\net7.0" />
   </files>
 </package>

nuspec/nuget/Cake.Issues.Reporting.Console.nuspec

@@ -28,21 +28,17 @@ The addin requires Cake 1.2.0 or higher.
     <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.Reporting.Console.git"/>
     <copyright>Copyright © Pascal Berger</copyright>
     <tags>cake cake-addin cake-issues cake-reportformat issues reporting console</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.Reporting.Console/releases/tag/2.0.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.Reporting.Console/releases/tag/3.0.0</releaseNotes>
   </metadata>
   <files>
     <file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
-    <file src="netcoreapp3.1/Cake.Issues.Reporting.Console.dll" target="lib\netcoreapp3.1" />
-    <file src="netcoreapp3.1/Cake.Issues.Reporting.Console.pdb" target="lib\netcoreapp3.1" />
-    <file src="netcoreapp3.1/Cake.Issues.Reporting.Console.xml" target="lib\netcoreapp3.1" />
-    <file src="netcoreapp3.1/Errata.dll" target="lib\netcoreapp3.1" />
-    <file src="net5.0/Cake.Issues.Reporting.Console.dll" target="lib\net5.0" />
-    <file src="net5.0/Cake.Issues.Reporting.Console.pdb" target="lib\net5.0" />
-    <file src="net5.0/Cake.Issues.Reporting.Console.xml" target="lib\net5.0" />
-    <file src="net5.0/Errata.dll" target="lib\net5.0" />
     <file src="net6.0/Cake.Issues.Reporting.Console.dll" target="lib\net6.0" />
     <file src="net6.0/Cake.Issues.Reporting.Console.pdb" target="lib\net6.0" />
     <file src="net6.0/Cake.Issues.Reporting.Console.xml" target="lib\net6.0" />
     <file src="net6.0/Errata.dll" target="lib\net6.0" />
+    <file src="net7.0/Cake.Issues.Reporting.Console.dll" target="lib\net7.0" />
+    <file src="net7.0/Cake.Issues.Reporting.Console.pdb" target="lib\net7.0" />
+    <file src="net7.0/Cake.Issues.Reporting.Console.xml" target="lib\net7.0" />
+    <file src="net7.0/Errata.dll" target="lib\net7.0" />
   </files>
 </package>

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.0.1
 
 //*************************************************************************************************
 // Settings
@@ -15,6 +15,7 @@ BuildParameters.SetParameters(
     repositoryName: "Cake.Issues.Reporting.Console",
     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.Reporting.Console.Tests/Cake.Issues.Reporting.Console.Tests.csproj

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Description>Tests for the Cake.Issues.Reporting.Console addin</Description>
     <Authors>Pascal Berger</Authors>
@@ -29,31 +29,31 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Cake.Issues">
-      <Version>2.0.0</Version>
+      <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="Cake.Issues.Reporting">
-      <Version>2.0.0</Version>
+      <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="Cake.Issues.Testing">
-      <Version>2.0.0</Version>
+      <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="Cake.Testing">
-      <Version>2.0.0</Version>
+      <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="Shouldly">
-      <Version>4.0.3</Version>
+      <Version>4.2.1</Version>
     </PackageReference>
     <PackageReference Include="StyleCop.Analyzers">
       <Version>1.1.118</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="xunit">
-      <Version>2.4.1</Version>
+      <Version>2.5.0</Version>
     </PackageReference>
     <PackageReference Include="xunit.runner.visualstudio">
-      <Version>2.4.5</Version>
+      <Version>2.5.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

src/Cake.Issues.Reporting.Console/Cake.Issues.Reporting.Console.csproj

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <Description>Support for reporting issues to the console for the Cake.Issues addin for Cake Build Automation System</Description>
     <Authors>Pascal Berger</Authors>
     <Product>Cake.Issues</Product>
@@ -29,11 +29,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Issues" Version="2.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Issues.Reporting" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Issues" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Issues.Reporting" Version="3.0.0" PrivateAssets="All" />
     <PackageReference Include="Errata" Version="0.10.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

tests/frosting/net6.0/build/Build.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Cake.Frosting" Version="3.0.0" />
+    <PackageReference Include="Cake.Issues" Version="3.0.0-beta0002" />
+    <PackageReference Include="Cake.Issues.Reporting" Version="3.0.0-beta0002" />
+    <PackageReference Include="Cake.Frosting.Issues.Reporting.Console" Version="*-*" />
+  </ItemGroup>
+</Project>