diff --git a/CHANGELIST.md b/CHANGELIST.md index bb020c12..9f96ef15 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -34,6 +34,7 @@ - Fix AppVeyor pathing - Skip during detection - Address some UI concerns +- Tweak AppVeyor, show Check 6.0 builds ### 2.4 (2022-10-26) - Update to DIC 20211001 diff --git a/MPF.Check/MPF.Check.csproj b/MPF.Check/MPF.Check.csproj index 7aa6155c..e541be02 100644 --- a/MPF.Check/MPF.Check.csproj +++ b/MPF.Check/MPF.Check.csproj @@ -2,6 +2,7 @@ net48;net6.0 + win-x86;win-x64;linux-x64;osx-x64 Exe MPF Check MPF.Check diff --git a/appveyor.yml b/appveyor.yml index 146cc5c4..a77fd28e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,30 +23,41 @@ before_build: - nuget restore # build step -build: - verbosity: minimal - project: MPF.sln +build_script: + - dotnet restore + - dotnet build MPF\MPF.csproj --framework net48 + #- dotnet build MPF\MPF.csproj --framework net6.0 + - dotnet build MPF.Check\MPF.Check.csproj --framework net48 + - 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.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 # post-build step after_build: -- ps: appveyor DownloadFile https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_windows_x64.zip -- ps: appveyor DownloadFile http://www.chrysocome.net/downloads/8ab730cd2a29e76ddd89be1f99357942/dd-0.6beta3.zip -- ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/9536254/DiscImageCreator_20220909.zip -- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_81/redumper-2022.12.13_build81-win64.zip -- ps: appveyor DownloadFile https://archive.org/download/subdump_fua_0x28/subdump_fua_0x28.zip +# 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\Programs\Aaru * #- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0\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\Programs\DD * #- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0\Programs\DD * +# DiscImageCreator +- ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/9536254/DiscImageCreator_20220909.zip - 7z e DiscImageCreator_20220909.zip -oMPF\bin\Debug\net48\Programs\Creator Release_ANSI\* #- 7z e DiscImageCreator_20220909.zip -oMPF\bin\Debug\net6.0\Programs\Creator Release_ANSI\* +# Redumper +- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_81/redumper-2022.12.13_build81-win64.zip - 7z e redumper-2022.12.13_build81-win64.zip -oMPF\bin\Debug\net48\Programs\Redumper redumper-2022.12.13_build81-win64\bin\* #- 7z e redumper-2022.12.13_build81-win64.zip -oMPF\bin\Debug\net6.0\Programs\Redumper redumper-2022.12.13_build81-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 * - mkdir MPF\bin\Debug\net48\Programs\Subdump - mv MPF\bin\Debug\net48\subdump_fua_0x28.exe MPF\bin\Debug\net48\Programs\Subdump\subdump.exe @@ -54,15 +65,23 @@ after_build: #- mkdir MPF\bin\Debug\net6.0\Programs\Subdump #- mv MPF\bin\Debug\net6.0\subdump_fua_0x28.exe MPF\bin\Debug\net6.0\Programs\Subdump\subdump.exe +# MPF - cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net48 - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net48.zip * #- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0 #- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0.zip * +# MPF.Check - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net48 - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net48.zip * -#- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0 -#- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0.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\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\ +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_osx-x64.zip * # success/failure tracking on_success: @@ -75,11 +94,17 @@ on_failure: # artifact linking artifacts: - path: MPF_net48.zip - name: MPF (WPF UI) (.NET Framework 4.8) + name: MPF (.NET Framework 4.8) #- path: MPF_net6.0.zip -# name: MPF (WPF UI) (.NET 6.0) +# name: MPF (.NET 6.0) - path: MPF.Check_net48.zip name: MPF Check (.NET Framework 4.8) -#- path: MPF.Check_net6.0.zip -# name: MPF Check (.NET 6.0) \ No newline at end of file +- 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_linux-x64.zip + name: MPF.Check (.NET 6.0, Linux x64) +- path: MPF.Check_net6.0_osx-x64.zip + name: MPF.Check (.NET 6.0, OSX x64) \ No newline at end of file