From 52666a9efa87b05fd5023093df4a269d5951995c Mon Sep 17 00:00:00 2001
From: vers-one <12114169+vers-one@users.noreply.github.com>
Date: Thu, 24 Nov 2022 12:12:01 -0500
Subject: [PATCH] Migrate tests and console demo app to .NET 7 (#72)

* Migrate tests and console demo app to .NET 7

* Upgrade setup-msbuild action to v1.1.3
---
 .github/workflows/build.yml                               | 8 ++++----
 .github/workflows/generate-docs.yml                       | 6 +++---
 .github/workflows/publish-to-nuget.yml                    | 8 ++++----
 .github/workflows/release.yml                             | 8 ++++----
 .github/workflows/test.yml                                | 7 +++----
 Source/EpubReader.sln                                     | 2 ++
 .../VersOne.Epub.ConsoleDemo.csproj                       | 2 +-
 7 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a7b8ebc..2291011 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,13 +22,13 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install .NET Core
-      uses: actions/setup-dotnet@v1
+    - name: Install .NET
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.302
+        dotnet-version: 7
 
     - name: Setup MSBuild
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v1.1.3
 
     - name: Restore dependencies
       run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration /p:RestorePackagesConfig=true
diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 3e437a7..6d56b55 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -25,10 +25,10 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install .NET Core
-      uses: actions/setup-dotnet@v1
+    - name: Install .NET
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.302
+        dotnet-version: 7
 
     - name: Restore dependencies
       run: dotnet restore .\Source\VersOne.Epub\VersOne.Epub.csproj
diff --git a/.github/workflows/publish-to-nuget.yml b/.github/workflows/publish-to-nuget.yml
index eacefd6..b9c5bd6 100644
--- a/.github/workflows/publish-to-nuget.yml
+++ b/.github/workflows/publish-to-nuget.yml
@@ -16,13 +16,13 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install .NET 6
-      uses: actions/setup-dotnet@v1
+    - name: Install .NET
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.302
+        dotnet-version: 7
 
     - name: Setup MSBuild
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v1.1.3
 
     - name: Restore dependencies
       run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration /p:RestorePackagesConfig=true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f2cc25c..6a5fae1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,13 +22,13 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install .NET 6
-      uses: actions/setup-dotnet@v1
+    - name: Install .NET
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.302
+        dotnet-version: 7
 
     - name: Setup MSBuild
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v1.1.3
 
     - name: Restore dependencies
       run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration /p:RestorePackagesConfig=true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d97b52b..ae1d47e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,11 +21,10 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install .NET Core
-      uses: actions/setup-dotnet@v1
+    - name: Install .NET
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.x'
-        include-prerelease: true
+        dotnet-version: 7
 
     - name: Build test project and its dependencies
       run: dotnet build Source\VersOne.Epub.Test -c $env:Configuration
diff --git a/Source/EpubReader.sln b/Source/EpubReader.sln
index e0f0b90..c94e171 100644
--- a/Source/EpubReader.sln
+++ b/Source/EpubReader.sln
@@ -35,7 +35,9 @@ Global
 		{A6ED4735-3D37-4E44-BEE4-218C6BBAC1BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6ED4735-3D37-4E44-BEE4-218C6BBAC1BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2FCDA010-24D2-43E4-B58C-07E88434A966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FCDA010-24D2-43E4-B58C-07E88434A966}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2FCDA010-24D2-43E4-B58C-07E88434A966}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2FCDA010-24D2-43E4-B58C-07E88434A966}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Source/VersOne.Epub.ConsoleDemo/VersOne.Epub.ConsoleDemo.csproj b/Source/VersOne.Epub.ConsoleDemo/VersOne.Epub.ConsoleDemo.csproj
index daf5669..1a1e82a 100644
--- a/Source/VersOne.Epub.ConsoleDemo/VersOne.Epub.ConsoleDemo.csproj
+++ b/Source/VersOne.Epub.ConsoleDemo/VersOne.Epub.ConsoleDemo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
         <Authors>vers</Authors>
         <Copyright>vers, 2015-2022</Copyright>