Update version to 3.5.1

Maxhy · Maxhy · commit 945919811e69 · 2025-06-18T06:29:27.000+02:00
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,5 +1,5 @@
 mode: ContinuousDelivery
-next-version: 3.5.0
+next-version: 3.5.1
 branches:
   master:
     regex: (origin\/)?master
diff --git a/installer/LibLogicalAccess.Msm/MergeModule.wxs b/installer/LibLogicalAccess.Msm/MergeModule.wxs
@@ -1,6 +1,6 @@
 ﻿<?include config.wxi ?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Module Id="LibLogicalAccess.Msm" Language="1033" Version="3.5.0.0" Guid="e75b8ac8-6ed3-4601-bfc3-30c46564c0c7" InstallerVersion="200"><SummaryInformation Manufacturer="$(var.Manufacturer)" />
+  <Module Id="LibLogicalAccess.Msm" Language="1033" Version="3.5.1.0" Guid="e75b8ac8-6ed3-4601-bfc3-30c46564c0c7" InstallerVersion="200"><SummaryInformation Manufacturer="$(var.Manufacturer)" />
       <Directory Id="MergeRedirectFolder">
         <Component Guid="BA21F8CD-1FBD-4D8E-9F15-C57DBD508636" Id="LLAComponent">
           <File Id="___var.cps3cards.dll_" Source="$(var.lladir)\cps3cards.dll" />
diff --git a/installer/LibLogicalAccess.Setup/Product.wxs b/installer/LibLogicalAccess.Setup/Product.wxs
@@ -1,6 +1,6 @@
 ﻿<?include config.wxi ?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-	<Package Name="$(var.ProductName)" Language="1033" Version="3.5.0.0" Manufacturer="$(var.Manufacturer)" UpgradeCode="9b055bc0-f36a-4bfc-a711-73b405cceac3" InstallerVersion="200">
+	<Package Name="$(var.ProductName)" Language="1033" Version="3.5.1.0" Manufacturer="$(var.Manufacturer)" UpgradeCode="9b055bc0-f36a-4bfc-a711-73b405cceac3" InstallerVersion="200">
 		
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
diff --git a/installer/conanfile.py b/installer/conanfile.py
@@ -5,7 +5,7 @@
 
 class LogicalAccessSwigConan(ConanFile):
     name = "logicalaccess-swig"
-    version = "3.5.0"
+    version = "3.5.1"
     settings = "build_type", "arch", "os"
     options = { 'LLA_BUILD_NFC': [True, False] }
     default_options = { 'logicalaccess/*:LLA_BUILD_PKCS': True, 'LLA_BUILD_NFC': False }
diff --git a/sources/LibLogicalAccessNet.native/conan-build.ps1 b/sources/LibLogicalAccessNet.native/conan-build.ps1
@@ -33,7 +33,7 @@ if($with_profile) {
 
 Set-Location build
 
-$PackageName = "logicalaccess-swig/3.5.0@lla/master"
+$PackageName = "logicalaccess-swig/3.5.1@lla/master"
 $Profiles = @(("compilers/x64_msvc_release", "Release", "x86_64"),
 			  ("compilers/x86_msvc_release", "Release", "x86"),
 			  ("compilers/x86_msvc_debug", "Debug", "x86"),
diff --git a/sources/LibLogicalAccessNet.native/conanfile.py b/sources/LibLogicalAccessNet.native/conanfile.py
@@ -6,7 +6,7 @@
 
 class LLASwig(ConanFile):
     name = "logicalaccess-swig"
-    version = "3.5.0"
+    version = "3.5.1"
     license = "LGPL"
     url = "https://github.com/liblogicalaccess/liblogicalaccess-swig"
     description = "SWIG wrapper for LibLogicalAccess"
diff --git a/sources/LibLogicalAccessNet.native/liblogicalaccess.i b/sources/LibLogicalAccessNet.native/liblogicalaccess.i
diff --git a/sources/LibLogicalAccessNet.native/liblogicalaccess_core.i b/sources/LibLogicalAccessNet.native/liblogicalaccess_core.i
@@ -24,120 +24,6 @@ using LibLogicalAccess.Crypto;
 
 /* Additional_include */
 
-#include <logicalaccess/lla_core_api.hpp>
-#include <logicalaccess/lla_fwd.hpp>
-#include <logicalaccess/asn1.hpp>
-#include <logicalaccess/boost_version_types.hpp>
-#include <logicalaccess/bufferhelper.hpp>
-#include <logicalaccess/cardprobe.hpp>
-#include <logicalaccess/xmlserializable.hpp>
-#include <logicalaccess/techno.hpp>
-#include <logicalaccess/services/reader_service.hpp>
-#include <logicalaccess/readerproviders/readerunit.hpp>
-#include <logicalaccess/readerproviders/readerprovider.hpp>
-#include <logicalaccess/linearizable.hpp>
-#include <logicalaccess/cards/keystorage.hpp>
-#include <logicalaccess/cards/keydiversification.hpp>
-#include <logicalaccess/key.hpp>
-#include <logicalaccess/cards/accessinfo.hpp>
-#include <logicalaccess/cards/aes128key.hpp>
-#include <logicalaccess/services/cardservice.hpp>
-#include <logicalaccess/cards/ichip.hpp>
-#include <logicalaccess/cards/chip.hpp>
-#include <logicalaccess/readerproviders/datatransport.hpp>
-#include <logicalaccess/myexception.hpp>
-#include <logicalaccess/resultchecker.hpp>
-#include <logicalaccess/cards/readercardadapter.hpp>
-#include <logicalaccess/cards/icommands.hpp>
-#include <logicalaccess/cards/commands.hpp>
-#include <logicalaccess/cards/computermemorykeystorage.hpp>
-#include <logicalaccess/cards/hmac1key.hpp>
-#include <logicalaccess/cards/location.hpp>
-#include <logicalaccess/cards/locationnode.hpp>
-#include <logicalaccess/cards/pkcskeystorage.hpp>
-#include <logicalaccess/cards/readermemorykeystorage.hpp>
-#include <logicalaccess/cards/samchip.hpp>
-#include <logicalaccess/cards/samkeystorage.hpp>
-#include <logicalaccess/cards/tripledeskey.hpp>
-#include <logicalaccess/colorize.hpp>
-#include <logicalaccess/readerproviders/circularbufferparser.hpp>
-#include <logicalaccess/readerproviders/dummydatatransport.hpp>
-#include <logicalaccess/readerproviders/dummyreaderunit.hpp>
-#include <logicalaccess/readerproviders/readercommunication.hpp>
-#include <logicalaccess/readerproviders/iso14443areadercommunication.hpp>
-#include <logicalaccess/readerproviders/iso14443breadercommunication.hpp>
-#include <logicalaccess/readerproviders/iso14443readercommunication.hpp>
-#include <logicalaccess/readerproviders/iso15693readercommunication.hpp>
-#include <logicalaccess/readerproviders/lcddisplay.hpp>
-#include <logicalaccess/readerproviders/ledbuzzerdisplay.hpp>
-#include <logicalaccess/readerproviders/readerconfiguration.hpp>
-#include <logicalaccess/readerproviders/readerunitconfiguration.hpp>
-#include <logicalaccess/readerproviders/serialport.hpp>
-#include <logicalaccess/readerproviders/serialportxml.hpp>
-#include <logicalaccess/readerproviders/serialportdatatransport.hpp>
-#include <logicalaccess/readerproviders/tcpdatatransport.hpp>
-#include <logicalaccess/readerproviders/udpdatatransport.hpp>
-#include <logicalaccess/services/accesscontrol/encodings/encoding.hpp>
-#include <logicalaccess/services/accesscontrol/formats/BitsetStream.hpp>
-#include <logicalaccess/services/accesscontrol/encodings/datarepresentation.hpp>
-#include <logicalaccess/services/accesscontrol/encodings/datatype.hpp>
-#include <logicalaccess/services/accesscontrol/formats/customformat/datafield.hpp>
-#include <logicalaccess/services/accesscontrol/formats/format.hpp>
-#include <logicalaccess/services/accesscontrol/accesscontrolcardservice.hpp>
-#include <logicalaccess/services/accesscontrol/formatinfos.hpp>
-#include <logicalaccess/services/accesscontrol/cardsformatcomposite.hpp>
-#include <logicalaccess/services/accesscontrol/encodings/bcdbytedatatype.hpp>
-#include <logicalaccess/services/accesscontrol/encodings/bcdnibbledatatype.hpp>
-#include <logicalaccess/services/accesscontrol/encodings/bigendiandatarepresentation.hpp>
-#include <logicalaccess/services/accesscontrol/encodings/binarydatatype.hpp>
-#include <logicalaccess/services/accesscontrol/encodings/littleendiandatarepresentation.hpp>
-#include <logicalaccess/services/accesscontrol/encodings/nodatarepresentation.hpp>
-#include <logicalaccess/services/accesscontrol/formats/staticformat.hpp>
-#include <logicalaccess/services/accesscontrol/formats/asciiformat.hpp>
-#include <logicalaccess/services/accesscontrol/formats/bariumferritepcscformat.hpp>
-#include <logicalaccess/services/accesscontrol/formats/bithelper.hpp>
-#include <logicalaccess/services/accesscontrol/formats/customformat/valuedatafield.hpp>
-#include <logicalaccess/services/accesscontrol/formats/customformat/binarydatafield.hpp>
-#include <logicalaccess/services/accesscontrol/formats/customformat/checksumdatafield.hpp>
-#include <logicalaccess/services/accesscontrol/formats/customformat/customformat.hpp>
-#include <logicalaccess/services/accesscontrol/formats/customformat/numberdatafield.hpp>
-#include <logicalaccess/services/accesscontrol/formats/customformat/paritydatafield.hpp>
-#include <logicalaccess/services/accesscontrol/formats/customformat/stringdatafield.hpp>
-#include <logicalaccess/services/accesscontrol/formats/customformat/tlvdatafield.hpp>
-#include <logicalaccess/services/accesscontrol/formats/dataclockformat.hpp>
-#include <logicalaccess/services/accesscontrol/formats/fascn200bitformat.hpp>
-#include <logicalaccess/services/accesscontrol/formats/getronik40bitformat.hpp>
-#include <logicalaccess/services/accesscontrol/formats/hidhoneywell40bitformat.hpp>
-#include <logicalaccess/services/accesscontrol/formats/rawformat.hpp>
-#include <logicalaccess/services/accesscontrol/formats/seosformat.hpp>
-#include <logicalaccess/services/accesscontrol/formats/wiegandformat.hpp>
-#include <logicalaccess/services/accesscontrol/formats/wiegand26format.hpp>
-#include <logicalaccess/services/accesscontrol/formats/wiegand34format.hpp>
-#include <logicalaccess/services/accesscontrol/formats/wiegand34withfacilityformat.hpp>
-#include <logicalaccess/services/accesscontrol/formats/wiegand35format.hpp>
-#include <logicalaccess/services/accesscontrol/formats/wiegand37format.hpp>
-#include <logicalaccess/services/accesscontrol/formats/wiegand37withfacilityformat.hpp>
-#include <logicalaccess/services/accesscontrol/formats/wiegand37withfacilityrightparity2format.hpp>
-#include <logicalaccess/services/accesscontrol/readerformatcomposite.hpp>
-#include <logicalaccess/services/aes_crypto_service.hpp>
-#include <logicalaccess/services/challenge/challengecardservice.hpp>
-#include <logicalaccess/services/identity/identity_service.hpp>
-#include <logicalaccess/services/json/json_dump_card_service.hpp>
-#include <logicalaccess/services/licensechecker/license_checker_service.hpp>
-#include <logicalaccess/services/nfctag/nfcdata.hpp>
-#include <logicalaccess/services/nfctag/lockcontroltlv.hpp>
-#include <logicalaccess/services/nfctag/memorycontroltlv.hpp>
-#include <logicalaccess/services/nfctag/ndefrecord.hpp>
-#include <logicalaccess/services/nfctag/textrecord.hpp>
-#include <logicalaccess/services/nfctag/urirecord.hpp>
-#include <logicalaccess/services/nfctag/ndefmessage.hpp>
-#include <logicalaccess/services/nfctag/nfctagcardservice.hpp>
-#include <logicalaccess/services/storage/storagecardservice.hpp>
-#include <logicalaccess/services/uidchanger/uidchangerservice.hpp>
-#include <logicalaccess/tlv.hpp>
-#include <logicalaccess/utils.hpp>
-#include <logicalaccess/windowsregistry.hpp>
-
 /* END_Additional_include */
 
 using namespace logicalaccess;
@@ -448,122 +334,6 @@ typedef std::shared_ptr<logicalaccess::Key> KeyPtr;
 
 /* Include_section */
 
-%include <logicalaccess/lla_core_api.hpp>
-%include <logicalaccess/lla_fwd.hpp>
-%include <logicalaccess/asn1.hpp>
-%include <logicalaccess/boost_version_types.hpp>
-%include <logicalaccess/bufferhelper.hpp>
-%include <logicalaccess/cardprobe.hpp>
-%include <logicalaccess/xmlserializable.hpp>
-%include <logicalaccess/techno.hpp>
-%include <logicalaccess/services/reader_service.hpp>
-%include <logicalaccess/readerproviders/readerunit.hpp>
-%include <logicalaccess/readerproviders/readerprovider.hpp>
-%include <logicalaccess/linearizable.hpp>
-%include <logicalaccess/cards/keystorage.hpp>
-%include <logicalaccess/cards/keydiversification.hpp>
-%include <logicalaccess/key.hpp>
-%include <logicalaccess/cards/accessinfo.hpp>
-%include <logicalaccess/cards/aes128key.hpp>
-%include <logicalaccess/services/cardservice.hpp>
-%include <logicalaccess/cards/ichip.hpp>
-%include <logicalaccess/cards/chip.hpp>
-%include <logicalaccess/readerproviders/datatransport.hpp>
-%include <logicalaccess/myexception.hpp>
-%include <logicalaccess/resultchecker.hpp>
-%include <logicalaccess/cards/readercardadapter.hpp>
-%include <logicalaccess/cards/icommands.hpp>
-%include <logicalaccess/cards/commands.hpp>
-%include <logicalaccess/cards/computermemorykeystorage.hpp>
-%include <logicalaccess/cards/hmac1key.hpp>
-%include <logicalaccess/cards/location.hpp>
-%include <logicalaccess/cards/locationnode.hpp>
-%include <logicalaccess/cards/pkcskeystorage.hpp>
-%include <logicalaccess/cards/readermemorykeystorage.hpp>
-%include <logicalaccess/cards/samchip.hpp>
-%include <logicalaccess/cards/samkeystorage.hpp>
-%include <logicalaccess/cards/tripledeskey.hpp>
-%include <logicalaccess/colorize.hpp>
-%include <logicalaccess/readerproviders/circularbufferparser.hpp>
-%include <logicalaccess/readerproviders/dummydatatransport.hpp>
-%include <logicalaccess/readerproviders/dummyreaderunit.hpp>
-%include <logicalaccess/readerproviders/readercommunication.hpp>
-%import <logicalaccess/plugins/llacommon/lla_common_api.hpp>
-%import <logicalaccess/plugins/llacommon/logs.hpp>
-%include <logicalaccess/readerproviders/iso14443areadercommunication.hpp>
-%include <logicalaccess/readerproviders/iso14443breadercommunication.hpp>
-%include <logicalaccess/readerproviders/iso14443readercommunication.hpp>
-%include <logicalaccess/readerproviders/iso15693readercommunication.hpp>
-%include <logicalaccess/readerproviders/lcddisplay.hpp>
-%include <logicalaccess/readerproviders/ledbuzzerdisplay.hpp>
-%include <logicalaccess/readerproviders/readerconfiguration.hpp>
-%include <logicalaccess/readerproviders/readerunitconfiguration.hpp>
-%include <logicalaccess/readerproviders/serialport.hpp>
-%include <logicalaccess/readerproviders/serialportxml.hpp>
-%include <logicalaccess/readerproviders/serialportdatatransport.hpp>
-%include <logicalaccess/readerproviders/tcpdatatransport.hpp>
-%include <logicalaccess/readerproviders/udpdatatransport.hpp>
-%include <logicalaccess/services/accesscontrol/encodings/encoding.hpp>
-%include <logicalaccess/services/accesscontrol/formats/BitsetStream.hpp>
-%include <logicalaccess/services/accesscontrol/encodings/datarepresentation.hpp>
-%include <logicalaccess/services/accesscontrol/encodings/datatype.hpp>
-%include <logicalaccess/services/accesscontrol/formats/customformat/datafield.hpp>
-%include <logicalaccess/services/accesscontrol/formats/format.hpp>
-%include <logicalaccess/services/accesscontrol/accesscontrolcardservice.hpp>
-%include <logicalaccess/services/accesscontrol/formatinfos.hpp>
-%include <logicalaccess/services/accesscontrol/cardsformatcomposite.hpp>
-%include <logicalaccess/services/accesscontrol/encodings/bcdbytedatatype.hpp>
-%include <logicalaccess/services/accesscontrol/encodings/bcdnibbledatatype.hpp>
-%include <logicalaccess/services/accesscontrol/encodings/bigendiandatarepresentation.hpp>
-%include <logicalaccess/services/accesscontrol/encodings/binarydatatype.hpp>
-%include <logicalaccess/services/accesscontrol/encodings/littleendiandatarepresentation.hpp>
-%include <logicalaccess/services/accesscontrol/encodings/nodatarepresentation.hpp>
-%include <logicalaccess/services/accesscontrol/formats/staticformat.hpp>
-%include <logicalaccess/services/accesscontrol/formats/asciiformat.hpp>
-%include <logicalaccess/services/accesscontrol/formats/bariumferritepcscformat.hpp>
-%include <logicalaccess/services/accesscontrol/formats/bithelper.hpp>
-%include <logicalaccess/services/accesscontrol/formats/customformat/valuedatafield.hpp>
-%include <logicalaccess/services/accesscontrol/formats/customformat/binarydatafield.hpp>
-%include <logicalaccess/services/accesscontrol/formats/customformat/checksumdatafield.hpp>
-%include <logicalaccess/services/accesscontrol/formats/customformat/customformat.hpp>
-%include <logicalaccess/services/accesscontrol/formats/customformat/numberdatafield.hpp>
-%include <logicalaccess/services/accesscontrol/formats/customformat/paritydatafield.hpp>
-%include <logicalaccess/services/accesscontrol/formats/customformat/stringdatafield.hpp>
-%include <logicalaccess/services/accesscontrol/formats/customformat/tlvdatafield.hpp>
-%include <logicalaccess/services/accesscontrol/formats/dataclockformat.hpp>
-%include <logicalaccess/services/accesscontrol/formats/fascn200bitformat.hpp>
-%include <logicalaccess/services/accesscontrol/formats/getronik40bitformat.hpp>
-%include <logicalaccess/services/accesscontrol/formats/hidhoneywell40bitformat.hpp>
-%include <logicalaccess/services/accesscontrol/formats/rawformat.hpp>
-%include <logicalaccess/services/accesscontrol/formats/seosformat.hpp>
-%include <logicalaccess/services/accesscontrol/formats/wiegandformat.hpp>
-%include <logicalaccess/services/accesscontrol/formats/wiegand26format.hpp>
-%include <logicalaccess/services/accesscontrol/formats/wiegand34format.hpp>
-%include <logicalaccess/services/accesscontrol/formats/wiegand34withfacilityformat.hpp>
-%include <logicalaccess/services/accesscontrol/formats/wiegand35format.hpp>
-%include <logicalaccess/services/accesscontrol/formats/wiegand37format.hpp>
-%include <logicalaccess/services/accesscontrol/formats/wiegand37withfacilityformat.hpp>
-%include <logicalaccess/services/accesscontrol/formats/wiegand37withfacilityrightparity2format.hpp>
-%include <logicalaccess/services/accesscontrol/readerformatcomposite.hpp>
-%include <logicalaccess/services/aes_crypto_service.hpp>
-%include <logicalaccess/services/challenge/challengecardservice.hpp>
-%include <logicalaccess/services/identity/identity_service.hpp>
-%include <logicalaccess/services/json/json_dump_card_service.hpp>
-%include <logicalaccess/services/licensechecker/license_checker_service.hpp>
-%include <logicalaccess/services/nfctag/nfcdata.hpp>
-%include <logicalaccess/services/nfctag/lockcontroltlv.hpp>
-%include <logicalaccess/services/nfctag/memorycontroltlv.hpp>
-%include <logicalaccess/services/nfctag/ndefrecord.hpp>
-%include <logicalaccess/services/nfctag/textrecord.hpp>
-%include <logicalaccess/services/nfctag/urirecord.hpp>
-%include <logicalaccess/services/nfctag/ndefmessage.hpp>
-%include <logicalaccess/services/nfctag/nfctagcardservice.hpp>
-%include <logicalaccess/services/storage/storagecardservice.hpp>
-%include <logicalaccess/services/uidchanger/uidchangerservice.hpp>
-%include <logicalaccess/tlv.hpp>
-%include <logicalaccess/utils.hpp>
-%include <logicalaccess/windowsregistry.hpp>
-
 /* END_Include_section */
 
 %template(ChipVector) std::vector<std::shared_ptr<logicalaccess::Chip> >;
diff --git a/sources/LibLogicalAccessNet.native/liblogicalaccess_reader.i b/sources/LibLogicalAccessNet.native/liblogicalaccess_reader.i
