Complete IKS removable

liblogicalaccess · Jan 11, 2024 · 3805a25 · 3805a25
1 parent 2272c8e
commit 3805a25
Show file tree

Hide file tree

Showing 24 changed files with 2,018 additions and 364 deletions.
diff --git a/build-windows.ps1 b/build-windows.ps1
@@ -25,17 +25,13 @@ Set-Location ../../
 .\sources/scripts/generate-swig.ps1
 Set-Location sources/LibLogicalAccessNet.native
 if($with_profile) {
-    .\conan-build.ps1 -with_profile -build_private -build_nfc $build_nfc -build_unittest $build_unittest
+    .\conan-build.ps1 -with_profile -build_nfc $build_nfc -build_unittest $build_unittest
 } else {
     ./conan-build.ps1 -arch $arch -build_type $build_type -build_nfc $build_nfc -build_unittest $build_unittest
 }
 Set-Location ..
 
 msbuild -t:restore
-if ($build_private) {
-    msbuild LibLogicalAccessNet.sln /p:Configuration="Release"
-} else {
-    msbuild LibLogicalAccessNet.sln /p:Configuration="ReleaseCE"
-}
+msbuild LibLogicalAccessNet.sln /p:Configuration="Release"
 
 Set-Location ..
diff --git a/installer/LibLogicalAccess.Setup/config.wxi b/installer/LibLogicalAccess.Setup/config.wxi
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
   <Include>
-    <?define Manufacturer = "Leosac" ?>
+    <?define Manufacturer = "LibLogicalAccess" ?>
     <?define ProductName = "LibLogicalAccess" ?>
-    <?define AboutURL = "https://www.leosac.com" ?>
-    <?define SupportURL = "https://www.leosac.com" ?>
-    <?define UpdatesURL = "https://www.leosac.com" ?>
+    <?define AboutURL = "https://www.liblogicalaccess.com" ?>
+    <?define SupportURL = "https://www.liblogicalaccess.com" ?>
+    <?define UpdatesURL = "https://www.liblogicalaccess.com" ?>
 
     <?if $(var.Platform) = "x64" ?>
       <?define Win64 = "yes" ?>

diff --git a/sources/DESFireEV1Tests/DESFireEV1Tests.csproj b/sources/DESFireEV1Tests/DESFireEV1Tests.csproj
@@ -3,27 +3,15 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
-    <Configurations>Debug;Release;DebugCE;ReleaseCE</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\bin\Debug\</OutputPath>
-	<DefineConstants>BUILD_PRIVATE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugCE|AnyCPU'">
-    <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants></DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\bin\Release\</OutputPath>
-	<DefineConstants>BUILD_PRIVATE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCE|AnyCPU'">
-    <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants></DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/sources/ISO15693Tests/ISO15693Tests.csproj b/sources/ISO15693Tests/ISO15693Tests.csproj
@@ -3,25 +3,17 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
-    <Configurations>Debug;Release;DebugCE;ReleaseCE</Configurations>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\bin\Debug\</OutputPath>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugCE|AnyCPU'">
-    <OutputPath>..\bin\Debug\</OutputPath>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\bin\Release\</OutputPath>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCE|AnyCPU'">
-    <OutputPath>..\bin\Release\</OutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />

diff --git a/sources/LibLogicalAccessNet.native/custom_exception.i b/sources/LibLogicalAccessNet.native/custom_exception.i
@@ -56,11 +56,6 @@ try
 {
 	$action
 }
-catch (logicalaccess::IKSException &e) \
-{
-	SWIG_CSharpSetPendingExceptionCustom("IKSException", e.what());
-	return $null;
-}
 catch (logicalaccess::CardException &e)
 {
 	SWIG_CSharpSetPendingExceptionCustom("CardException", e.what());