From 04535e980ba7ddc79b854a326b307570ece6015d Mon Sep 17 00:00:00 2001
From: "C. Augusto Proiete" <augusto@proiete.com>
Date: Thu, 17 Nov 2022 22:40:57 -0500
Subject: [PATCH] Update Cake.ISO to target Cake v3.0.0 (#28)

---
 .config/dotnet-tools.json                 |  2 +-
 .github/workflows/ci.yml                  | 14 +++++---------
 Directory.Build.props                     |  2 +-
 build.cake                                |  4 ++--
 global.json                               |  2 +-
 recipe.cake                               | 22 ----------------------
 src/Cake.ISO/Cake.ISO.csproj              |  4 ++--
 test/Cake.ISO.Tests/Cake.ISO.Tests.csproj |  6 +++---
 8 files changed, 15 insertions(+), 41 deletions(-)
 delete mode 100644 recipe.cake

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index f7bde65..6e12d14 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "2.3.0",
+      "version": "3.0.0",
       "commands": [
         "dotnet-cake"
       ]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73b9f35..35b278f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             build: ./build.sh
             push: true
           - os: windows-2022
@@ -36,18 +36,14 @@ jobs:
     name: ${{ matrix.job.os }}
     runs-on: ${{ matrix.job.os }}
     steps:
-      - name: Setup netcoreapp3.1
-        uses: actions/setup-dotnet@v3.0.3
-        with:
-          dotnet-version: "3.1.425"
-      - name: Setup net5.0
-        uses: actions/setup-dotnet@v3.0.3
-        with:
-          dotnet-version: "5.0.403"
       - name: Setup net6.0
         uses: actions/setup-dotnet@v3.0.3
         with:
           dotnet-version: "6.0.403"
+      - name: Setup net7.0
+        uses: actions/setup-dotnet@v3.0.3
+        with:
+          dotnet-version: "7.0.100"
       - name: Run dotnet --info
         run: dotnet --info
       - uses: actions/checkout@v3.1.0
diff --git a/Directory.Build.props b/Directory.Build.props
index 77f36af..84a0a16 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
 
     <NoWarn>$(NoWarn);NU5048;CS8032</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/build.cake b/build.cake
index 986fcb3..99282c6 100644
--- a/build.cake
+++ b/build.cake
@@ -1,5 +1,5 @@
-#addin "nuget:?package=Cake.MinVer&version=2.0.0"
-#addin "nuget:?package=Cake.Args&version=2.0.0"
+#addin "nuget:?package=Cake.MinVer&version=3.0.0"
+#addin "nuget:?package=Cake.Args&version=3.0.0"
 
 var target       = ArgumentOrDefault<string>("target") ?? "pack";
 var buildVersion = MinVer(s => s.WithTagPrefix("v").WithDefaultPreReleasePhase("preview"));
diff --git a/global.json b/global.json
index cb771af..2c23bfe 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
     "allowPrerelease": false,
-    "version": "6.0.100",
+    "version": "7.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/recipe.cake b/recipe.cake
deleted file mode 100644
index 34e2669..0000000
--- a/recipe.cake
+++ /dev/null
@@ -1,22 +0,0 @@
-#load nuget:?package=Cake.Recipe&version=1.1.0
-
-Environment.SetVariableNames();
-
-BuildParameters.SetParameters(context: Context,
-                            buildSystem: BuildSystem,
-                            sourceDirectoryPath: "./src",
-                            title: "Cake.ISO",
-                            repositoryOwner: "cake-contrib",
-                            repositoryName: "Cake.ISO",
-                            appVeyorAccountName: "cakecontrib",
-                            shouldRunDupFinder: false,
-                            shouldRunGitVersion: true);
-
-BuildParameters.PrintParameters(Context);
-
-ToolSettings.SetToolSettings(context: Context,
-                            testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]*  -[Moq]*",
-                            testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
-                            testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
-
-Build.RunDotNetCore();
diff --git a/src/Cake.ISO/Cake.ISO.csproj b/src/Cake.ISO/Cake.ISO.csproj
index 0b103af..178869f 100644
--- a/src/Cake.ISO/Cake.ISO.csproj
+++ b/src/Cake.ISO/Cake.ISO.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <RootNamespace>Cake.ISO</RootNamespace>
 
     <AssemblyName>Cake.ISO</AssemblyName>
@@ -45,7 +45,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
 
     <PackageReference Include="DiscUtils.Core" Version="0.16.13" />
     <PackageReference Include="DiscUtils.Iso9660" Version="0.16.13" />
diff --git a/test/Cake.ISO.Tests/Cake.ISO.Tests.csproj b/test/Cake.ISO.Tests/Cake.ISO.Tests.csproj
index df203bf..839fc9c 100644
--- a/test/Cake.ISO.Tests/Cake.ISO.Tests.csproj
+++ b/test/Cake.ISO.Tests/Cake.ISO.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -8,8 +8,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.0.0" />
-    <PackageReference Include="Cake.Testing" Version="2.0.0" />
+    <PackageReference Include="Cake.Core" Version="3.0.0" />
+    <PackageReference Include="Cake.Testing" Version="3.0.0" />
 
     <PackageReference Include="Moq" Version="4.18.2" />