From dc0693b2f93b057dc4a8d4e92dc3cc04cde34eea Mon Sep 17 00:00:00 2001
From: Bastian Eicher <bastian@eicher.net>
Date: Wed, 27 Dec 2023 21:16:58 +0100
Subject: [PATCH] Added .NET 8.0 build target

---
 doc/build.ps1                                          |  2 +-
 src/Sample/Sample.csproj                               |  6 +++---
 .../StructureEditor.WinForms.csproj                    | 10 +++++++---
 src/StructureEditor/StructureEditor.csproj             |  4 ++--
 src/UnitTests/UnitTests.csproj                         |  6 +++---
 src/build.ps1                                          |  2 +-
 src/test.ps1                                           |  2 +-
 7 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/doc/build.ps1 b/doc/build.ps1
index b9cdf0ce..b516bbf0 100644
--- a/doc/build.ps1
+++ b/doc/build.ps1
@@ -2,7 +2,7 @@
 pushd $PSScriptRoot
 
 function Run-DotNet {
-    ..\0install.ps1 run --batch --version 6.0.. https://apps.0install.net/dotnet/sdk.xml @args
+    ..\0install.ps1 run --batch --version 8.0.. https://apps.0install.net/dotnet/sdk.xml @args
     if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
 }
 
diff --git a/src/Sample/Sample.csproj b/src/Sample/Sample.csproj
index 7e0fb66d..459823d6 100644
--- a/src/Sample/Sample.csproj
+++ b/src/Sample/Sample.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <AssemblyName>NanoByte.StructureEditor.Sample</AssemblyName>
     <RootNamespace>NanoByte.StructureEditor.Sample</RootNamespace>
-    <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
     <UseWindowsForms>True</UseWindowsForms>
     <OutputType>WinExe</OutputType>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
@@ -14,9 +14,9 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(MSBuildRuntimeType)'=='Core'">
     <!-- .NET Core MSBuild does not support non-primitive resources (e.g., images) for .NET Framework -->
-    <TargetFrameworks>net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
+  <PropertyGroup Condition="'$(TargetFramework)'=='net8.0-windows'">
     <!-- Run nullability analysis only on annotated frameworks -->
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/StructureEditor.WinForms/StructureEditor.WinForms.csproj b/src/StructureEditor.WinForms/StructureEditor.WinForms.csproj
index c1da790e..049e452f 100644
--- a/src/StructureEditor.WinForms/StructureEditor.WinForms.csproj
+++ b/src/StructureEditor.WinForms/StructureEditor.WinForms.csproj
@@ -6,16 +6,16 @@
     <RootNamespace>NanoByte.StructureEditor.WinForms</RootNamespace>
     <Description>WinForms controls for building split-screen editors for data structures</Description>
     <PackageTags>WinForms;split-screen;editor;data structures</PackageTags>
-    <TargetFrameworks>net45;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net45;net6.0-windows;net8.0-windows</TargetFrameworks>
     <UseWindowsForms>True</UseWindowsForms>
     <OutputPath>..\..\artifacts\$(Configuration)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(MSBuildRuntimeType)'=='Core'">
     <!-- .NET Core MSBuild does not support non-primitive resources (e.g., images) for .NET Framework -->
-    <TargetFrameworks>net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
+  <PropertyGroup Condition="'$(TargetFramework)'=='net6.0-windows' Or '$(TargetFramework)'=='net8.0-windows'">
     <!-- Run nullability analysis only on annotated frameworks -->
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -43,6 +43,10 @@
       <PackagePath>lib/net6.0-windows7.0</PackagePath>
       <Pack>true</Pack>
     </None>
+    <None Include="..\..\lib\ICSharpCode.TextEditor.*">
+      <PackagePath>lib/net8.0-windows7.0</PackagePath>
+      <Pack>true</Pack>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/src/StructureEditor/StructureEditor.csproj b/src/StructureEditor/StructureEditor.csproj
index 08ff4512..e67efd3d 100644
--- a/src/StructureEditor/StructureEditor.csproj
+++ b/src/StructureEditor/StructureEditor.csproj
@@ -6,10 +6,10 @@
     <RootNamespace>NanoByte.StructureEditor</RootNamespace>
     <Description>UI-agnostic base logic for building split-screen editors for data structures</Description>
     <PackageTags>split-screen;editor;data structures</PackageTags>
-    <TargetFrameworks>net45;net6.0</TargetFrameworks>
+    <TargetFrameworks>net45;net6.0;net8.0</TargetFrameworks>
     <OutputPath>..\..\artifacts\$(Configuration)\</OutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='net6.0'">
+  <PropertyGroup Condition="'$(TargetFramework)'=='net6.0' Or '$(TargetFramework)'=='net8.0'">
     <!-- Run nullability analysis only on annotated frameworks -->
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
index 4eb7575e..cd677989 100644
--- a/src/UnitTests/UnitTests.csproj
+++ b/src/UnitTests/UnitTests.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <AssemblyName>NanoByte.StructureEditor.UnitTests</AssemblyName>
     <RootNamespace>NanoByte.StructureEditor</RootNamespace>
-    <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <SignAssembly>False</SignAssembly>
     <IsPackable>False</IsPackable>
@@ -12,9 +12,9 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(MSBuildRuntimeType)'=='Core'">
     <!-- .NET Core MSBuild does not support non-primitive resources (e.g., images) for .NET Framework -->
-    <TargetFrameworks>net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework)=='net6.0-windows'">
+  <PropertyGroup Condition="$(TargetFramework)=='net8.0-windows'">
     <!-- Run nullability analysis only on annotated frameworks -->
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/build.ps1 b/src/build.ps1
index 2351869b..693f4bfa 100644
--- a/src/build.ps1
+++ b/src/build.ps1
@@ -12,7 +12,7 @@ function Find-MSBuild {
 }
 
 function Run-DotNet {
-    ..\0install.ps1 run --batch --version 6.0.. https://apps.0install.net/dotnet/sdk.xml @args
+    ..\0install.ps1 run --batch --version 8.0.. https://apps.0install.net/dotnet/sdk.xml @args
     if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
 }
 
diff --git a/src/test.ps1 b/src/test.ps1
index bab6bf05..4f7bd0c8 100644
--- a/src/test.ps1
+++ b/src/test.ps1
@@ -2,7 +2,7 @@
 pushd $PSScriptRoot
 
 function Run-DotNet {
-    ..\0install.ps1 run --batch --version 6.0..!6.1 https://apps.0install.net/dotnet/sdk.xml @args
+    ..\0install.ps1 run --batch --version 8.0..!8.1 https://apps.0install.net/dotnet/sdk.xml @args
     if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
 }