From faeaaef02aabfab424d8189360773e4ad95ab8f1 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Tue, 6 Feb 2024 12:50:01 -0500
Subject: [PATCH] Remove .NET 6 from auto-builds (fixes #646)

---
 CHANGELIST.md   |  4 ++++
 appveyor.yml    | 12 ------------
 publish-nix.sh  |  6 +++---
 publish-win.ps1 |  4 ++--
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 4e216f54..7a1c7906 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -1,3 +1,7 @@
+### WIP (xxxx-xx-xx)
+
+- Remove .NET 6 from auto-builds
+
 ### 3.1.0 (2024-02-06)
 
 - Update RedumpLib
diff --git a/appveyor.yml b/appveyor.yml
index 886edbe0..78c0f7da 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,18 +12,6 @@ image: Visual Studio 2022
 build_script:
   - dotnet restore
 
-  # .NET 6.0 Debug
-  - dotnet publish MPF\MPF.csproj -f net6.0-windows -r win-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
-  - dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r win-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
-  - dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r linux-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
-  - dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r osx-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
-
-  # .NET 6.0 Release
-  - dotnet publish MPF\MPF.csproj -f net6.0-windows -r win-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
-  - dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r win-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
-  - dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r linux-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
-  - dotnet publish MPF.Check\MPF.Check.csproj -f net6.0 -r osx-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
-
   # .NET 8.0 Debug
   - dotnet publish MPF\MPF.csproj -f net8.0-windows -r win-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
   - dotnet publish MPF.Check\MPF.Check.csproj -f net8.0 -r win-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:PublishSingleFile=true
diff --git a/publish-nix.sh b/publish-nix.sh
index 82d12f4a..8429a88b 100755
--- a/publish-nix.sh
+++ b/publish-nix.sh
@@ -12,7 +12,7 @@
 
 # Optional parameters
 USE_ALL=false
-INCLUDE_PROGRAMS=false # TODO: Figure out how to exclude folders with `zip`
+INCLUDE_PROGRAMS=false
 NO_BUILD=false
 NO_ARCHIVE=false
 while getopts "upba" OPTION
@@ -44,9 +44,9 @@ BUILD_FOLDER=$PWD
 COMMIT=`git log --pretty=%H -1`
 
 # Create the build matrix arrays
-UI_FRAMEWORKS=("net6.0-windows" "net8.0-windows")
+UI_FRAMEWORKS=("net8.0-windows")
 UI_RUNTIMES=("win-x64")
-CHECK_FRAMEWORKS=("net6.0" "net8.0")
+CHECK_FRAMEWORKS=("net8.0")
 CHECK_RUNTIMES=("win-x64" "linux-x64" "osx-x64")
 
 # Use expanded lists, if requested
diff --git a/publish-win.ps1 b/publish-win.ps1
index 71bb8dfc..181b1ae0 100644
--- a/publish-win.ps1
+++ b/publish-win.ps1
@@ -34,9 +34,9 @@ $BUILD_FOLDER = $PSScriptRoot
 $COMMIT = git log --pretty=format:"%H" -1
 
 # Create the build matrix arrays
-$UI_FRAMEWORKS = @('net6.0-windows', 'net8.0-windows')
+$UI_FRAMEWORKS = @('net8.0-windows')
 $UI_RUNTIMES = @('win-x64')
-$CHECK_FRAMEWORKS = @('net6.0', 'net8.0')
+$CHECK_FRAMEWORKS = @('net8.0')
 $CHECK_RUNTIMES = @('win-x64', 'linux-x64', 'osx-x64')
 
 # Use expanded lists, if requested