From 6a8c635d1a3a5a9ae9b93286c97c18e2eef308a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Lozier?= <slozier@users.noreply.github.com>
Date: Fri, 8 Sep 2023 21:07:55 -0400
Subject: [PATCH] Run tests on .NET 8.0

---
 .github/workflows/main.yml                            |  8 ++++++++
 Build/steps.yml                                       | 11 +++++++++--
 Tests/Metadata/Metadata.csproj                        |  2 +-
 .../Microsoft.Dynamic.Test.csproj                     |  2 +-
 .../Microsoft.Scripting.Test.csproj                   |  2 +-
 make.ps1                                              |  2 +-
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4fdd10c4..8eb387a2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,6 +22,11 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '6.0.x'
+    - name: Setup .NET 8.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '8.0.x'
+        include-prerelease: true
     - name: Build
       run: pwsh make.ps1
     - name: Package
@@ -39,3 +44,6 @@ jobs:
     - name: Test (net6.0)
       run: ./make.ps1 -frameworks net6.0 test-all
       shell: pwsh
+    - name: Test (net8.0)
+      run: ./make.ps1 -frameworks net8.0 test-all
+      shell: pwsh
diff --git a/Build/steps.yml b/Build/steps.yml
index 0b09ce1e..fef07f0f 100644
--- a/Build/steps.yml
+++ b/Build/steps.yml
@@ -28,11 +28,18 @@ steps:
       version: '3.1.x'
 
   - task: UseDotNet@2
-    displayName: Install .NET 6.0 SDK for build
+    displayName: Install .NET 6.0 runtime for testing
     inputs:
-      packageType: 'sdk'
+      packageType: 'runtime'
       version: '6.0.x'
 
+  - task: UseDotNet@2
+    displayName: Install .NET 8.0 SDK for build
+    inputs:
+      packageType: 'sdk'
+      version: '8.0.x'
+      includePreviewVersions: true
+
   # Set Mono version on macOS
   - ${{ if eq(parameters.os, 'macOS') }}:
     - task: ms-devlabs.utilitytasks.task-Shellpp.Shell++@0
diff --git a/Tests/Metadata/Metadata.csproj b/Tests/Metadata/Metadata.csproj
index 4d7374f9..ae90f462 100644
--- a/Tests/Metadata/Metadata.csproj
+++ b/Tests/Metadata/Metadata.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
     <!-- EOL netcoreapp3.1 is used to test netstandard2.0 assemblies -->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <OutputType>Exe</OutputType>
diff --git a/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj b/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj
index 39eef772..a244b8e5 100644
--- a/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj
+++ b/Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
     <!-- EOL netcoreapp3.1 is used to test netstandard2.0 assemblies -->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
diff --git a/Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj b/Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj
index 59cf05a4..3fd1c99c 100644
--- a/Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj
+++ b/Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
     <!-- EOL netcoreapp3.1 is used to test netstandard2.0 assemblies -->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
diff --git a/make.ps1 b/make.ps1
index 0deaa250..d41161f2 100755
--- a/make.ps1
+++ b/make.ps1
@@ -4,7 +4,7 @@ Param(
     [Parameter(Position=1)]
     [String] $target = "release",
     [String] $configuration = "Release",
-    [String[]] $frameworks=@('net462','netcoreapp3.1','net6.0'),
+    [String[]] $frameworks=@('net462','netcoreapp3.1','net6.0','net8.0'),
     [String] $platform = "x64",
     [switch] $runIgnored
 )