diff --git a/.github/workflows/mediaportal.yml b/.github/workflows/mediaportal.yml index dd539340f65..52726d40325 100644 --- a/.github/workflows/mediaportal.yml +++ b/.github/workflows/mediaportal.yml @@ -52,7 +52,7 @@ jobs: - name: Setup NSIS run: | - choco install --yes nsis --version=3.09 --force + choco install --yes nsis --version=3.10 --force - name: Git Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/workflow_codeql.yml b/.github/workflows/workflow_codeql.yml index 8d0adacb788..342a1430e53 100644 --- a/.github/workflows/workflow_codeql.yml +++ b/.github/workflows/workflow_codeql.yml @@ -33,7 +33,7 @@ jobs: - name: Setup NSIS run: | - choco install --yes nsis --version=3.09 --force + choco install --yes nsis --version=3.10 --force - name: Git Checkout uses: actions/checkout@v4 diff --git a/Tools/InstallationScripts/include/MediaPortalMacros.nsh b/Tools/InstallationScripts/include/MediaPortalMacros.nsh index bffd3d616eb..9ea6934c194 100644 --- a/Tools/InstallationScripts/include/MediaPortalMacros.nsh +++ b/Tools/InstallationScripts/include/MediaPortalMacros.nsh @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2023 Team MediaPortal +#region Copyright (C) 2005-2024 Team MediaPortal /* -// Copyright (C) 2005-2023 Team MediaPortal +// Copyright (C) 2005-2024 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify @@ -18,8 +18,8 @@ */ #endregion -!if "${NSIS_VERSION}" != "v3.09" - !error "$\r$\n$\r$\nUnsupported NSIS version: ${NSIS_VERSION}. Please use NSIS v3.09, http://nsis.sourceforge.net$\r$\n$\r$\n" +!if "${NSIS_VERSION}" != "v3.10" + !error "$\r$\n$\r$\nUnsupported NSIS version: ${NSIS_VERSION}. Please use NSIS v3.10, http://nsis.sourceforge.net$\r$\n$\r$\n" !endif !ifndef ___COMMON_MP_MACROS__NSH___ diff --git a/appveyor.yml b/appveyor.yml index 708d9c0ba2b..83ed4f8e631 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ install: - cmd: >- git submodule update --init --recursive - choco install nsis --version=3.09 + choco install --yes nsis --version=3.10 --force java -version