zhicheng233/PN532-Aime-Reader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	.github/workflows/build-on-commit.yml
This commit is contained in:
zhicheng233
2026-05-19 02:31:26 +08:00
parent 68dbf18563 c6750d63c2
commit ef8dd47dff
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build-on-commit.yml vendored
View File

@@ -20,8 +20,11 @@ jobs:
- name: Setup MSBuild - name: Setup MSBuild
uses: microsoft/setup-msbuild@v2 uses: microsoft/setup-msbuild@v2
- name: Restore NuGet packages - name: Restore NuGet packages (packages.config)
run: msbuild .\PN532-Aime-Reader.sln /t:Restore /p:Configuration=Release 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) - name: Build NfcAime (Release)
run: msbuild .\PN532-Aime-Reader.sln /p:Configuration=Release run: msbuild .\PN532-Aime-Reader.sln /p:Configuration=Release

6
src/NfcAime.Dll/NfcAime.Dll.csproj
View File

@@ -61,6 +61,10 @@
<DllExportPostProcType>0</DllExportPostProcType> <DllExportPostProcType>0</DllExportPostProcType>
<DllExportDir>$(MSBuildProjectDirectory)\.\packages\DllExport.1.8.1\</DllExportDir> <DllExportDir>$(MSBuildProjectDirectory)\.\packages\DllExport.1.8.1\</DllExportDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<wSlnDir Condition="'$(SolutionDir)' != ''">$(SolutionDir)</wSlnDir>
<wSlnFile Condition="'$(SolutionPath)' != ''">$(SolutionPath)</wSlnFile>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Costura, Version=6.2.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <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> <HintPath>.\packages\Costura.Fody.6.2.0\lib\netstandard2.0\Costura.dll</HintPath>
@@ -143,7 +147,7 @@
</ImportGroup> </ImportGroup>
<Target Name="DllExportRestorePkg" BeforeTargets="PrepareForBuild"> <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" /> <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)"> <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" /> <Output TaskParameter="TargetOutputs" PropertyName="DllExportMetaXBase" />
</MSBuild> </MSBuild>