diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 90dd6f1..d3a3699 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
runs-on: ${{ matrix.image }}
strategy:
matrix:
- toolset: [14.16, 14.29, 14.31]
+ toolset: [14.16, 14.29, 14.32]
arch: [x64]
qtver: [5.12.12]
include:
@@ -36,7 +36,7 @@ jobs:
image: windows-2019
- toolset: 14.29
image: windows-2019
- - toolset: 14.31
+ - toolset: 14.32
image: windows-2022
- arch: x64
qt: win64_msvc2017_64
@@ -61,7 +61,7 @@ jobs:
id: runvcpkg
with:
vcpkgArguments: openssl
- vcpkgGitCommitId: a69b65229b3956b7f45abd81671b7330114bcaad
+ vcpkgGitCommitId: 89295c9fe22e97ca9e380a6c771ccf2ff09dca95
vcpkgTriplet: ${{ matrix.arch }}-windows
- name: Install Qt
uses: jurplel/install-qt-action@v2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1bee05..6070dc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()
-project(id-updater VERSION 3.13.3)
+project(id-updater VERSION 3.13.4)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
@@ -29,35 +29,27 @@ if( APPLE )
COMMAND ibtool --errors --warnings --notices --output-format human-readable-text
--compile ID_updater.nib ${CMAKE_CURRENT_SOURCE_DIR}/prefPane/Base.lproj/ID_updater.xib
)
+ set(EN_RESOURCES prefPane/en.lproj/InfoPlist.strings prefPane/en.lproj/ID_updater.strings prefPane/en.lproj/Localizable.strings)
+ set(ET_RESOURCES prefPane/et.lproj/InfoPlist.strings prefPane/et.lproj/ID_updater.strings prefPane/et.lproj/Localizable.strings)
+ set(RU_RESOURCES prefPane/ru.lproj/InfoPlist.strings prefPane/ru.lproj/ID_updater.strings prefPane/ru.lproj/Localizable.strings)
find_library( XAR xar )
add_library( ${PROGNAME} MODULE
ID_updater.nib
config.h
prefPane/Base.lproj/ID_updater.xib
- prefPane/en.lproj/InfoPlist.strings
- prefPane/en.lproj/Localizable.strings
- prefPane/en.lproj/ID_updater.strings
- prefPane/et.lproj/InfoPlist.strings
- prefPane/et.lproj/Localizable.strings
- prefPane/et.lproj/ID_updater.strings
- prefPane/ru.lproj/InfoPlist.strings
- prefPane/ru.lproj/Localizable.strings
- prefPane/ru.lproj/ID_updater.strings
+ ${EN_RESOURCES}
+ ${ET_RESOURCES}
+ ${RU_RESOURCES}
prefPane/Icon.icns
prefPane/id-updater.m
prefPane/update.m
)
- set_source_files_properties( prefPane/Icon.icns
- PROPERTIES MACOSX_PACKAGE_LOCATION Resources )
- set_source_files_properties( ID_updater.nib
- PROPERTIES MACOSX_PACKAGE_LOCATION Resources/Base.lproj )
- set_source_files_properties( prefPane/en.lproj/InfoPlist.strings prefPane/en.lproj/ID_updater.strings prefPane/en.lproj/Localizable.strings
- PROPERTIES MACOSX_PACKAGE_LOCATION Resources/en.lproj )
- set_source_files_properties( prefPane/et.lproj/InfoPlist.strings prefPane/et.lproj/ID_updater.strings prefPane/et.lproj/Localizable.strings
- PROPERTIES MACOSX_PACKAGE_LOCATION Resources/et.lproj )
- set_source_files_properties( prefPane/ru.lproj/InfoPlist.strings prefPane/ru.lproj/ID_updater.strings prefPane/ru.lproj/Localizable.strings
- PROPERTIES MACOSX_PACKAGE_LOCATION Resources/ru.lproj )
+ set_source_files_properties(prefPane/Icon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+ set_source_files_properties(ID_updater.nib PROPERTIES MACOSX_PACKAGE_LOCATION Resources/Base.lproj)
+ set_source_files_properties(${EN_RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/en.lproj)
+ set_source_files_properties(${ET_RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/et.lproj)
+ set_source_files_properties(${RU_RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/ru.lproj)
set_target_properties( ${PROGNAME} PROPERTIES
BUNDLE YES
BUNDLE_EXTENSION prefPane
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 4e4f201..bbd4d63 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,3 +1,23 @@
+Id-updater version [3.13.4](https://github.com/open-eid/updater/releases/tag/v3.13.4) release notes
+--------------------------------------
+- Support MSVS 2022 toolchain (#67)
+- Qt 6 support (#65)
+
+[Full Changelog](https://github.com/open-eid/updater/compare/v3.13.3...v3.13.4)
+
+Id-updater version [3.13.3](https://github.com/open-eid/updater/releases/tag/v3.13.3) release notes
+--------------------------------------
+- Add web-eid to diagnostics (#64)
+
+[Full Changelog](https://github.com/open-eid/updater/compare/v3.13.2...v3.13.3)
+
+Id-updater version [3.13.2](https://github.com/open-eid/updater/releases/tag/v3.13.2) release notes
+--------------------------------------
+- Notification fixes (#58), (#54), (#61), (#63)
+- Build fixes (#53), (#60)
+
+[Full Changelog](https://github.com/open-eid/updater/compare/v3.13.1...v3.13.2)
+
Id-updater version [3.13.1](https://github.com/open-eid/updater/releases/tag/v3.13.1) release notes
--------------------------------------
- Update UI in main thread (#47)
diff --git a/common b/common
index 9377a4a..7f10db5 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 9377a4ad5647aec38a4e2368161bf49b8a642de9
+Subproject commit 7f10db50c9994a81f65817a895f9f2cafd7dac07
diff --git a/idupdater.wxs b/idupdater.wxs
index 8d654ac..74ea498 100644
--- a/idupdater.wxs
+++ b/idupdater.wxs
@@ -66,7 +66,7 @@
-
+
@@ -116,7 +116,6 @@
-