Skip to content

Commit 7e917f3

Browse files
MaxhyMaxhy
committed
Update for LLA v3.3
1 parent 4d34b47 commit 7e917f3

File tree

9 files changed

+16
-12
lines changed

9 files changed

+16
-12
lines changed

‎GitVersion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mode: ContinuousDelivery
2-
next-version: 3.2.0
2+
next-version: 3.3.0
33
branches:
44
master:
55
regex: (origin\/)?master

‎installer/LibLogicalAccess.Msm/MergeModule.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?include config.wxi ?>
22
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3-
<Module Id="LibLogicalAccess.Msm" Language="1033" Version="3.2.0.0" Guid="e75b8ac8-6ed3-4601-bfc3-30c46564c0c7" InstallerVersion="200"><SummaryInformation Manufacturer="$(var.Manufacturer)" />
3+
<Module Id="LibLogicalAccess.Msm" Language="1033" Version="3.3.0.0" Guid="e75b8ac8-6ed3-4601-bfc3-30c46564c0c7" InstallerVersion="200"><SummaryInformation Manufacturer="$(var.Manufacturer)" />
44
<Directory Id="MergeRedirectFolder">
55
<Component Guid="BA21F8CD-1FBD-4D8E-9F15-C57DBD508636" Id="LLAComponent">
66
<File Id="___var.cps3cards.dll_" Source="$(var.lladir)\cps3cards.dll" />

‎installer/LibLogicalAccess.Msm/config.wxi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<?define llaw32dir = "..\..\sources\LibLogicalAccessNet.native\bin\x86_64\Release" ?>
77
<?define islogkbdhook = "islogkbdhook64.exe" ?>
88
<?define islogkbdhooklib = "islogkbdhooklib64.dll" ?>
9-
<?define libcrypto = "libcrypto-1_1-x64.dll" ?>
10-
<?define libssl = "libssl-1_1-x64.dll" ?>
9+
<?define libcrypto = "libcrypto-3-x64.dll" ?>
10+
<?define libssl = "libssl-3-x64.dll" ?>
1111
<?else?>
1212
<?define lladir = "..\packages\dll\x86\Release" ?>
1313
<?define llaw32dir = "..\..\sources\LibLogicalAccessNet.native\bin\x86\Release" ?>
1414
<?define islogkbdhook = "islogkbdhook32.exe" ?>
1515
<?define islogkbdhooklib = "islogkbdhooklib32.dll" ?>
16-
<?define libcrypto = "libcrypto-1_1.dll" ?>
17-
<?define libssl = "libssl-1_1.dll" ?>
16+
<?define libcrypto = "libcrypto-3.dll" ?>
17+
<?define libssl = "libssl-3.dll" ?>
1818
<?endif?>
1919

2020
</Include>

‎installer/LibLogicalAccess.Setup/Product.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?include config.wxi ?>
22
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
3-
<Package Name="$(var.ProductName)" Language="1033" Version="3.2.0.0" Manufacturer="$(var.Manufacturer)" UpgradeCode="9b055bc0-f36a-4bfc-a711-73b405cceac3" InstallerVersion="200">
3+
<Package Name="$(var.ProductName)" Language="1033" Version="3.3.0.0" Manufacturer="$(var.Manufacturer)" UpgradeCode="9b055bc0-f36a-4bfc-a711-73b405cceac3" InstallerVersion="200">
44

55

66
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />

‎installer/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
class LogicalAccessSwigConan(ConanFile):
77
name = "logicalaccess-swig"
8-
version = "3.2.0"
8+
version = "3.3.0"
99
settings = "build_type", "arch", "os"
1010
options = { 'LLA_BUILD_NFC': [True, False] }
1111
default_options = { 'logicalaccess/*:LLA_BUILD_PKCS': True, 'LLA_BUILD_NFC': False }

‎sources/LibLogicalAccessNet.native/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
class LLASwig(ConanFile):
88
name = "logicalaccess-swig"
9-
version = "3.2.0"
9+
version = "3.3.0"
1010
license = "LGPL"
1111
url = "https://github.com/liblogicalaccess/liblogicalaccess-swig"
1212
description = "SWIG wrapper for LibLogicalAccess"

‎sources/LibLogicalAccessNet.native/liblogicalaccess.i

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@
146146
%shared_ptr(logicalaccess::DESFireEV3Chip);
147147
%shared_ptr(logicalaccess::DESFireEV3Commands);
148148
%shared_ptr(logicalaccess::DESFireEV3ISO7816Commands);
149+
%shared_ptr(logicalaccess::DESFireEV3NFCTag4CardService);
149150
%shared_ptr(logicalaccess::DESFireISO7816Commands);
150151
%shared_ptr(logicalaccess::DESFireISO7816ResultChecker);
151152
%shared_ptr(logicalaccess::DESFireJsonDumpCardService);
@@ -598,6 +599,7 @@
598599
%shared_ptr(DESFireEV3Chip);
599600
%shared_ptr(DESFireEV3Commands);
600601
%shared_ptr(DESFireEV3ISO7816Commands);
602+
%shared_ptr(DESFireEV3NFCTag4CardService);
601603
%shared_ptr(DESFireISO7816Commands);
602604
%shared_ptr(DESFireISO7816ResultChecker);
603605
%shared_ptr(DESFireJsonDumpCardService);

‎sources/LibLogicalAccessNet.native/liblogicalaccess_card.i

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
#include <logicalaccess/plugins/cards/desfire/desfireev2crypto.hpp>
6868
#include <logicalaccess/plugins/cards/desfire/desfireev3commands.hpp>
6969
#include <logicalaccess/plugins/cards/desfire/desfireev3chip.hpp>
70+
#include <logicalaccess/plugins/cards/desfire/desfireev3nfctag4cardservice.hpp>
7071
#include <logicalaccess/plugins/cards/desfire/desfirestoragecardservice.hpp>
7172
#include <logicalaccess/plugins/cards/desfire/nxpkeydiversification.hpp>
7273
#include <logicalaccess/plugins/cards/desfire/nxpav1keydiversification.hpp>
@@ -351,6 +352,7 @@ using LibLogicalAccess.Reader;
351352
%include <logicalaccess/plugins/cards/desfire/desfireev2crypto.hpp>
352353
%include <logicalaccess/plugins/cards/desfire/desfireev3commands.hpp>
353354
%include <logicalaccess/plugins/cards/desfire/desfireev3chip.hpp>
355+
%include <logicalaccess/plugins/cards/desfire/desfireev3nfctag4cardservice.hpp>
354356
%include <logicalaccess/plugins/cards/desfire/desfirestoragecardservice.hpp>
355357
%include <logicalaccess/plugins/cards/desfire/nxpkeydiversification.hpp>
356358
%include <logicalaccess/plugins/cards/desfire/nxpav1keydiversification.hpp>

‎sources/LibLogicalAccessNet/LibLogicalAccessNet.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<RootNamespace>LibLogicalAccess</RootNamespace>
66
<Description>LibLogicalAccess RFID library layer for C#</Description>
77
<Copyright>Copyright (C) LibLogicalAccess 2025</Copyright>
8-
<Version>3.2.0-7</Version>
9-
<AssemblyVersion>3.2.0.0</AssemblyVersion>
10-
<FileVersion>3.2.0.0</FileVersion>
8+
<Version>3.3.0</Version>
9+
<AssemblyVersion>3.3.0.0</AssemblyVersion>
10+
<FileVersion>3.3.0.0</FileVersion>
1111
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
1212
<Company>LibLogicalAccess</Company>
1313
<Authors>LibLogicalAccess</Authors>

0 commit comments

Comments
 (0)