From 22e480ccd1c8c130a4fe21d738c3d0c0a237eb24 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 4 Oct 2023 14:35:46 -0400 Subject: [PATCH] Try alternate archive naming --- CHANGELIST.md | 1 + appveyor.yml | 80 ++++++++++++++++++++++++------------------------- publish-nix.sh | 32 ++++++++++---------- publish-win.bat | 40 ++++++++++++------------- 4 files changed, 77 insertions(+), 76 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index 5a97e1fc..9285b5bd 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -1,5 +1,6 @@ ### WIP (xxxx-xx-xx) - Attempt to replace NRT +- Try alternate archive naming ### 2.6.6 (2023-10-04) diff --git a/appveyor.yml b/appveyor.yml index 0728eddf..22240cd5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -88,51 +88,51 @@ after_build: # Create MPF Debug archives - cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net48\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF-dbg_net48.zip * +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net48_debug.zip * - cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win-x64\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF-dbg_net6.0_win-x64.zip * +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win-x64_debug.zip * - cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net7.0-windows\win-x64\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF-dbg_net7.0_win-x64.zip * +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net7.0_win-x64_debug.zip * # # Create MPF Release archives # - cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Release\net48\publish\ -# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net48.zip * +# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net48_release.zip * # - cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Release\net6.0-windows\win-x64\publish\ -# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win-x64.zip * +# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win-x64_release.zip * # - cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Release\net7.0-windows\win-x64\publish\ -# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net7.0_win-x64.zip * +# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net7.0_win-x64_release.zip * # Create MPF.Check Debug archives - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net48\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check-dbg_net48.zip * +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net48_debug.zip * - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win-x64\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check-dbg_net6.0_win-x64.zip * +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win-x64_debug.zip * - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\linux-x64\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check-dbg_net6.0_linux-x64.zip * +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_linux-x64_debug.zip * - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\osx-x64\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check-dbg_net6.0_osx-x64.zip * +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_osx-x64_debug.zip * - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net7.0\win-x64\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check-dbg_net7.0_win-x64.zip * +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net7.0_win-x64_debug.zip * - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net7.0\linux-x64\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check-dbg_net7.0_linux-x64.zip * +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net7.0_linux-x64_debug.zip * - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net7.0\osx-x64\publish\ -- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check-dbg_net7.0_osx-x64.zip * +- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net7.0_osx-x64_debug.zip * # # Create MPF.Check Release archives # - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Release\net48\publish\ -# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net48.zip * +# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net48_release.zip * # - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Release\net6.0\win-x64\publish\ -# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win-x64.zip * +# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win-x64_release.zip * # - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Release\net6.0\linux-x64\publish\ -# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_linux-x64.zip * +# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_linux-x64_release.zip * # - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Release\net6.0\osx-x64\publish\ -# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_osx-x64.zip * +# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_osx-x64_release.zip * # - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Release\net7.0\win-x64\publish\ -# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net7.0_win-x64.zip * +# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net7.0_win-x64_release.zip * # - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Release\net7.0\linux-x64\publish\ -# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net7.0_linux-x64.zip * +# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net7.0_linux-x64_release.zip * # - cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Release\net7.0\osx-x64\publish\ -# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net7.0_osx-x64.zip * +# - 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net7.0_osx-x64_release.zip * # success/failure tracking on_success: @@ -144,46 +144,46 @@ on_failure: # artifact linking artifacts: -- path: MPF-dbg_net48.zip +- path: MPF_net48_debug.zip name: MPF (.NET Framework 4.8, Debug) -- path: MPF-dbg_net6.0_win-x64.zip +- path: MPF_net6.0_win-x64_debug.zip name: MPF (.NET 6.0, Debug, Windows x64) -- path: MPF-dbg_net7.0_win-x64.zip +- path: MPF_net7.0_win-x64_debug.zip name: MPF (.NET 7.0, Debug, Windows x64) -# - path: MPF_net48.zip +# - path: MPF_net48_release.zip # name: MPF (.NET Framework 4.8, Release) -# - path: MPF_net6.0_win-x64.zip +# - path: MPF_net6.0_win-x64_release.zip # name: MPF (.NET 6.0, Release, Windows x64) -# - path: MPF_net7.0_win-x64.zip +# - path: MPF_net7.0_win-x64_release.zip # name: MPF (.NET 7.0, Release, Windows x64) -- path: MPF.Check-dbg_net48.zip +- path: MPF.Check_net48_debug.zip name: MPF Check (.NET Framework 4.8, Debug) -- path: MPF.Check-dbg_net6.0_win-x64.zip +- path: MPF.Check_net6.0_win-x64_debug.zip name: MPF.Check (.NET 6.0, Debug, Windows x64) -- path: MPF.Check-dbg_net6.0_linux-x64.zip +- path: MPF.Check_net6.0_linux-x64_debug.zip name: MPF.Check (.NET 6.0, Debug, Linux x64) -- path: MPF.Check-dbg_net6.0_osx-x64.zip +- path: MPF.Check_net6.0_osx-x64_debug.zip name: MPF.Check (.NET 6.0, Debug, OSX x64) -- path: MPF.Check-dbg_net7.0_win-x64.zip +- path: MPF.Check_net7.0_win-x64_debug.zip name: MPF.Check (.NET 7.0, Debug, Windows x64) -- path: MPF.Check-dbg_net7.0_linux-x64.zip +- path: MPF.Check_net7.0_linux-x64_debug.zip name: MPF.Check (.NET 7.0, Debug, Linux x64) -- path: MPF.Check-dbg_net7.0_osx-x64.zip +- path: MPF.Check_net7.0_osx-x64_debug.zip name: MPF.Check (.NET 7.0, Debug, OSX x64) -# - path: MPF.Check_net48.zip +# - path: MPF.Check_net48_release.zip # name: MPF Check (.NET Framework 4.8, Release) -# - path: MPF.Check_net6.0_win-x64.zip +# - path: MPF.Check_net6.0_win-x64_release.zip # name: MPF.Check (.NET 6.0, Release, Windows x64) -# - path: MPF.Check_net6.0_linux-x64.zip +# - path: MPF.Check_net6.0_linux-x64_release.zip # name: MPF.Check (.NET 6.0, Release, Linux x64) -# - path: MPF.Check_net6.0_osx-x64.zip +# - path: MPF.Check_net6.0_osx-x64_release.zip # name: MPF.Check (.NET 6.0, Release, OSX x64) -# - path: MPF.Check_net7.0_win-x64.zip +# - path: MPF.Check_net7.0_win-x64_release.zip # name: MPF.Check (.NET 7.0, Release, Windows x64) -# - path: MPF.Check_net7.0_linux-x64.zip +# - path: MPF.Check_net7.0_linux-x64_release.zip # name: MPF.Check (.NET 7.0, Release, Linux x64) -# - path: MPF.Check_net7.0_osx-x64.zip +# - path: MPF.Check_net7.0_osx-x64_release.zip # name: MPF.Check (.NET 7.0, Release, OSX x64) diff --git a/publish-nix.sh b/publish-nix.sh index 9732f8de..20b1663c 100755 --- a/publish-nix.sh +++ b/publish-nix.sh @@ -52,40 +52,40 @@ dotnet publish MPF.Check/MPF.Check.csproj -f net7.0 -r osx-x64 -c Release --self # Create MPF Debug archives #cd $BUILD_FOLDER/MPF/bin/Debug/net6.0-windows/win-x64/publish/ -#zip -r $BUILD_FOLDER/MPF-dbg_net6.0_win-x64.zip . +#zip -r $BUILD_FOLDER/MPF_net6.0_win-x64_debug.zip . #cd $BUILD_FOLDER/MPF/bin/Debug/net7.0-windows/win-x64/publish/ -#zip -r $BUILD_FOLDER/MPF-dbg_net7.0_win-x64.zip . +#zip -r $BUILD_FOLDER/MPF_net7.0_win-x64_debug.zip . # Create MPF Release archives #cd $BUILD_FOLDER/MPF/bin/Release/net6.0-windows/win-x64/publish/ -#zip -r $BUILD_FOLDER/MPF_net6.0_win-x64.zip . +#zip -r $BUILD_FOLDER/MPF_net6.0_win-x64_release.zip . #cd $BUILD_FOLDER/MPF/bin/Release/net7.0-windows/win-x64/publish/ -#zip -r $BUILD_FOLDER/MPF_net7.0_win-x64.zip . +#zip -r $BUILD_FOLDER/MPF_net7.0_win-x64_release.zip . # Create MPF.Check Debug archives cd $BUILD_FOLDER/MPF.Check/bin/Debug/net6.0/win-x64/publish/ -zip -r $BUILD_FOLDER/MPF.Check-dbg_net6.0_win-x64.zip . +zip -r $BUILD_FOLDER/MPF.Check_net6.0_win-x64_debug.zip . cd $BUILD_FOLDER/MPF.Check/bin/Debug/net6.0/linux-x64/publish/ -zip -r $BUILD_FOLDER/MPF.Check-dbg_net6.0_linux-x64.zip . +zip -r $BUILD_FOLDER/MPF.Check_net6.0_linux-x64_debug.zip . cd $BUILD_FOLDER/MPF.Check/bin/Debug/net6.0/osx-x64/publish/ -zip -r $BUILD_FOLDER/MPF.Check-dbg_net6.0_osx-x64.zip . +zip -r $BUILD_FOLDER/MPF.Check_net6.0_osx-x64_debug.zip . cd $BUILD_FOLDER/MPF.Check/bin/Debug/net7.0/win-x64/publish/ -zip -r $BUILD_FOLDER/MPF.Check-dbg_net7.0_win-x64.zip . +zip -r $BUILD_FOLDER/MPF.Check_net7.0_win-x64_debug.zip . cd $BUILD_FOLDER/MPF.Check/bin/Debug/net7.0/linux-x64/publish/ -zip -r $BUILD_FOLDER/MPF.Check-dbg_net7.0_linux-x64.zip . +zip -r $BUILD_FOLDER/MPF.Check_net7.0_linux-x64_debug.zip . cd $BUILD_FOLDER/MPF.Check/bin/Debug/net7.0/osx-x64/publish/ -zip -r $BUILD_FOLDER/MPF.Check-dbg_net7.0_osx-x64.zip . +zip -r $BUILD_FOLDER/MPF.Check_net7.0_osx-x64_debug.zip . # Create MPF.Check Release archives cd $BUILD_FOLDER/MPF.Check/bin/Release/net6.0/win-x64/publish/ -zip -r $BUILD_FOLDER/MPF.Check_net6.0_win-x64.zip . +zip -r $BUILD_FOLDER/MPF.Check_net6.0_win-x64_release.zip . cd $BUILD_FOLDER/MPF.Check/bin/Release/net6.0/linux-x64/publish/ -zip -r $BUILD_FOLDER/MPF.Check_net6.0_linux-x64.zip . +zip -r $BUILD_FOLDER/MPF.Check_net6.0_linux-x64_release.zip . cd $BUILD_FOLDER/MPF.Check/bin/Release/net6.0/osx-x64/publish/ -zip -r $BUILD_FOLDER/MPF.Check_net6.0_osx-x64.zip . +zip -r $BUILD_FOLDER/MPF.Check_net6.0_osx-x64_release.zip . cd $BUILD_FOLDER/MPF.Check/bin/Release/net7.0/win-x64/publish/ -zip -r $BUILD_FOLDER/MPF.Check_net7.0_win-x64.zip . +zip -r $BUILD_FOLDER/MPF.Check_net7.0_win-x64_release.zip . cd $BUILD_FOLDER/MPF.Check/bin/Release/net7.0/linux-x64/publish/ -zip -r $BUILD_FOLDER/MPF.Check_net7.0_linux-x64.zip . +zip -r $BUILD_FOLDER/MPF.Check_net7.0_linux-x64_release.zip . cd $BUILD_FOLDER/MPF.Check/bin/Release/net7.0/osx-x64/publish/ -zip -r $BUILD_FOLDER/MPF.Check_net7.0_osx-x64.zip . \ No newline at end of file +zip -r $BUILD_FOLDER/MPF.Check_net7.0_osx-x64_release.zip . \ No newline at end of file diff --git a/publish-win.bat b/publish-win.bat index e4c7f72c..3176ca67 100644 --- a/publish-win.bat +++ b/publish-win.bat @@ -60,48 +60,48 @@ dotnet publish MPF.Check\MPF.Check.csproj -f net7.0 -r osx-x64 -c Release --self REM Create MPF Debug archives cd %BUILD_FOLDER%\MPF\bin\Debug\net48\publish\ -7z a -tzip %BUILD_FOLDER%\MPF-dbg_net48.zip * +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-dbg_net6.0_win-x64.zip * +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-dbg_net7.0_win-x64.zip * +7z a -tzip %BUILD_FOLDER%\MPF_net7.0_win-x64_debug.zip * REM Create MPF Release archives cd %BUILD_FOLDER%\MPF\bin\Release\net48\publish\ -7z a -tzip %BUILD_FOLDER%\MPF_net48.zip * +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.zip * +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.zip * +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\publish\ -7z a -tzip %BUILD_FOLDER%\MPF.Check-dbg_net48.zip * +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-dbg_net6.0_win-x64.zip * +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\ -7z a -tzip %BUILD_FOLDER%\MPF.Check-dbg_net6.0_linux-x64.zip * +7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_linux-x64_debug.zip * cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\osx-x64\publish\ -7z a -tzip %BUILD_FOLDER%\MPF.Check-dbg_net6.0_osx-x64.zip * +7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_osx-x64_debug.zip * cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net7.0\win-x64\publish\ -7z a -tzip %BUILD_FOLDER%\MPF.Check-dbg_net7.0_win-x64.zip * +7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_win-x64_debug.zip * cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net7.0\linux-x64\publish\ -7z a -tzip %BUILD_FOLDER%\MPF.Check-dbg_net7.0_linux-x64.zip * +7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_linux-x64_debug.zip * cd %BUILD_FOLDER%\MPF.Check\bin\Debug\net7.0\osx-x64\publish\ -7z a -tzip %BUILD_FOLDER%\MPF.Check-dbg_net7.0_osx-x64.zip * +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\publish\ -7z a -tzip %BUILD_FOLDER%\MPF.Check_net48.zip * +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.zip * +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\ -7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_linux-x64.zip * +7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_linux-x64_release.zip * cd %BUILD_FOLDER%\MPF.Check\bin\Release\net6.0\osx-x64\publish\ -7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_osx-x64.zip * +7z a -tzip %BUILD_FOLDER%\MPF.Check_net6.0_osx-x64_release.zip * cd %BUILD_FOLDER%\MPF.Check\bin\Release\net7.0\win-x64\publish\ -7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_win-x64.zip * +7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_win-x64_release.zip * cd %BUILD_FOLDER%\MPF.Check\bin\Release\net7.0\linux-x64\publish\ -7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_linux-x64.zip * +7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_linux-x64_release.zip * cd %BUILD_FOLDER%\MPF.Check\bin\Release\net7.0\osx-x64\publish\ -7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_osx-x64.zip * \ No newline at end of file +7z a -tzip %BUILD_FOLDER%\MPF.Check_net7.0_osx-x64_release.zip * \ No newline at end of file