Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MP1-5228: Bump NSIS 3.09 to 3.10 #343

Merged
merged 1 commit into from
Nov 6, 2024
Merged

MP1-5228: Bump NSIS 3.09 to 3.10 #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/mediaportal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow_codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Tools/InstallationScripts/include/MediaPortalMacros.nsh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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___
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading