From b428bc0ba0573d86cb85211227d4b0513cdddcb2 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 24 Apr 2023 21:31:39 -0400 Subject: [PATCH] Be more specific with runtime identifiers --- CHANGELIST.md | 1 + MPF.Check/MPF.Check.csproj | 2 +- MPF.Core/MPF.Core.csproj | 2 +- MPF.CueSheets/MPF.CueSheets.csproj | 2 +- MPF.Library/MPF.Library.csproj | 2 +- MPF.Modules/MPF.Modules.csproj | 2 +- MPF.UI.Core/MPF.UI.Core.csproj | 2 +- MPF/MPF.csproj | 2 +- RedumpLib/RedumpLib.csproj | 2 +- appveyor.yml | 117 +++++++++++++++++------------ 10 files changed, 77 insertions(+), 57 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index f4e2733d..02abd546 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -40,6 +40,7 @@ - Fix upcoming suppl DAT parsing - Ensure blank lines don't interfere - De-indent ringcode data +- Be more specific with runtime identifiers ### 2.5 (2023-03-12) diff --git a/MPF.Check/MPF.Check.csproj b/MPF.Check/MPF.Check.csproj index 5b99f1f7..2c894108 100644 --- a/MPF.Check/MPF.Check.csproj +++ b/MPF.Check/MPF.Check.csproj @@ -2,7 +2,7 @@ net48;net6.0 - win7-x64;win-x86;win-x64;linux-x64;osx-x64 + win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64 Exe MPF Check MPF.Check diff --git a/MPF.Core/MPF.Core.csproj b/MPF.Core/MPF.Core.csproj index 7c56e318..0d26a21c 100644 --- a/MPF.Core/MPF.Core.csproj +++ b/MPF.Core/MPF.Core.csproj @@ -2,7 +2,7 @@ net48;net6.0 - win7-x64;win-x86;win-x64;linux-x64;osx-x64 + win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64 Matt Nadareski;ReignStumble;Jakz Copyright (c)2019-2023 https://github.com/SabreTools/MPF diff --git a/MPF.CueSheets/MPF.CueSheets.csproj b/MPF.CueSheets/MPF.CueSheets.csproj index 20398ccd..6dae7477 100644 --- a/MPF.CueSheets/MPF.CueSheets.csproj +++ b/MPF.CueSheets/MPF.CueSheets.csproj @@ -2,7 +2,7 @@ net48;net6.0 - win7-x64;win-x86;win-x64;linux-x64;osx-x64 + win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64 Matt Nadareski;ReignStumble;Jakz Copyright (c)2019-2023 https://github.com/SabreTools/MPF diff --git a/MPF.Library/MPF.Library.csproj b/MPF.Library/MPF.Library.csproj index 0493f71f..8f2b40dd 100644 --- a/MPF.Library/MPF.Library.csproj +++ b/MPF.Library/MPF.Library.csproj @@ -2,7 +2,7 @@ net48;net6.0 - win7-x64;win-x86;win-x64;linux-x64;osx-x64 + win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64 MPF.Library Matt Nadareski;ReignStumble;Jakz Copyright (c)2019-2023 diff --git a/MPF.Modules/MPF.Modules.csproj b/MPF.Modules/MPF.Modules.csproj index 85b65a39..402f020d 100644 --- a/MPF.Modules/MPF.Modules.csproj +++ b/MPF.Modules/MPF.Modules.csproj @@ -2,7 +2,7 @@ net48;net6.0 - win7-x64;win-x86;win-x64;linux-x64;osx-x64 + win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64 Matt Nadareski;ReignStumble;Jakz Copyright (c)2019-2023 https://github.com/SabreTools/MPF diff --git a/MPF.UI.Core/MPF.UI.Core.csproj b/MPF.UI.Core/MPF.UI.Core.csproj index 7ad9c6c4..75412619 100644 --- a/MPF.UI.Core/MPF.UI.Core.csproj +++ b/MPF.UI.Core/MPF.UI.Core.csproj @@ -2,7 +2,7 @@ net48;net6.0-windows - win7-x64;win-x86;win-x64 + win7-x64;win8-x64;win81-x64;win10-x64 true true MPF.UI.Core diff --git a/MPF/MPF.csproj b/MPF/MPF.csproj index 6e19c442..57346631 100644 --- a/MPF/MPF.csproj +++ b/MPF/MPF.csproj @@ -2,7 +2,7 @@ net48;net6.0-windows - win7-x64;win-x86;win-x64 + win7-x64;win8-x64;win81-x64;win10-x64 WinExe true true diff --git a/RedumpLib/RedumpLib.csproj b/RedumpLib/RedumpLib.csproj index 0069cc48..27d5222b 100644 --- a/RedumpLib/RedumpLib.csproj +++ b/RedumpLib/RedumpLib.csproj @@ -2,7 +2,7 @@ net48;net6.0 - win7-x64;win-x86;win-x64;linux-x64;osx-x64 + win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64 false diff --git a/appveyor.yml b/appveyor.yml index 1206c607..14dd589b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,12 +29,14 @@ build_script: - msbuild MPF.Check\MPF.Check.csproj -target:Publish -property:TargetFramework=net48 -property:RuntimeIdentifiers=win7-x64 # .NET 6.0 - - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win-x86 --self-contained true - - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win-x64 --self-contained true - #- dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime linux-x64 --self-contained true - #- dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime osx-x64 --self-contained true - - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win-x86 --self-contained true -p:PublishSingleFile=true - - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win-x64 --self-contained true -p:PublishSingleFile=true + - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win7-x64 --self-contained true + - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win8-x64 --self-contained true + - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win81-x64 --self-contained true + - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win10-x64 --self-contained true + - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win7-x64 --self-contained true -p:PublishSingleFile=true + - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win8-x64 --self-contained true -p:PublishSingleFile=true + - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win81-x64 --self-contained true -p:PublishSingleFile=true + - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win10-x64 --self-contained true -p:PublishSingleFile=true - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime linux-x64 --self-contained true -p:PublishSingleFile=true - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime osx-x64 --self-contained true -p:PublishSingleFile=true @@ -44,63 +46,76 @@ after_build: # Aaru - ps: appveyor DownloadFile https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_windows_x64.zip - 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net48\publish\Programs\Aaru * -- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win-x64\publish\Programs\Aaru * -- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win-x86\publish\Programs\Aaru * -#- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\linux-x64\publish\Programs\Aaru * -#- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\osx-x64\publish\Programs\Aaru * +- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Aaru * +- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Aaru * +- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Aaru * +- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Aaru * # dd for Windows - ps: appveyor DownloadFile http://www.chrysocome.net/downloads/8ab730cd2a29e76ddd89be1f99357942/dd-0.6beta3.zip - 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net48\publish\Programs\DD * -- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0-windows\win-x64\publish\Programs\DD * -- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0-windows\win-x86\publish\Programs\DD * -#- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0-windows\linux-x64\publish\Programs\DD * -#- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0-windows\osx-x64\publish\Programs\DD * +- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\DD * +- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\DD * +- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\DD * +- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\DD * # DiscImageCreator - ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/11222268/DiscImageCreator_20230413.zip - 7z e DiscImageCreator_20230413.zip -oMPF\bin\Debug\net48\publish\Programs\Creator Release_ANSI\* -- 7z e DiscImageCreator_20230413.zip -oMPF\bin\Debug\net6.0-windows\win-x64\publish\Programs\Creator Release_ANSI\* -- 7z e DiscImageCreator_20230413.zip -oMPF\bin\DebugFix \net6.0-windows\win-x86\publish\Programs\Creator Release_ANSI\* -#- 7z e DiscImageCreator_20230413.zip -oMPF\bin\Debug\net6.0-windows\linux-x64\publish\Programs\Creator Release_ANSI\* -#- 7z e DiscImageCreator_20230413.zip -oMPF\bin\Debug\net6.0-windows\osx-x64\publish\Programs\Creator Release_ANSI\* +- 7z e DiscImageCreator_20230413.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Creator Release_ANSI\* +- 7z e DiscImageCreator_20230413.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Creator Release_ANSI\* +- 7z e DiscImageCreator_20230413.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Creator Release_ANSI\* +- 7z e DiscImageCreator_20230413.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Creator Release_ANSI\* # Redumper - ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_118/redumper-2023.04.10_build118-win64.zip - 7z e redumper-2023.04.10_build118-win64.zip -oMPF\bin\Debug\net48\publish\Programs\Redumper redumper-2023.04.10_build118-win64\bin\* -- 7z e redumper-2023.04.10_build118-win64.zip -oMPF\bin\Debug\net6.0-windows\win-x64\publish\Programs\Redumper redumper-2023.04.10_build118-win64\bin\* -- 7z e redumper-2023.04.10_build118-win64.zip -oMPF\bin\Debug\net6.0-windows\win-x86\publish\Programs\Redumper redumper-2023.04.10_build118-win64\bin\* -#- 7z e redumper-2023.04.10_build118-win64.zip -oMPF\bin\Debug\net6.0-windows\linux-x64\publish\Programs\Redumper redumper-2023.04.10_build118-win64\bin\* -#- 7z e redumper-2023.04.10_build118-win64.zip -oMPF\bin\Debug\net6.0-windows\osx-x64\publish\Programs\Redumper redumper-2023.04.10_build118-win64\bin\* +- 7z e redumper-2023.04.10_build118-win64.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Redumper redumper-2023.04.10_build118-win64\bin\* +- 7z e redumper-2023.04.10_build118-win64.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Redumper redumper-2023.04.10_build118-win64\bin\* +- 7z e redumper-2023.04.10_build118-win64.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Redumper redumper-2023.04.10_build118-win64\bin\* +- 7z e redumper-2023.04.10_build118-win64.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Redumper redumper-2023.04.10_build118-win64\bin\* # Subdump - ps: appveyor DownloadFile https://archive.org/download/subdump_fua_0x28/subdump_fua_0x28.zip - 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net48\publish * - mkdir MPF\bin\Debug\net48\publish\Programs\Subdump - mv MPF\bin\Debug\net48\publish\subdump_fua_0x28.exe MPF\bin\Debug\net48\publish\Programs\Subdump\subdump.exe -#- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0 * -#- mkdir MPF\bin\Debug\net6.0-windows\Programs\Subdump -#- mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\Programs\Subdump\subdump.exe +- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0 * +- mkdir MPF\bin\Debug\net6.0-windows\Programs\Subdump +- mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Subdump\subdump.exe +- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0 * +- mkdir MPF\bin\Debug\net6.0-windows\Programs\Subdump +- mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Subdump\subdump.exe +- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0 * +- mkdir MPF\bin\Debug\net6.0-windows\Programs\Subdump +- mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Subdump\subdump.exe +- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0 * +- mkdir MPF\bin\Debug\net6.0-windows\Programs\Subdump +- mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Subdump\subdump.exe # MPF - cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net48\publish\ - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net48.zip * -- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win-x86\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win-x86.zip * -- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win-x64\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win-x64.zip * -#- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\linux-x64\publish\ -#- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_linux-x64.zip * -#- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\osx-x64\publish\ -#- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_osx-x64.zip * +- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win7-x64\publish\ +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win7-x64.zip * +- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win8-x64\publish\ +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win8-x64.zip * +- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win81-x64\publish\ +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win81-x64.zip * +- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win10-x64\publish\ +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win10-x64.zip * # MPF.Check - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net48\publish\ - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net48.zip * -- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win-x86\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win-x86.zip * -- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win-x64\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win-x64.zip * +- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win7-x64\publish\ +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win7-x64.zip * +- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win8-x64\publish\ +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win8-x64.zip * +- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win81-x64\publish\ +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win81-x64.zip * +- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win10-x64\publish\ +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win10-x64.zip * - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\linux-x64\publish\ - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_linux-x64.zip * - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\osx-x64\publish\ @@ -118,21 +133,25 @@ on_failure: artifacts: - path: MPF_net48.zip name: MPF (.NET Framework 4.8) -- path: MPF_net6.0_win-x86.zip - name: MPF (.NET 6.0, Windows x86) -- path: MPF_net6.0_win-x64.zip - name: MPF (.NET 6.0, Windows x64) -#- path: MPF_net6.0_linux-x64.zip -# name: MPF (.NET 6.0, Linux x64) -#- path: MPF_net6.0_osx-x64.zip -# name: MPF (.NET 6.0, OSX x64) +- path: MPF_net6.0_win7-x64.zip + name: MPF (.NET 6.0, Windows 7 x64) +- path: MPF_net6.0_win8-x64.zip + name: MPF (.NET 6.0, Windows 8 x64) +- path: MPF_net6.0_win81-x64.zip + name: MPF (.NET 6.0, Windows 8.1 x64) +- path: MPF_net6.0_win10-x64.zip + name: MPF (.NET 6.0, Windows 10 x64) - path: MPF.Check_net48.zip name: MPF Check (.NET Framework 4.8) -- path: MPF.Check_net6.0_win-x86.zip - name: MPF.Check (.NET 6.0, Windows x86) -- path: MPF.Check_net6.0_win-x64.zip - name: MPF.Check (.NET 6.0, Windows x64) +- path: MPF.Check_net6.0_win7-x64.zip + name: MPF.Check (.NET 6.0, Windows 7 x64) +- path: MPF.Check_net6.0_win8-x64.zip + name: MPF.Check (.NET 6.0, Windows 8 x64) +- path: MPF.Check_net6.0_win81-x64.zip + name: MPF.Check (.NET 6.0, Windows 8.1 x64) +- path: MPF.Check_net6.0_win10-x64.zip + name: MPF.Check (.NET 6.0, Windows 10 x64) - path: MPF.Check_net6.0_linux-x64.zip name: MPF.Check (.NET 6.0, Linux x64) - path: MPF.Check_net6.0_osx-x64.zip