From 19ec1c448fc683df129ac80b8abf038d55f28108 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 23 Feb 2023 16:33:39 -0500 Subject: [PATCH] Enable .NET 6 Windows builds --- appveyor.yml | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 11896d47..1e35cdda 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,10 @@ build_script: - msbuild MPF.Check\MPF.Check.csproj -property:TargetFramework=net48 # .NET 6.0 - #- dotnet build MPF\MPF.csproj --framework net6.0 + - dotnet publish MPF\MPF.csproj --framework net6.0 --runtime win-x86 --self-contained true -p:PublishSingleFile=true + - dotnet publish MPF\MPF.csproj --framework net6.0 --runtime win-x64 --self-contained true -p:PublishSingleFile=true + #- dotnet publish MPF\MPF.csproj --framework net6.0 --runtime linux-x64 --self-contained true -p:PublishSingleFile=true + #- dotnet publish MPF\MPF.csproj --framework net6.0 --runtime osx-x64 --self-contained true -p:PublishSingleFile=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.Check\MPF.Check.csproj --framework net6.0 --runtime linux-x64 --self-contained true -p:PublishSingleFile=true @@ -41,22 +44,34 @@ 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\Programs\Aaru * -#- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0\Programs\Aaru * +- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0\win-x64\publish\Programs\Aaru * +- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0\win-x86\publish\Programs\Aaru * +#- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0\linux-x64\publish\Programs\Aaru * +#- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0\osx-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\Programs\DD * -#- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0\Programs\DD * +- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0\win-x64\publish\Programs\DD * +- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0\win-x86\publish\Programs\DD * +#- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0\linux-x64\publish\Programs\DD * +#- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0\osx-x64\publish\Programs\DD * # DiscImageCreator - ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/10555765/DiscImageCreator_20230201.zip - 7z e DiscImageCreator_20230201.zip -oMPF\bin\Debug\net48\Programs\Creator Release_ANSI\* -#- 7z e DiscImageCreator_20230201.zip -oMPF\bin\Debug\net6.0\Programs\Creator Release_ANSI\* +- 7z e DiscImageCreator_20230201.zip -oMPF\bin\Debug\net6.0\win-x64\publish\Programs\Creator Release_ANSI\* +- 7z e DiscImageCreator_20230201.zip -oMPF\bin\Debug\net6.0\win-x86\publish\Programs\Creator Release_ANSI\* +#- 7z e DiscImageCreator_20230201.zip -oMPF\bin\Debug\net6.0\linux-x64\publish\Programs\Creator Release_ANSI\* +#- 7z e DiscImageCreator_20230201.zip -oMPF\bin\Debug\net6.0\osx-x64\publish\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\* +- 7z e redumper-2022.12.13_build81-win64.zip -oMPF\bin\Debug\net6.0\win-x64\publish\Programs\Redumper redumper-2022.12.13_build81-win64\bin\* +- 7z e redumper-2022.12.13_build81-win64.zip -oMPF\bin\Debug\net6.0\win-x86\publish\Programs\Redumper redumper-2022.12.13_build81-win64\bin\* +#- 7z e redumper-2022.12.13_build81-win64.zip -oMPF\bin\Debug\net6.0\linux-x64\publish\Programs\Redumper redumper-2022.12.13_build81-win64\bin\* +#- 7z e redumper-2022.12.13_build81-win64.zip -oMPF\bin\Debug\net6.0\osx-x64\publish\Programs\Redumper redumper-2022.12.13_build81-win64\bin\* # Subdump - ps: appveyor DownloadFile https://archive.org/download/subdump_fua_0x28/subdump_fua_0x28.zip @@ -70,8 +85,14 @@ after_build: # 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 * +- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0\win-x86\publish\ +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win-x86.zip * +- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0\win-x64\publish\ +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win-x64.zip * +#- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0\linux-x64\publish\ +#- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_linux-x64.zip * +#- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0\osx-x64\publish\ +#- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_osx-x64.zip * # MPF.Check - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net48 @@ -97,8 +118,14 @@ on_failure: artifacts: - path: MPF_net48.zip name: MPF (.NET Framework 4.8) -#- path: MPF_net6.0.zip -# name: MPF (.NET 6.0) +- 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.Check_net48.zip name: MPF Check (.NET Framework 4.8)