From f8e346f80a59d0362a68266038c7bea0b963a6dc Mon Sep 17 00:00:00 2001
From: Mikayla Hutchinson <m.j.hutchinson@gmail.com>
Date: Thu, 9 May 2024 18:56:43 -0400
Subject: [PATCH] Update target frameworks

---
 .github/workflows/main.yml                       | 1 -
 Core.Tests/MonoDevelop.Xml.Core.Tests.csproj     | 3 ++-
 Core/MonoDevelop.Xml.Core.csproj                 | 6 +++---
 Editor.Tests/MonoDevelop.Xml.Editor.Tests.csproj | 4 ++--
 Editor/MonoDevelop.Xml.Editor.csproj             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8e02cc8..947a726 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,6 @@ jobs:
     - uses: actions/setup-dotnet@v2
       with:
         dotnet-version: |
-          6.0.x
           8.0.x
 
     - name: Restore
diff --git a/Core.Tests/MonoDevelop.Xml.Core.Tests.csproj b/Core.Tests/MonoDevelop.Xml.Core.Tests.csproj
index aacebf0..abb18d8 100644
--- a/Core.Tests/MonoDevelop.Xml.Core.Tests.csproj
+++ b/Core.Tests/MonoDevelop.Xml.Core.Tests.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net481;net8.0</TargetFrameworks>
     <NUnitDisableSupportAssemblies>true</NUnitDisableSupportAssemblies>
     <RootNamespace>MonoDevelop.Xml.Tests</RootNamespace>
   </PropertyGroup>
diff --git a/Core/MonoDevelop.Xml.Core.csproj b/Core/MonoDevelop.Xml.Core.csproj
index c491e39..bc6e43d 100644
--- a/Core/MonoDevelop.Xml.Core.csproj
+++ b/Core/MonoDevelop.Xml.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net481;net8.0</TargetFrameworks>
     <!--
     The assembly is called MonoDevelop.Xml.Core so as not to conflict with the original extension assembly in MonoDevelop
     but the root namespace is still MonoDevelop.Xml
@@ -11,12 +11,12 @@
 
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <Nullable Condition="$(TargetFramework)=='net48'">annotations</Nullable>
+    <Nullable Condition="$(TargetFramework)=='net481'">annotations</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="System.Collections.Immutable" />
-    <PackageReference Include="Microsoft.Bcl.HashCode" Condition="'$(TargetFramework)'=='net48'" />
+    <PackageReference Include="Microsoft.Bcl.HashCode" Condition="'$(TargetFramework)'=='net481'" />
   </ItemGroup>
 </Project>
diff --git a/Editor.Tests/MonoDevelop.Xml.Editor.Tests.csproj b/Editor.Tests/MonoDevelop.Xml.Editor.Tests.csproj
index acd338e..33412f3 100644
--- a/Editor.Tests/MonoDevelop.Xml.Editor.Tests.csproj
+++ b/Editor.Tests/MonoDevelop.Xml.Editor.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net481;net8.0</TargetFrameworks>
     <NUnitDisableSupportAssemblies>true</NUnitDisableSupportAssemblies>
   </PropertyGroup>
 
diff --git a/Editor/MonoDevelop.Xml.Editor.csproj b/Editor/MonoDevelop.Xml.Editor.csproj
index 885592f..519baac 100644
--- a/Editor/MonoDevelop.Xml.Editor.csproj
+++ b/Editor/MonoDevelop.Xml.Editor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net481;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>