Skip to content

Commit 69e43b5

Browse files
committed
Update dependencies and version to v3.6.0
1 parent 73ce7a9 commit 69e43b5

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
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.5.2
2+
next-version: 3.6.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.5.2.0" Guid="e75b8ac8-6ed3-4601-bfc3-30c46564c0c7" InstallerVersion="200"><SummaryInformation Manufacturer="$(var.Manufacturer)" />
3+
<Module Id="LibLogicalAccess.Msm" Language="1033" Version="3.6.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.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.5.2.0" Manufacturer="$(var.Manufacturer)" UpgradeCode="9b055bc0-f36a-4bfc-a711-73b405cceac3" InstallerVersion="200">
3+
<Package Name="$(var.ProductName)" Language="1033" Version="3.6.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.5.2"
8+
version = "3.6.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
class LLASwig(ConanFile):
88
name = "logicalaccess-swig"
9-
version = "3.5.2"
9+
version = "3.6.0"
1010
license = "LGPL"
1111
url = "https://github.com/liblogicalaccess/liblogicalaccess-swig"
1212
description = "SWIG wrapper for LibLogicalAccess"
@@ -20,7 +20,7 @@ def requirements(self):
2020
self.requires('logicalaccess-nfc/' + self.version)
2121
else:
2222
self.requires('logicalaccess/'+ self.version)
23-
self.requires('nlohmann_json/3.11.3') # shoulnd't be required
23+
self.requires('nlohmann_json/3.12.0') # shoulnd't be required
2424

2525
def layout(self):
2626
cmake_layout(self)

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.5.2</Version>
9-
<AssemblyVersion>3.5.2.0</AssemblyVersion>
10-
<FileVersion>3.5.2.0</FileVersion>
8+
<Version>3.6.0</Version>
9+
<AssemblyVersion>3.6.0.0</AssemblyVersion>
10+
<FileVersion>3.6.0.0</FileVersion>
1111
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
1212
<Company>LibLogicalAccess</Company>
1313
<Authors>LibLogicalAccess</Authors>

0 commit comments

Comments
 (0)