Update version number (#70)

IB-7146

Signed-off-by: Raul Metsma <[email protected]>

.github/workflows/build.yml

@@ -28,15 +28,15 @@ 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:
         - toolset: 14.16
           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

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

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)

idupdater.wxs

@@ -66,7 +66,7 @@
             <File Source="$(var.VCPATH)\vcruntime140$(var.qt_suffix).dll"/>
 <?if $(var.Platform) = x64 AND $(env.VisualStudioVersion) != "15.0" ?>
             <File Source="$(var.VCPATH)\msvcp140_1$(var.qt_suffix).dll"/>
-            <File Source="$(var.VCPATH)\MSVCP140_2$(var.qt_suffix).dll"/>
+            <File Source="$(var.VCPATH)\msvcp140_2$(var.qt_suffix).dll"/>
             <File Source="$(var.VCPATH)\vcruntime140_1$(var.qt_suffix).dll"/>
 <?endif ?>
             <File Source="$(var.libs_path)\libcrypto-1_1$(var.OpenSSLSuffix).dll"/>
@@ -116,7 +116,6 @@
           </Directory>
           <Directory Id="imageformats" Name="imageformats" FileSource="$(var.qt_path)\..\plugins\imageformats">
             <Component Id="imageformats.dll" Guid="4ae32624-e869-4e4c-8a1c-624c31133ce3">
-              <File Name="qgif$(var.qt_suffix).dll"/>
               <File Name="qjpeg$(var.qt_suffix).dll"/>
               <File Name="qsvg$(var.qt_suffix).dll"/>
             </Component>