Merge branch 'develop'

Author: Arsene Berod

.github/workflows/build-windows.yml

@@ -51,7 +51,7 @@ jobs:
 
       - name: "Setup LLA"
         run : |
-          conan export .
+          conan export . islog/${{ github.ref_name }}
         working-directory: lla
 
       - name: "Setup cppkcs11"

installer/conanfile.py

@@ -25,11 +25,14 @@ def requirements(self):
             if self.options.LLA_BUILD_NFC:
                 self.requires('LogicalAccessNFC/' + self.version + '@islog/' + self.channel)
             else:
-                self.requires('LogicalAccess/' + self.version)
+                self.requires('LogicalAccess/' + self.version + '@islog/' + self.channel)
         except ConanException:
             if self.options.LLA_BUILD_PRIVATE:
                 self.requires('LogicalAccessPrivate/' + self.version + '@islog/' + tools.Git().get_branch())
-            self.requires('LogicalAccessNFC/' + self.version + '@islog/' + tools.Git().get_branch())
+            if self.options.LLA_BUILD_NFC:
+                self.requires('LogicalAccessNFC/' + self.version + '@islog/' + tools.Git().get_branch())
+            else:
+                self.requires('LogicalAccess/' + self.version + '@islog/' + tools.Git().get_branch())
 
     def imports(self):
         self.copy("bin/*.dll", keep_path=False, dst="./packages/dll/" + str(self.settings.arch) + "/" + str(self.settings.build_type))

sources/LibLogicalAccessNet.win32/conanfile.py

@@ -25,11 +25,14 @@ def requirements(self):
             if self.options.LLA_BUILD_NFC:
                 self.requires('LogicalAccessNFC/' + self.version + '@islog/' + self.channel)
             else:
-                self.requires('LogicalAccess/'+ self.version)
+                self.requires('LogicalAccess/'+ self.version + '@islog/' + self.channel)
         except ConanException:
             if self.options.LLA_BUILD_PRIVATE:
                 self.requires('LogicalAccessPrivate/' + self.version + '@islog/' + tools.Git().get_branch())
-            self.requires('LogicalAccessNFC/' + self.version + '@islog/' + tools.Git().get_branch())
+            if self.options.LLA_BUILD_NFC:
+                self.requires('LogicalAccessNFC/' + self.version + '@islog/' + tools.Git().get_branch())
+            else:
+                self.requires('LogicalAccess/'+ self.version + '@islog/' + tools.Git().get_branch())
 
 
     def configure(self):