diff --git a/.github/workflows/build-on-commit.yml b/.github/workflows/build-on-commit.yml
index 9d41382..21f7a54 100644
--- a/.github/workflows/build-on-commit.yml
+++ b/.github/workflows/build-on-commit.yml
@@ -20,8 +20,11 @@ jobs:
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v2
 
-      - name: Restore NuGet packages
-        run: msbuild .\PN532-Aime-Reader.sln /t:Restore /p:Configuration=Release
+      - name: Restore NuGet packages (packages.config)
+        run: nuget restore .\src\NfcAime.Dll\packages.config -PackagesDirectory .\src\NfcAime.Dll\packages
+
+      - name: Restore .NET SDK packages
+        run: dotnet restore .\src\NfcAime.Cli\Nfcaime.Cli.csproj
 
       - name: Build NfcAime (Release)
         run: msbuild .\PN532-Aime-Reader.sln /p:Configuration=Release
diff --git a/src/NfcAime.Dll/NfcAime.Dll.csproj b/src/NfcAime.Dll/NfcAime.Dll.csproj
index f546ce4..2296c34 100644
--- a/src/NfcAime.Dll/NfcAime.Dll.csproj
+++ b/src/NfcAime.Dll/NfcAime.Dll.csproj
@@ -61,6 +61,10 @@
     <DllExportPostProcType>0</DllExportPostProcType>
     <DllExportDir>$(MSBuildProjectDirectory)\.\packages\DllExport.1.8.1\</DllExportDir>
   </PropertyGroup>
+  <PropertyGroup>
+    <wSlnDir Condition="'$(SolutionDir)' != ''">$(SolutionDir)</wSlnDir>
+    <wSlnFile Condition="'$(SolutionPath)' != ''">$(SolutionPath)</wSlnFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Costura, Version=6.2.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
       <HintPath>.\packages\Costura.Fody.6.2.0\lib\netstandard2.0\Costura.dll</HintPath>
@@ -143,7 +147,7 @@
   </ImportGroup>
   <Target Name="DllExportRestorePkg" BeforeTargets="PrepareForBuild">
     <Error Condition="'$(DllExportNoRestore)'!='true' And !Exists('$(DllExportDir)DllExport.bat')" Text="DllExport.bat was not found in $(DllExportDir); https://github.com/3F/DllExport" />
-    <Exec Condition="'$(DllExportNoRestore)'!='true' And ('$(DllExportModImported)'!='true' Or !Exists('$(DllExportDir)packages\DllExport.1.8.1\tools\net.r_eg.DllExport.targets') Or !Exists('$(DllExportDir)packages\DllExport.1.8.1\gcache')) And Exists('$(DllExportDir)DllExport.bat')" Command=".\DllExport.bat  -action Restore" WorkingDirectory="$(DllExportDir)" />
+    <Exec Condition="'$(DllExportNoRestore)'!='true' And ('$(DllExportModImported)'!='true' Or !Exists('$(DllExportDir)packages\DllExport.1.8.1\tools\net.r_eg.DllExport.targets') Or !Exists('$(DllExportDir)packages\DllExport.1.8.1\gcache')) And Exists('$(DllExportDir)DllExport.bat')" Command=".\DllExport.bat -action Restore -sln-dir &quot;$(SolutionDir)&quot; -sln-file &quot;$(SolutionPath)&quot;" WorkingDirectory="$(DllExportDir)" />
     <MSBuild Condition="'$(DllExportModImported)'!='true'" Projects="$(DllExportDir)packages\DllExport.1.8.1\tools\net.r_eg.DllExport.targets" Targets="DllExportMetaXBaseTarget" Properties="TargetFramework=$(TargetFramework)">
       <Output TaskParameter="TargetOutputs" PropertyName="DllExportMetaXBase" />
     </MSBuild>