From ef827fd240adcb1f2dd6f07fa1f02aa71dbb3d9f Mon Sep 17 00:00:00 2001 From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com> Date: Fri, 18 Oct 2024 17:40:56 +0200 Subject: [PATCH] 1.15.0 --- .github/workflows/main.yml | 22 +++++++++++----------- Installer/fix_qt5_languages.cmd | 2 +- Installer/get_openssl.cmd | 2 +- SandboxiePlus/install_qt.cmd | 6 +++--- SandboxiePlus/qmake_plus.cmd | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b804d13c..6be1d0d5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,17 +69,17 @@ on: - '**/COPYING' env: - qt_version: 5.15.14 + qt_version: 5.15.15 qt6_version: 6.3.1 - openssl_version: 3.3.1 + openssl_version: 3.3.2 ghSsl_user: xanasoft ghSsl_repo: openssl-builds #ghQt6Win7_user: DavidXanatos #ghQt6Win7_repo: qtbase ghQtBuilds_user: xanasoft ghQtBuilds_repo: qt-builds - ghQtBuilds_hash_x86: bf4124046cc50ccbbeb3f786c041e884fd4205cd6e616070a75c850105cbf1db - ghQtBuilds_hash_x64: 30290d82a02bfaa24c1bf37bcb9c074aba18a673a7176628fccdf71197cee898 + ghQtBuilds_hash_x86: 0dc0048be815eeaa76bcdd2d02e7028d21cc75fd7f4fb65445d3adf37b4a75bb + ghQtBuilds_hash_x64: bae6773292ad187aad946854766344c4bd24245359404636b3a1b13d9ae6a97e jobs: Build_x64: @@ -88,7 +88,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4.1.5 + uses: actions/checkout@v4.1.7 - name: Setup msbuild uses: microsoft/setup-msbuild@v2 @@ -166,7 +166,7 @@ jobs: - name: Upload installer assets #if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' - uses: actions/upload-artifact@v4.4.3 + uses: actions/upload-artifact@v4.4.0 with: name: Assets path: | @@ -175,7 +175,7 @@ jobs: - name: Upload Sandboxie x64 #if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' - uses: actions/upload-artifact@v4.4.3 + uses: actions/upload-artifact@v4.4.0 with: name: Sandboxie_x64 path: | @@ -189,7 +189,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4.1.5 + uses: actions/checkout@v4.1.7 - name: Setup msbuild uses: microsoft/setup-msbuild@v2 @@ -269,7 +269,7 @@ jobs: - name: Upload Sandboxie ARM64 #if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' - uses: actions/upload-artifact@v4.4.3 + uses: actions/upload-artifact@v4.4.0 with: name: Sandboxie_ARM64 path: | @@ -283,7 +283,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4.1.5 + uses: actions/checkout@v4.1.7 - name: Setup msbuild uses: microsoft/setup-msbuild@v2 @@ -338,7 +338,7 @@ jobs: - name: Upload Sandboxie x86 #if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' - uses: actions/upload-artifact@v4.4.3 + uses: actions/upload-artifact@v4.4.0 with: name: Sandboxie_x86 path: | diff --git a/Installer/fix_qt5_languages.cmd b/Installer/fix_qt5_languages.cmd index f8b150ea..0ee950ec 100644 --- a/Installer/fix_qt5_languages.cmd +++ b/Installer/fix_qt5_languages.cmd @@ -1,6 +1,6 @@ echo %* IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" ) -IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" ) +IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" ) if %1 == x64 if exist %~dp0..\..\Qt\%qt_version%\msvc2019_64\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\%qt_version%\msvc2019_64\bin\ if %1 == Win32 if exist %~dp0..\..\Qt\%qt_version%\msvc2019\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\%qt_version%\msvc2019\bin\ diff --git a/Installer/get_openssl.cmd b/Installer/get_openssl.cmd index f8a17fd9..b54f3520 100644 --- a/Installer/get_openssl.cmd +++ b/Installer/get_openssl.cmd @@ -1,7 +1,7 @@ echo %* IF "%~3" == "" ( set "ghSsl_repo=openssl-builds" ) ELSE ( set "ghSsl_repo=%~3" ) IF "%~2" == "" ( set "ghSsl_user=xanasoft" ) ELSE ( set "ghSsl_user=%~2" ) -IF "%~1" == "" ( set "openssl_version=3.3.1" ) ELSE ( set "openssl_version=%~1" ) +IF "%~1" == "" ( set "openssl_version=3.3.2" ) ELSE ( set "openssl_version=%~1" ) set "openssl_version_underscore=%openssl_version:.=_%" diff --git a/SandboxiePlus/install_qt.cmd b/SandboxiePlus/install_qt.cmd index 993ea4e5..1cfc18f8 100644 --- a/SandboxiePlus/install_qt.cmd +++ b/SandboxiePlus/install_qt.cmd @@ -1,10 +1,10 @@ echo %* -IF "%~7" == "" ( set "ghQtBuilds_hash_x64=30290d82a02bfaa24c1bf37bcb9c074aba18a673a7176628fccdf71197cee898" ) ELSE ( set "ghQtBuilds_hash_x64=%~7" ) -IF "%~6" == "" ( set "ghQtBuilds_hash_x86=bf4124046cc50ccbbeb3f786c041e884fd4205cd6e616070a75c850105cbf1db" ) ELSE ( set "ghQtBuilds_hash_x86=%~6" ) +IF "%~7" == "" ( set "ghQtBuilds_hash_x64=bae6773292ad187aad946854766344c4bd24245359404636b3a1b13d9ae6a97e" ) ELSE ( set "ghQtBuilds_hash_x64=%~7" ) +IF "%~6" == "" ( set "ghQtBuilds_hash_x86=0dc0048be815eeaa76bcdd2d02e7028d21cc75fd7f4fb65445d3adf37b4a75bb" ) ELSE ( set "ghQtBuilds_hash_x86=%~6" ) IF "%~5" == "" ( set "ghQtBuilds_repo=qt-builds" ) ELSE ( set "ghQtBuilds_repo=%~5" ) IF "%~4" == "" ( set "ghQtBuilds_user=xanasoft" ) ELSE ( set "ghQtBuilds_user=%~4" ) IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" ) -IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" ) +IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" ) if %1 == Win32 ( if exist %~dp0..\..\Qt\%qt_version%\msvc2019\bin\qmake.exe goto done diff --git a/SandboxiePlus/qmake_plus.cmd b/SandboxiePlus/qmake_plus.cmd index bf7ca547..5b767a19 100644 --- a/SandboxiePlus/qmake_plus.cmd +++ b/SandboxiePlus/qmake_plus.cmd @@ -7,7 +7,7 @@ REM echo qt6_version: %3 echo %* IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" ) -IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" ) +IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" ) IF %1 == Win32 ( set qt_path=%~dp0..\..\Qt\%qt_version%\msvc2019