File tree Expand file tree Collapse file tree 6 files changed +9
-9
lines changed
LibLogicalAccessNet.native Expand file tree Collapse file tree 6 files changed +9
-9
lines changed Original file line number Diff line number Diff line change 11mode : ContinuousDelivery
2- next-version : 3.5.2
2+ next-version : 3.6.0
33branches :
44 master :
55 regex : (origin\/)?master
Original file line number Diff line number Diff line change 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" />
Original file line number Diff line number Diff line change 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." />
Original file line number Diff line number Diff line change 55
66class 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 }
Original file line number Diff line number Diff line change 66
77class 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 )
Original file line number Diff line number Diff line change 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 >
You can’t perform that action at this time.
0 commit comments