From a066a5234a4c2261da73d519aaa1876f3dd356f2 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 6 Nov 2023 20:57:03 -0500 Subject: [PATCH] Remove .NET Framework 4.8 from build --- CHANGELIST.md | 4 ++++ README.md | 4 ++-- appveyor.yml | 8 -------- publish-win.bat | 18 ------------------ 4 files changed, 6 insertions(+), 28 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index d76bef46..cc002d3e 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -1,3 +1,7 @@ +### WIP (xxxx-xx-xx) + +- Remove .NET Framework 4.8 from build + ### 2.7.5 (2023-11-06) - Remove psxt001z Pkg Ref in MPF.Test (Deterous) diff --git a/README.md b/README.md index d6f95d62..7974749c 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ The main UI has some known limitations that are documented in code and in some p To build for .NET Framework 4.8, .NET 6.0, or .NET 7.0 (all Windows only), ensure that the .NET 7.0 SDK (or later) is installed and included in your PATH. Then, run the following commands from command prompt, Powershell, or Terminal: ``` -dotnet build MPF\MPF.csproj --framework [net48|net6.0-windows|net7.0-windows] --runtime win-x64 --self-contained +dotnet build MPF\MPF.csproj --framework [net6.0-windows|net7.0-windows] --runtime win-x64 --self-contained ``` You may also run `publish-win.bat` (on Windows) or `publish-nix.sh` (on Linux) to build and package all variants MPF and MPF.Check at once. The Windows script additionally requires 7-zip commandline, Git for Windows, and .NET Framework 4.8 SDK to be installed and in PATH. The Linux script additionally requires `zip` and Git to be installed and in PATH. @@ -64,7 +64,7 @@ MPF.Check is a commandline-only program that allows users to generate submission To build for .NET Framework 4.8 (Windows only), .NET 6.0, and .NET 7.0 (both all supported OSes), ensure that the .NET 7.0 SDK (or later) is installed and included in your PATH. Then, run the following commands from command prompt, Powershell, Terminal, or shell: ``` -dotnet build MPF.Check\MPF.Check.csproj --framework [net48|net6.0|net7.0] --runtime [win-x64|linux-x64|osx-x64] --self-contained +dotnet build MPF.Check\MPF.Check.csproj --framework [net6.0|net7.0] --runtime [win-x64|linux-x64|osx-x64] --self-contained ``` Choose one of `[win-x64|linux-x64|osx-x64]` depending on the machine you are targeting. diff --git a/appveyor.yml b/appveyor.yml index 225403df..845bdd90 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,14 +12,6 @@ image: Visual Studio 2022 build_script: - dotnet restore - # .NET Framework 4.8 Debug - - dotnet publish MPF\MPF.csproj -f net48 -r win7-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% - - dotnet publish MPF.Check\MPF.Check.csproj -f net48 -r win7-x64 -c Debug --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% - - # .NET Framework 4.8 Release - - dotnet publish MPF\MPF.csproj -f net48 -r win7-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:DebugType=None -p:DebugSymbols=false - - dotnet publish MPF.Check\MPF.Check.csproj -f net48 -r win7-x64 -c Release --self-contained true --version-suffix %APPVEYOR_REPO_COMMIT% -p:DebugType=None -p:DebugSymbols=false - # .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 diff --git a/publish-win.bat b/publish-win.bat index a820e1ae..a69e8f9e 100644 --- a/publish-win.bat +++ b/publish-win.bat @@ -21,16 +21,6 @@ REM Restore Nuget packages for all builds echo Restoring Nuget packages dotnet restore -REM .NET Framework 4.8 Debug -echo Building .NET Framework 4.8 debug -dotnet publish MPF\MPF.csproj -f net48 -r win7-x64 -c Debug --self-contained true --version-suffix %COMMIT% -dotnet publish MPF.Check\MPF.Check.csproj -f net48 -r win7-x64 -c Debug --self-contained true --version-suffix %COMMIT% - -REM .NET Framework 4.8 Release -echo Building .NET Framework 4.8 release -dotnet publish MPF\MPF.csproj -f net48 -r win7-x64 -c Release --self-contained true --version-suffix %COMMIT% -p:DebugType=None -p:DebugSymbols=false -dotnet publish MPF.Check\MPF.Check.csproj -f net48 -r win7-x64 -c Release --self-contained true --version-suffix %COMMIT% -p:DebugType=None -p:DebugSymbols=false - REM .NET 6.0 Debug echo Building .NET 6.0 debug dotnet publish MPF\MPF.csproj -f net6.0-windows -r win-x64 -c Debug --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true @@ -60,24 +50,18 @@ dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r linux-x64 -c Release --se dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r osx-x64 -c Release --self-contained true --version-suffix %COMMIT% -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false REM Create MPF Debug archives -cd %BUILD_FOLDER%\MPF\bin\Debug\net48\win7-x64\publish\ -7z a -tzip %BUILD_FOLDER%\MPF_net48_debug.zip * cd %BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win-x64\publish\ 7z a -tzip %BUILD_FOLDER%\MPF_net6.0_win-x64_debug.zip * cd %BUILD_FOLDER%\MPF\bin\Debug\net7.0-windows\win-x64\publish\ 7z a -tzip %BUILD_FOLDER%\MPF_net7.0_win-x64_debug.zip * REM Create MPF Release archives -cd %BUILD_FOLDER%\MPF\bin\Release\net48\win7-x64\publish\ -7z a -tzip %BUILD_FOLDER%\MPF_net48_release.zip * cd %BUILD_FOLDER%\MPF\bin\Release\net6.0-windows\win-x64\publish\ 7z a -tzip %BUILD_FOLDER%\MPF_net6.0_win-x64_release.zip * cd %BUILD_FOLDER%\MPF\bin\Release\net7.0-windows\win-x64\publish\ 7z a -tzip %BUILD_FOLDER%\MPF_net7.0_win-x64_release.zip * REM Create MPF.Check Debug archives -cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net48\win7-x64\publish\ -7z a -tzip %BUILD_FOLDER%\MPF.Check_net48_debug.zip * cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win-x64\publish\ 7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_win-x64_debug.zip * cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\linux-x64\publish\ @@ -92,8 +76,6 @@ cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net7.0\osx-x64\publish\ 7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_osx-x64_debug.zip * REM Create MPF.Check Release archives -cd %BUILD_FOLDER%\MPF.Check\bin\Release\net48\win7-x64\publish\ -7z a -tzip %BUILD_FOLDER%\MPF.Check_net48_release.zip * cd %BUILD_FOLDER%\MPF.Check\bin\Release\net6.0\win-x64\publish\ 7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_win-x64_release.zip * cd %BUILD_FOLDER%\MPF.Check\bin\Release\net6.0\linux-x64\publish\